Changeset 548:7acc919f52ff in documentViewer

Timestamp:

Aug 31, 2012, 1:55:45 PM (12 years ago)

Author:

casties

Branch:

default

Message:

mode=filepath works again

File:

• documentViewer.py (modified) (8 diffs)

documentViewer.py

@@ -222 +222 @@
         return self.template.fulltextclient.getPlacesOnPage(**args)
  
-    #WTF?
+    # Thumb list for CoolIris Plugin
     thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())
     security.declareProtected('View','thumbs_rss')
@@ -233 +233 @@
         
         '''
-        logging.debug("HHHHHHHHHHHHHH:load the rss")
-        logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))
         
         if not hasattr(self, 'template'):
@@ -259 +257 @@
   
     security.declareProtected('View','index_html')
-    def index_html(self,url,mode="texttool",viewMode="auto",viewLayer=None,tocMode="thumbs",start=1,pn=1):
+    def index_html(self,url,mode="texttool",viewMode="auto",viewLayer=None,tocMode=None,start=1,pn=1):
         """
         show page
@@ -278 +276 @@
         if not getattr(self, 'digilibBaseUrl', None):
             self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary"
+            
+        # mode=filepath should not have toc-thumbs
+        if tocMode is None:
+            if mode == "filepath":
+                tocMode = "none"
+            else:
+                tocMode = "thumbs"
             
         # docinfo: information about document (cached)
@@ -303 +308 @@
         # safe viewLayer in userinfo
         userinfo['viewLayer'] = viewLayer
-        
+                
         # pageinfo: information about page (not cached)
         pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, userinfo=userinfo, viewMode=viewMode, viewLayer=viewLayer, tocMode=tocMode)
@@ -540 +545 @@
         elif mode=="filepath":
             # url points to image file, index.meta optional
+            docinfo['imagePath'] = url
+            docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + url
+            docinfo['numPages'] = 1
             # asssume index.meta is two path segments up
             docUrl = getParentPath(url, 2)
@@ -567 +575 @@
             bib = self.metadataService.getBibData(dom=metaDom)
             if bib:
-                # save extended version as 'bibx'
+                # save extended version as 'bibx' TODO: ugly
                 bibx = self.metadataService.getBibData(dom=metaDom, all=True, recursive=1)
                 if len(bibx) == 1:
@@ -607 +615 @@
             docinfo['imagePath'] = url.replace('/mpiwg/online/', '', 1)
 
-        # number of images from digilib
-        if docinfo.get('imagePath', None):
-            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
+        # check numPages
+        if docinfo.get('numPages', 0) == 0:
+            # number of images from digilib
+            if docinfo.get('imagePath', None):
                 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