Changeset 475:5a3ab27385ce in documentViewer

Timestamp:

Aug 5, 2011, 5:04:20 PM (14 years ago)

Author:

casties

Branch:

elementtree

Message:

more new template stuff

Files:

• MpdlXmlTextServer.py (modified) (3 diffs)
• documentViewer.py (modified) (3 diffs)

MpdlXmlTextServer.py

@@ -258 +258 @@
                 docinfo['numTocEntries'] = getInt(div.text)
                 
+            # numPlaces
+            elif dc == 'countPlaces':
+                docinfo['numPlaces'] = getInt(div.text)
+                
             # numTextPages
             elif dc == 'countPages':
@@ -303 +307 @@
         elif not mode:
             # default is text
+            mode = "text"
             textmode = "text"
         else:
@@ -341 +346 @@
             
         # text-with-links mode
-        elif mode == "text_dict":
+        elif mode == "dict":
             if pagediv is not None:
                 # check all a-tags

documentViewer.py

@@ -277 +277 @@
         """
         
-        logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))
+        logging.debug("documentViewer(index_html) mode=%s url=%s viewMode=%s viewType=%s start=%s pn=%s"%(mode,url,viewMode,viewType,start,pn))
         
         if not hasattr(self, 'template'):
@@ -306 +306 @@
             viewType = "dict"
             
-                
+        # stringify viewType
+        if isinstance(viewType, list):
+            viewType = ','.join([t for t in viewType if t])
+                        
         pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, viewType=viewType, tocMode=tocMode)
                     
-        # get template /template/viewer_main
-        pt = getattr(self.template, 'viewer_main')
+        # get template /template/viewer_$viewMode
+        pt = getattr(self.template, 'viewer_%s'%viewMode, None)
+        if pt is None:
+            logging.error("No template for viewMode=%s!"%viewMode)
+            # TODO: error page?
+            return "No template for viewMode=%s!"%viewMode
+        
         # and execute with parameters
         return pt(docinfo=docinfo, pageinfo=pageinfo)
@@ -381 +389 @@
         urlParams = self.getParams(param=param, val=val, params=params)
         # quote values and assemble into query string (not escaping '/')
-        ps = paramSep.join(["%s=%s"%(k,urllib.quote_plus(v,'/')) for (k, v) in urlParams.items()])
+        ps = paramSep.join(["%s=%s"%(k,urllib.quote_plus(unicode(v),'/')) for (k, v) in urlParams.items()])
         if baseUrl is None:
             baseUrl = self.getDocumentViewerURL()