Changeset 527:652cc8d3f1a9 in documentViewer

Timestamp:

Apr 12, 2012, 12:27:37 PM (12 years ago)

Author:

casties

Branch:

default

Message:

fixed bug with text when layer is only annotator.

Files:

• MpdlXmlTextServer.py (modified) (2 diffs)
• zpt/common_template.zpt (modified) (1 diff)
• zpt/layer_text_annotator.zpt (modified) (2 diffs)

MpdlXmlTextServer.py

@@ -235 +235 @@
         if len(modes) > 1:
             logging.debug("getTextPage: more than one mode=%s"%mode)
-            
+                        
         # search mode
         if 'search' in modes:
@@ -252 +252 @@
             # dict is called textPollux in the backend
             textmode = 'textPollux'
-        elif len(modes) == 0:
+        else:
             # text is default mode
             textmode = 'text'
-        else:
-            # just take first mode
-            textmode = modes[0]
         
         textParams['mode'] = textmode

zpt/common_template.zpt

@@ -43 +43 @@
         tal:condition="python:originalPage!=None"> (<span tal:replace="originalPage" /><span
         tal:define="originalPageNorm pageinfo/pageNumberOrigNorm | nothing" tal:condition="python:originalPageNorm!=None"> [<span
-          tal:replace="originalPageNorm" />]
-      </span>)
+          tal:replace="originalPageNorm" />]</span>)
       </span> <input type="submit" value="Go" /> of <span tal:replace="numPages" /> <a tal:condition="right"
         tal:attributes="href python:here.getLink('pn',right)">&gt;</a> <span tal:condition="not:right">&gt;</span> <a

zpt/layer_text_annotator.zpt

@@ -41 +41 @@
                 var devAnnotator = new Annotator(elem).addPlugin('Auth', {
                     //tokenUrl: 'http://annotateit.org/api/token'
-                    tokenUrl : 'http://localhost:8080/test/annotator/token?user=casties'
+                    tokenUrl : 'template/token?user=anonymous'
                 //autoFetch: false
                 }).addPlugin('Permissions', {
-                    user : 'casties',
+                    user : 'anonymous',
                     userString : function(user) {
                         if (user && user.name) {
@@ -58 +58 @@
                     }
                 }).addPlugin('Store', {
-                    prefix : 'http://localhost:18080/AnnotationManager/annotator',
-                    //prefix: 'http://virtuoso.mpiwg-berlin.mpg.de:8080/AnnotationManager/annotator',
+                    //prefix : 'http://localhost:18080/AnnotationManager/annotator',
+                    prefix: 'http://virtuoso.mpiwg-berlin.mpg.de:8080/AnnotationManager/annotator',
                     //prefix: 'http://annotateit.org/api',
                     annotationData : {