Changes in [615:d6eca930a534:618:54d3498a6e78] in documentViewer

Files:

• HocrTextServer.py (added)
• HocrTxtUtils.py (added)
• documentViewer.py (modified) (3 diffs)
• zpt/viewer/layer_image_annotator.zpt (modified) (1 diff)

documentViewer.py

@@ -22 +22 @@
 def getMDText(node):
     """returns the @text content from the MetaDataProvider metadata node"""
+
+    
+
     if isinstance(node, dict):
         return node.get('@text', None)
     
+    if isinstance(node,list): #more than one text file if there is an attribute don't choose it
+        for nodeInList in node:
+            attr = nodeInList.get("@attr",None)
+            if attr is None:
+                return node.get('@text',None)
+        return None
+
+
+
     return node
 
@@ -256 +268 @@
             logging.error("template folder missing!")
             return "ERROR: template folder missing!"
-            
+        
+        
+
         if not getattr(self, 'digilibBaseUrl', None):
             self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary"
@@ -751 +765 @@
         # old style text URL
         textUrl = getMDText(texttool.get('text', None))
+
+        
+
+
         if textUrl and docPath:
             if urlparse.urlparse(textUrl)[0] == "": #keine url

zpt/viewer/layer_image_annotator.zpt

@@ -24 +24 @@
     dlOpts.annotationUser='$annUser';
     dlOpts.annotatorPlugins=['Auth','Permissions','Store','Markdown','DigilibIntegrator'];
+    dlOpts.annotationPageUri='$annUrl';
     dlOpts.annotatorPluginSettings={'Store':{'annotationData':{'uri':'$annUrl','resource':'$resUrl'},'loadFromSearch':{'uri':'$annUrl'}},
         'Permissions':{'read':[],'update':['$permUser'],'delete':['$permUser'],'admin':['$permUser']}};