Mercurial > hg > documentViewer

changeset 331:6cde7f02786e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author abukhman
date Mon, 18 Oct 2010 11:45:08 +0200
parents c81509acead9
children fdbe64b28a81
files MpdlXmlTextServer.py documentViewer.py
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MpdlXmlTextServer.py	Mon Oct 18 11:32:22 2010 +0200
+++ b/MpdlXmlTextServer.py	Mon Oct 18 11:45:08 2010 +0200
@@ -190,9 +190,9 @@
         dom =Parse(text)
         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=""):
         """returns single page from fulltext"""
--- a/documentViewer.py	Mon Oct 18 11:32:22 2010 +0200
+++ b/documentViewer.py	Mon Oct 18 11:45:08 2010 +0200
@@ -243,7 +243,9 @@
             self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
             
         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')
         
         if viewMode=="auto": # automodus gewaehlt
@@ -255,7 +257,7 @@
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
   
     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
         @param mode: defines how to access the document behind url 
@@ -288,7 +290,7 @@
             else:
                 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')               
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk))
@@ -747,7 +749,7 @@
         """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)
         pageinfo['rows'] = rows