Changeset 338:0576f524e2ee in documentViewer

Timestamp:

Oct 18, 2010, 10:08:59 AM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

• MpdlXmlTextServer.py (modified) (2 diffs)
• documentViewer.py (modified) (4 diffs)

MpdlXmlTextServer.py

@@ -179 +179 @@
         return myList
     
-    def getOrigPages (self, docinfo=None):
+    def getOrigPages (self, docinfo=None,pageinfo=None):
         """Show original page """
         #docpath = docinfo['textURLPath'] 
@@ -191 +191 @@
         pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
         if len(pagedivs)>0:
-            docinfo['originalPage'] = getTextFromNode(pagedivs[0])
+            originalPage = getTextFromNode(pagedivs[0])
             #return docinfo['originalPage']
-            #return originalPage
-            return docinfo
+            return originalPage
+            #return docinfo
         
     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, originalPage=originalPage, 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')
@@ -291 +291 @@
                 viewMode="images"
                 
-        pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
+        pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode, originalPage=originalPage)
         
         pt = getattr(self.template, 'viewer_main')               
@@ -663 +663 @@
         docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get info von bib tag
         docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
-        docinfo =self.getOrigPages(docinfo=docinfo)
+        #docinfo =self.getOrigPages(docinfo=docinfo)
         
         if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen 
@@ -747 +747 @@
         return docinfo
                
-    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""):
+    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization="", originalPage=None):
         """returns pageinfo with the given parameters"""
         pageinfo = {}
         current = getInt(current)
-        #pageinfo ['originalPage'] = originalPage
+    
+        pageinfo ['originalPage'] = originalPage
         pageinfo['current'] = current
         rows = int(rows or self.thumbrows)