Changeset 599:3b79ae4a23ca in documentViewer

Timestamp:

Nov 19, 2012, 4:15:13 PM (11 years ago)

Author:

casties

Branch:

default

Message:

normalize uri of annotated image.

Files:

• documentViewer.py (modified) (4 diffs)
• zpt/viewer/layer_image_annotator.zpt (modified) (1 diff)

documentViewer.py

@@ -536 +536 @@
             docUrl = getParentPath(url)
             metaDom = self.metadataService.getDomFromPathOrUrl(docUrl)
-            docinfo['imagePath'] = url.replace('/mpiwg/online/', '', 1)
+            docinfo['imagePath'] = url.replace('/mpiwg/online', '', 1)
 
         elif mode=="filepath":
@@ -614 +614 @@
         if mode != 'texttool':
             # override image path from texttool with url parameter TODO: how about mode=auto?
-            docinfo['imagePath'] = url.replace('/mpiwg/online/', '', 1)
+            docinfo['imagePath'] = url.replace('/mpiwg/online', '', 1)
 
         # check numPages
@@ -620 +620 @@
             # number of images from digilib
             if docinfo.get('imagePath', None):
-                imgpath = docinfo['imagePath'].replace('/mpiwg/online/', '', 1)
+                imgpath = docinfo['imagePath'].replace('/mpiwg/online', '', 1)
                 logging.debug("imgpath=%s"%imgpath)
                 docinfo['imageURL'] = "%s?fn=%s"%(self.digilibScalerUrl, imgpath)
@@ -639 +639 @@
                 docinfo['numPages'] = docinfo['numTextPages']
 
+        # normalize path
+        if 'imagePath' in docinfo and not docinfo['imagePath'].startswith('/'):
+            docinfo['imagePath'] = '/' + docinfo['imagePath']
+
         logging.debug("documentViewer (getdocinfo) docinfo: keys=%s"%docinfo.keys())
-        #logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo)
         # store in session
         self.REQUEST.SESSION['docinfo'] = docinfo

zpt/viewer/layer_image_annotator.zpt

@@ -13 +13 @@
     tal:define="global annServerUrl string:http://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager;
     global annTokenUrl string:$viewerUrl/template/token/getLoginToken;
-    annUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s?pn=%s'%(docinfo['documentPath'],pageinfo['pn']);
+    annUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s?pn=%s'%(docinfo['imagePath'],pageinfo['pn']);
     resUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s'%(docinfo['documentPath']);
     global annUser python:here.getAuthenticatedUser(anon='anonymous');