Changeset 331:6cde7f02786e in documentViewer

Timestamp:

Oct 18, 2010, 9:45:08 AM (15 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

• MpdlXmlTextServer.py (modified) (1 diff)
• documentViewer.py (modified) (4 diffs)

MpdlXmlTextServer.py

@@ -191 +191 @@
         pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
         if len(pagedivs)>0:
-            originalPage = getTextFromNode(pagedivs[0])
-            #return docinfo['originalPage']
-            return originalPage
+            docinfo['originalPage'] = getTextFromNode(pagedivs[0])
+            return docinfo['originalPage']
+            #return originalPage
             
     def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):

documentViewer.py

@@ -244 +244 @@
             
         docinfo = self.getDocinfo(mode=mode,url=url)
-        pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
+        #pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
+        pageinfo = self.getPageinfo(start=start,current=pn, originalPage=originalPage, docinfo=docinfo)
+        ''' ZDES '''
         pt = getattr(self.template, 'thumbs_main_rss')
         
@@ -256 +258 @@
   
     security.declareProtected('View','index_html')
-    def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization=""):
+    def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization="", originalPage=None):
         '''
         view it
@@ -289 +291 @@
                 viewMode="images"
                 
-        pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
+        pageinfo = self.getPageinfo(start=start,current=pn,originalPage=originalPage, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
         
         pt = getattr(self.template, 'viewer_main')               
@@ -748 +750 @@
         pageinfo = {}
         current = getInt(current)
-        #pageinfo ['originalPage'] = originalPage
+        pageinfo ['originalPage'] = originalPage
         pageinfo['current'] = current
         rows = int(rows or self.thumbrows)