Changeset 508:d5a47f82e755 in documentViewer for documentViewer.py

Timestamp:

Feb 27, 2012, 8:26:52 PM (12 years ago)

Author:

casties

Branch:

elementtree

Message:

more cleanup.
search works mostly now.
layers work better now.

File:

• documentViewer.py (modified) (5 diffs)

documentViewer.py

@@ -175 +175 @@
         return self.template.fulltextclient.getTextPage(**args)
 
+    def getSearchResults(self, **args):
+        """loads list of search results and stores XML in docinfo"""
+        return self.template.fulltextclient.getSearchResults(**args)
+
+    def getResultsPage(self, **args):
+        """returns one page of the search results"""
+        return self.template.fulltextclient.getResultsPage(**args)
+
     def getToc(self, **args):
-        """returns the full table of contents (in internal format)"""
+        """loads table of contents and stores XML in docinfo"""
         return self.template.fulltextclient.getToc(**args)
 
@@ -248 +256 @@
         if tocMode != "thumbs":
             # get table of contents
-            docinfo = self.getToc(mode=tocMode, docinfo=docinfo)
+            self.getToc(mode=tocMode, docinfo=docinfo)
 
         # auto viewMode: text if there is a text else images
@@ -254 +262 @@
             if docinfo.get('textURL', None) or docinfo.get('textURLPath', None): 
                 viewMode = "text"
-                viewLayer = "dict"
+                if viewLayer is None:
+                    viewLayer = "dict"
             else:
                 viewMode = "images"
@@ -263 +272 @@
             viewLayer = "dict"
             
-        # stringify viewLayer
-        if isinstance(viewLayer, list):
-            logging.debug("index_html: viewLayer is list:%s"%viewLayer)
-            viewLayer = ','.join([t for t in viewLayer if t])
-                        
         pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, viewLayer=viewLayer, tocMode=tocMode)
                     
@@ -675 +679 @@
         pageinfo = {}
         pageinfo['viewMode'] = viewMode
+        # split viewLayer if necessary
+        if isinstance(viewLayer,basestring):
+            viewLayer = viewLayer.split(',')
+            
+        if isinstance(viewLayer, list):
+            logging.debug("getPageinfo: viewLayer is list:%s"%viewLayer)
+            # save (unique) list in viewLayers
+            seen = set()
+            viewLayers = [l for l in viewLayer if l and l not in seen and not seen.add(l)]
+            pageinfo['viewLayers'] = viewLayers
+            # stringify viewLayer
+            viewLayer = ','.join(viewLayers)
+        else:
+            #create list
+            pageinfo['viewLayers'] = [viewLayer]
+                        
         pageinfo['viewLayer'] = viewLayer
         pageinfo['tocMode'] = tocMode