Changeset 566:4a31608f8b0e in documentViewer for documentViewer.py

Timestamp:

Oct 10, 2012, 4:09:49 PM (12 years ago)

Author:

casties

Branch:

default

Message:

more new MpiwgXmlTextServer?.

File:

• documentViewer.py (modified) (7 diffs)

documentViewer.py

@@ -200 +200 @@
         if digilibBaseUrl is not None:
             self.digilibBaseUrl = digilibBaseUrl
+            self.digilibScalerUrl = digilibBaseUrl + '/servlet/Scaler'
+            self.digilibViewerUrl = digilibBaseUrl + '/jquery/digilib.html'
             
         
@@ -361 +363 @@
             
         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','')
@@ -544 +546 @@
         docinfo['viewerUrl'] = self.getDocumentViewerURL()
         docinfo['digilibBaseUrl'] = self.digilibBaseUrl
+        docinfo['digilibScalerUrl'] = self.digilibScalerUrl
+        docinfo['digilibViewerUrl'] = self.digilibViewerUrl
         # get index.meta DOM
         docUrl = None
@@ -563 +567 @@
         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
@@ -637 +641 @@
             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:
@@ -646 +650 @@
                     # 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
@@ -1045 +1049 @@
         self.title=title
         self.digilibBaseUrl = digilibBaseUrl
+        self.digilibScalerUrl = digilibBaseUrl + '/servlet/Scaler'
+        self.digilibViewerUrl = digilibBaseUrl + '/jquery/digilib.html'
         self.thumbrows = thumbrows
         self.thumbcols = thumbcols