Changeset 580:0806cb9061c1 in documentViewer

Timestamp:

Oct 29, 2012, 10:57:30 AM (12 years ago)

Author:

casties

Branch:

default

Message:

fixed another bug when url starts with /mpiwg/online/

Files:

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

documentViewer.py

@@ -555 +555 @@
             # url points to document dir or index.meta
             metaDom = self.metadataService.getDomFromPathOrUrl(url)
-            docUrl = url.replace('/index.meta', '')
             if metaDom is None:
                 raise IOError("Unable to find index.meta for mode=texttool!")
+            
+            docUrl = url.replace('/index.meta', '')
+            if url.startswith('/mpiwg/online/'):
+                docUrl = url.replace('/mpiwg/online/', '', 1)
 
         elif mode=="imagepath":
@@ -649 +652 @@
             if docinfo.get('imagePath', None):
                 imgpath = docinfo['imagePath'].replace('/mpiwg/online/', '', 1)
+                logging.debug("imgpath=%s"%imgpath)
                 docinfo['imageURL'] = "%s?fn=%s"%(self.digilibScalerUrl, imgpath)
                 docinfo = self.getDocinfoFromDigilib(docinfo, imgpath)

version.txt

@@ -1 @@
-DocumentViewer 2.2.6
+DocumentViewer 2.2.7