diff documentViewer.py @ 566:4a31608f8b0e

more new MpiwgXmlTextServer.
author casties
date Wed, 10 Oct 2012 18:09:49 +0200
parents 1b483194901c
children 694935574177
line wrap: on
line diff
--- a/documentViewer.py	Tue Oct 09 19:01:18 2012 +0200
+++ b/documentViewer.py	Wed Oct 10 18:09:49 2012 +0200
@@ -199,6 +199,8 @@
             
         if digilibBaseUrl is not None:
             self.digilibBaseUrl = digilibBaseUrl
+            self.digilibScalerUrl = digilibBaseUrl + '/servlet/Scaler'
+            self.digilibViewerUrl = digilibBaseUrl + '/jquery/digilib.html'
             
         
     # proxy text server methods to fulltextclient
@@ -360,7 +362,7 @@
             url = docinfo.get('imageURL', None)
             
         if url is None:
-            url = "%s/servlet/Scaler?"%self.digilibBaseUrl
+            url = self.digilibScalerUrl
             if fn is None and docinfo is not None:
                 fn = docinfo.get('imagePath','')
             
@@ -543,6 +545,8 @@
         # add self url
         docinfo['viewerUrl'] = self.getDocumentViewerURL()
         docinfo['digilibBaseUrl'] = self.digilibBaseUrl
+        docinfo['digilibScalerUrl'] = self.digilibScalerUrl
+        docinfo['digilibViewerUrl'] = self.digilibViewerUrl
         # get index.meta DOM
         docUrl = None
         metaDom = None
@@ -562,7 +566,7 @@
 
         elif mode=="filepath":
             # url points to image file, index.meta optional
-            docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + url
+            docinfo['imageURL'] = "%s?fn=%s"%(self.digilibScalerUrl, url)
             docinfo['numPages'] = 1
             # asssume index.meta is two path segments up
             docUrl = getParentPath(url, 2)
@@ -636,7 +640,7 @@
             # number of images from digilib
             if docinfo.get('imagePath', None):
                 imgpath = docinfo['imagePath'].replace('/mpiwg/online/', '', 1)
-                docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + imgpath
+                docinfo['imageURL'] = "%s?fn=%s"%(self.digilibScalerUrl, imgpath)
                 docinfo = self.getDocinfoFromDigilib(docinfo, imgpath)
             else:
                 # imagePath still missing? try "./pageimg"
@@ -645,7 +649,7 @@
                 if docinfo.get('numPages', 0) > 0:
                     # there are pages
                     docinfo['imagePath'] = imgPath
-                    docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + docinfo['imagePath']
+                    docinfo['imageURL'] = "%s?fn=%s"%(self.digilibScalerUrl, docinfo['imagePath'])
 
         # check numPages
         if docinfo.get('numPages', 0) == 0:
@@ -1044,6 +1048,8 @@
         """init document viewer"""
         self.title=title
         self.digilibBaseUrl = digilibBaseUrl
+        self.digilibScalerUrl = digilibBaseUrl + '/servlet/Scaler'
+        self.digilibViewerUrl = digilibBaseUrl + '/jquery/digilib.html'
         self.thumbrows = thumbrows
         self.thumbcols = thumbcols
         self.authgroups = [s.strip().lower() for s in authgroups.split(',')]