Changeset 518:91051b36b9cc in documentViewer for documentViewer.py

Timestamp:

Mar 12, 2012, 6:01:14 PM (12 years ago)

Author:

casties

Branch:

default

Message:

uses xml info from doc-info.xql for table of contents now.

File:

• documentViewer.py (modified) (4 diffs)

documentViewer.py

@@ -257 +257 @@
             self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary"
             
-        docinfo = self.getDocinfo(mode=mode,url=url)
-        
-        if tocMode != "thumbs":
-            # get table of contents
-            self.getToc(mode=tocMode, docinfo=docinfo)
-
+        docinfo = self.getDocinfo(mode=mode,url=url,tocMode=tocMode)
+        
         # auto viewMode: text if there is a text else images
         if viewMode=="auto": 
@@ -430 +426 @@
 
 
-    def getDocinfo(self, mode, url):
+    def getDocinfo(self, mode, url, tocMode=None):
         """returns docinfo depending on mode"""
         logging.debug("getDocinfo: mode=%s, url=%s"%(mode,url))
@@ -484 +480 @@
             if texttool:
                 docinfo = self.getDocinfoFromTexttool(docinfo, texttool)
-                # document info from full text
+                # document info (including toc) from full text
                 if docinfo.get('textURLPath', None):
-                    docinfo = self.getTextInfo(docinfo=docinfo)
+                    docinfo = self.getTextInfo(mode=tocMode, docinfo=docinfo)
             
             # bib info
@@ -730 +726 @@
         np = int(docinfo.get('numPages', 0))
         if np == 0:
-            # numPages unknown - maybe we can get it from text page
-            logging.warn("getPageInfo: numPages=0 trying getTextPage!")
-            if docinfo.get('textURLPath', None):
-                # cache text page as well
-                pageinfo['textPage'] = self.getTextPage(mode=viewLayer, pn=current, docinfo=docinfo, pageinfo=pageinfo)
-                np = int(docinfo.get('numPages', 0))
-                
+            # try numTextPages
+            np = docinfo.get('numTextPages', 0)
+            if np != 0:
+                docinfo['numPages'] = np
+
         # cache table of contents
         pageinfo['tocPageSize'] = getInt(self.REQUEST.get('tocPageSize', 30))