Changeset 343:025e53924ec3 in documentViewer

Timestamp:

Oct 18, 2010, 10:26:39 AM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

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

MpdlXmlTextServer.py

@@ -179 +179 @@
         return myList
     
-    def getOrigPages (self, docinfo=None,pageinfo=None):
+    def getOrigPages (self, docinfo=None):
         """Show original page """
         #docpath = docinfo['textURLPath'] 
         #url = docinfo['url']
         selfurl = self.absolute_url()
-        pn =pageinfo['current']
+        #pn =pageinfo['current']
        
         viewMode=  pageinfo['viewMode']
-        text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text',  pn))
+        #text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text',  pn))
+        text = self.getServerData("page-fragment.xql","document=%s&mode=%s"%(docinfo['textURLPath'], 'text'))
         dom =Parse(text)
         pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
         if len(pagedivs)>0:
-            originalPage = getTextFromNode(pagedivs[0])
-            #return docinfo['originalPage']
-            return originalPage
-            #return docinfo
+            docinfo['originalPage'] = getTextFromNode(pagedivs[0])
+        #return docinfo['originalPage']
+        #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

@@ -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