Changeset 532:0b8bed1223ad in documentViewer for documentViewer.py

Timestamp:

Jul 25, 2012, 7:28:31 PM (12 years ago)

Author:

casties

Branch:

default

Message:

new layout and styles.

File:

• documentViewer.py (modified) (4 diffs)

documentViewer.py

@@ -144 +144 @@
     info_xml = PageTemplateFile('zpt/info_xml', globals())
     docuviewer_css = ImageFile('css/docuviewer.css',globals())
-    # make ImageFile better for development
+    # make docuviewer_css refreshable for development
     docuviewer_css.index_html = refreshingImageFileIndexHtml
     jquery_js = ImageFile('js/jquery.js',globals())
@@ -577 +577 @@
         # image path
         if mode != 'texttool':
-            # override image path from texttool with url TODO: how about mode=auto?
+            # override image path from texttool with url parameter TODO: how about mode=auto?
             docinfo['imagePath'] = url.replace('/mpiwg/online/', '', 1)
 
@@ -584 +584 @@
             docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + docinfo['imagePath']
             docinfo = self.getDocinfoFromDigilib(docinfo, docinfo['imagePath'])
+        else:
+            # imagePath still missing? try "./pageimg"
+            imgPath = os.path.join(docUrl, 'pageimg')
+            docinfo = self.getDocinfoFromDigilib(docinfo, imgPath)
+            if docinfo.get('numPages', 0) > 0:
+                # there are pages
+                docinfo['imagePath'] = imgPath
+                docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + docinfo['imagePath']
 
         # check numPages
@@ -663 +671 @@
             else:
                 docinfo['presentationUrl'] = os.path.join(docPath, presentation)
-            
         
         return docinfo