Changeset 334:a8fb29c62b47 in documentViewer for documentViewer.py

Timestamp:

Oct 18, 2010, 9:54:40 AM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

File:

• documentViewer.py (modified) (4 diffs)

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')
@@ -258 +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="", originalPage=None):
+    def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization=""):
         '''
         view it
@@ -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=None, pageinfo=None)
         
         if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen 
@@ -746 +747 @@
         return docinfo
                
-    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization="",originalPage=originalPage):
+    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""):
         """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)