Changeset 516:7d7b639d7be7 in documentViewer for documentViewer.py

Timestamp:

Mar 5, 2012, 5:04:49 PM (12 years ago)

Author:

casties

Branch:

default

Message:

add methods to use doc-info.xql.
read list of page numbers from doc-info.xql.
add original page numbers to thumbs.

File:

• documentViewer.py (modified) (8 diffs)

documentViewer.py

@@ -184 +184 @@
         return self.template.fulltextclient.getResultsPage(**args)
 
+    def getTextInfo(self, **args):
+        """returns document info from the text server"""
+        return self.template.fulltextclient.getTextInfo(**args)
+
     def getToc(self, **args):
         """loads table of contents and stores XML in docinfo"""
@@ -480 +484 @@
             if texttool:
                 docinfo = self.getDocinfoFromTexttool(docinfo, texttool)
+                # document info from full text
+                if docinfo.get('textURLPath', None):
+                    docinfo = self.getTextInfo(docinfo=docinfo)
             
             # bib info
@@ -510 +517 @@
         # image path
         if mode != 'texttool':
-            # override image path from texttool with url
+            # override image path from texttool with url TODO: how about mode=auto?
             docinfo['imagePath'] = url.replace('/mpiwg/online/', '', 1)
 
@@ -517 +524 @@
             docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + docinfo['imagePath']
             docinfo = self.getDocinfoFromDigilib(docinfo, docinfo['imagePath'])
+
+        # check numPages
+        if docinfo.get('numPages', 0) == 0:
+            if docinfo.get('numTextPages', 0) > 0:
+                # replace with numTextPages (text-only?)
+                docinfo['numPages'] = docinfo['numTextPages']
 
         logging.debug("documentViewer (getdocinfo) docinfo: keys=%s"%docinfo.keys())
@@ -523 +536 @@
         self.REQUEST.SESSION['docinfo'] = docinfo
         return docinfo
+
 
     def getDocinfoFromResource(self, docinfo, resource):
@@ -699 +713 @@
         pageinfo['tocMode'] = tocMode
 
+        # TODO: unify current and pn!
         current = getInt(current)
         pageinfo['current'] = current
@@ -716 +731 @@
         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
@@ -733 +749 @@
         pageinfo['pageZero'] = pageZero
         pageinfo['pageBatch'] = self.getPageBatch(start=start, rows=rows, cols=cols, pageFlowLtr=pageFlowLtr, pageZero=pageZero, minIdx=1, maxIdx=np)
-                
+        # more page parameters
         pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg')
+        if docinfo.get('pageNumbers'):
+            # get original page numbers
+            pageNumber = docinfo['pageNumbers'].get(current, None)
+            if pageNumber is not None:
+                pageinfo['pageNumberOrig'] = pageNumber['no']
+                pageinfo['pageNumberOrigNorm'] = pageNumber['non']
         
         # cache search results