Changeset 589:d8d6975cebcb in documentViewer

Timestamp:

Nov 15, 2012, 4:58:14 PM (11 years ago)

Author:

casties

Branch:

default

Message:

more fixes for pf-parameter

File:

• documentViewer.py (modified) (4 diffs)

documentViewer.py

@@ -48 +48 @@
     return '/'.join(path.split('/')[0:-cnt])
 
-def getPnForPf(docinfo, pf):
-    """returns image number for image file name or 0"""
+def getPnForPf(docinfo, pf, default=0):
+    """returns image number for image file name or default"""
     if 'imgFileNames' in docinfo:
         pn = docinfo['imgFileNames'].get(pf, None)
@@ -58 +58 @@
                 pf = pf[:xi]
                 # try again, else return 0
-                pn = docinfo['imgFileNames'].get(pf, 0)
+                pn = docinfo['imgFileNames'].get(pf, default)
+            else:
+                # no extension
+                pn = default
                 
         return pn
     
-    return 0
+    return default
 
 
@@ -235 +238 @@
   
     security.declareProtected('View','index_html')
-    def index_html(self,url,mode="texttool",viewMode="auto",viewLayer=None,tocMode=None,start=None,pn=None,pf=None):
+    def index_html(self, url, mode="texttool", viewMode="auto", viewLayer=None, tocMode=None, start=None, pn=None, pf=None):
         """
         show page
@@ -831 +834 @@
         pageinfo['tocMode'] = tocMode
 
-        # TODO: unify current and pn!
-        #pageinfo['current'] = current
         # pf takes precedence over pn
         if pf:
             pageinfo['pf'] = pf
             pn = getPnForPf(docinfo, pf)
+            # replace pf in request params (used for creating new URLs)
+            self.REQUEST.form.pop('pf', None)
+            self.REQUEST.form['pn'] = pn
         else:
             pn = getInt(pn, 1)