Changeset 634:618b600c805a in documentViewer

Timestamp:

Aug 17, 2015, 2:14:38 PM (9 years ago)

Author:

casties

Branch:

default

Message:

fix broken mode imagepath.

Files:

• documentViewer.py (modified) (4 diffs)
• version.txt (modified) (1 diff)

documentViewer.py

@@ -552 +552 @@
             if url.startswith('/mpiwg/online/'):
                 docUrl = url.replace('/mpiwg/online/', '', 1)
+                
         elif mode=="textpath":
             #url points to an textfile
@@ -561 +562 @@
             try:
                 metaDom = self.metadataService.getDomFromPathOrUrl(docUrl)
-
                 removeINDEXMETA_NS(metaDom)
-
-
                 
             except:
                 metaDom = None
+                
             #metaDom = self.metadataService.getDomFromPathOrUrl(docUrl)
             #docinfo['imagePath'] = url.replace('/mpiwg/online', '', 1)
@@ -587 +586 @@
             # url points to folder with images, index.meta optional
             # asssume index.meta in parent dir
-            
+            docUrl = getParentPath(url)
             metaDom = self.metadataService.getDomFromPathOrUrl(docUrl)
-            
             docinfo['imagePath'] = url.replace('/mpiwg/online', '', 1)
             
@@ -625 +623 @@
         
         if metaDom is not None and (metaDom.tag == 'resource' or metaDom.tag == "{%s}resource"%INDEXMETA_NS):
-            print("MD")
             # document directory name and path
             resource = self.metadataService.getResourceData(dom=metaDom, recursive=1)

version.txt

@@ -1 @@
-DocumentViewer 2.2.11
+DocumentViewer 2.2.12