Changeset 625:80a3b1fa5705 in documentViewer

Timestamp:

Dec 15, 2014, 4:18:20 PM (9 years ago)

Author:

casties

Branch:

default

Message:

more move sslification to only client-visible urls.

File:

• documentViewer.py (modified) (3 diffs)

documentViewer.py

@@ -519 +519 @@
         # add self url
         docinfo['viewerUrl'] = self.getDocumentViewerURL()
-        docinfo['digilibBaseUrl'] = self.digilibBaseUrl
-        docinfo['digilibScalerUrl'] = self.digilibScalerUrl
-        docinfo['digilibViewerUrl'] = self.digilibViewerUrl
+        docinfo['digilibBaseUrl'] = sslifyUrl(self.digilibBaseUrl, self, force=True)
+        docinfo['digilibScalerUrl'] = sslifyUrl(self.digilibScalerUrl, self, force=True)
+        docinfo['digilibViewerUrl'] = sslifyUrl(self.digilibViewerUrl, self, force=True)
         # get index.meta DOM
         docUrl = None
@@ -643 +643 @@
                 imgpath = docinfo['imagePath'].replace('/mpiwg/online', '', 1)
                 logging.debug("imgpath=%s"%imgpath)
-                docinfo['imageURL'] = "%s?fn=%s"%(self.digilibScalerUrl, imgpath)
+                docinfo['imageURL'] = sslifyUrl("%s?fn=%s"%(self.digilibScalerUrl, imgpath), self, force=True)
                 docinfo = self.getDocinfoFromDigilib(docinfo, imgpath)
             else:
@@ -652 +652 @@
                     # there are pages
                     docinfo['imagePath'] = imgPath
-                    docinfo['imageURL'] = "%s?fn=%s"%(self.digilibScalerUrl, docinfo['imagePath'])
+                    docinfo['imageURL'] = sslifyUrl("%s?fn=%s"%(self.digilibScalerUrl, docinfo['imagePath']), self, force=True)
 
         # check numPages