Changeset 543:6cdc31e9ed8e in documentViewer for documentViewer.py

Timestamp:

Aug 22, 2012, 2:25:38 PM (12 years ago)

Author:

casties

Branch:

default

Message:

fixed problem with dict-mode in default view.
added configurable footer and logo in site_template.pt

File:

• documentViewer.py (modified) (6 diffs)

documentViewer.py

@@ -261 +261 @@
     def index_html(self,url,mode="texttool",viewMode="auto",viewLayer=None,tocMode="thumbs",start=1,pn=1):
         """
-        view page
+        show page
         @param url: url which contains display information
         @param mode: defines how to access the document behind url 
         @param viewMode: 'images': display images, 'text': display text, 'xml': display xml, default is 'auto'
-        @param viewLayer: sub-type of viewMode, e.g. 'dict' for viewMode='text'
+        @param viewLayer: sub-type of viewMode, e.g. layer 'dict' for viewMode='text'
         @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none)
         """
@@ -279 +279 @@
             self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary"
             
+        # docinfo: information about document (cached)
         docinfo = self.getDocinfo(mode=mode,url=url,tocMode=tocMode)
+        
+        # userinfo: user settings (cached)
+        userinfo = self.getUserinfo()
         
         # auto viewMode: text if there is a text else images
@@ -286 +290 @@
                 # docinfo.get('textURL', None) not implemented yet
                 viewMode = "text"
-                if viewLayer is None:
+                if viewLayer is None and 'viewLayer' not in userinfo:
+                    # use layer dict as default 
                     viewLayer = "dict"
             else:
@@ -296 +301 @@
             viewLayer = "dict"
             
-        pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, viewLayer=viewLayer, tocMode=tocMode)
+        # safe viewLayer in userinfo
+        userinfo['viewLayer'] = viewLayer
+        
+        # pageinfo: information about page (not cached)
+        pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, userinfo=userinfo, viewMode=viewMode, viewLayer=viewLayer, tocMode=tocMode)
                     
         # get template /template/viewer_$viewMode
@@ -495 +504 @@
 
 
+    def getUserinfo(self):
+        """returns userinfo object"""
+        logging.debug("getUserinfo")
+        userinfo = {}
+        # look for cached userinfo in session
+        if self.REQUEST.SESSION.has_key('userinfo'):
+            userinfo = self.REQUEST.SESSION['userinfo']
+            # check if its still current?
+        else:
+            # store in session
+            self.REQUEST.SESSION['userinfo'] = userinfo
+            
+        return userinfo
+
     def getDocinfo(self, mode, url, tocMode=None):
         """returns docinfo depending on mode"""
@@ -772 +795 @@
     
 
-    def getPageinfo(self, current=None, start=None, rows=None, cols=None, docinfo=None, viewMode=None, viewLayer=None, tocMode=None):
+    def getPageinfo(self, current=None, start=None, rows=None, cols=None, docinfo=None, userinfo=None, viewMode=None, viewLayer=None, tocMode=None):
         """returns pageinfo with the given parameters"""
         logging.debug("getPageInfo(current=%s, start=%s, rows=%s, cols=%s, viewMode=%s, viewLayer=%s, tocMode=%s)"%(current,start,rows,cols,viewMode,viewLayer,tocMode))