Changeset 478:cd37d6f8d5e8 in documentViewer for documentViewer.py

Timestamp:

Aug 12, 2011, 2:41:39 PM (13 years ago)

Author:

casties

Branch:

elementtree

Message:

more cleanup

File:

• documentViewer.py (modified) (7 diffs)

documentViewer.py

@@ -210 +210 @@
         return self.template.fulltextclient.getAllGisPlaces(**args)
        
-    def getTranslate(self, **args):
+    def getWordInfo(self, **args):
         """get translate"""
-        return self.template.fulltextclient.getTranslate(**args)
+        return self.template.fulltextclient.getWordInfo(**args)
 
     def getLemma(self, **args):
@@ -311 +311 @@
         # stringify viewType
         if isinstance(viewType, list):
+            logging.debug("index_html: viewType is list:%s"%viewType)
             viewType = ','.join([t for t in viewType if t])
                         
@@ -359 +360 @@
             return style
     
-    def getParams(self, param=None, val=None, params=None):
+    def getParams(self, param=None, val=None, params=None, duplicates=None):
         """returns dict with URL parameters.
         
@@ -376 +377 @@
         # change more params
         if params is not None:
-            for k in params.keys():
-                v = params[k]
+            for (k, v) in params.items():
                 if v is None:
                     # val=None removes param
@@ -385 +385 @@
                 else:
                     newParams[k] = v
-                    
+
+        if duplicates:
+            # eliminate lists (coming from duplicate keys)
+            for (k,v) in newParams.items():
+                if isinstance(v, list):
+                    if duplicates == 'comma':
+                        # make comma-separated list of non-empty entries
+                        newParams[k] = ','.join([t for t in v if t])
+                    elif duplicates == 'first':
+                        # take first non-empty entry
+                        newParams[k] = [t for t in v if t][0]
+        
         return newParams
     
-    def getLink(self, param=None, val=None, params=None, baseUrl=None, paramSep='&'):
+    def getLink(self, param=None, val=None, params=None, baseUrl=None, paramSep='&', duplicates='comma'):
         """returns URL to documentviewer with parameter param set to val or from dict params"""
-        urlParams = self.getParams(param=param, val=val, params=params)
+        urlParams = self.getParams(param=param, val=val, params=params, duplicates=duplicates)
         # quote values and assemble into query string (not escaping '/')
         ps = paramSep.join(["%s=%s"%(k,urllib.quote_plus(unicode(v),'/')) for (k, v) in urlParams.items()])
@@ -399 +410 @@
         return url
 
-    def getLinkAmp(self, param=None, val=None, params=None, baseUrl=None):
+    def getLinkAmp(self, param=None, val=None, params=None, baseUrl=None, duplicates='comma'):
         """link to documentviewer with parameter param set to val"""
-        return self.getLink(param, val, params, baseUrl, '&')
+        return self.getLink(param=param, val=val, params=params, baseUrl=baseUrl, paramSep='&', duplicates=duplicates)
     
     
@@ -687 +698 @@
     
 
-    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, viewType=None, tocMode=None):
+    def getPageinfo(self, current=None, start=None, rows=None, cols=None, docinfo=None, viewMode=None, viewType=None, tocMode=None):
         """returns pageinfo with the given parameters"""
+        logging.debug("getPageInfo(current=%s, start=%s, rows=%s, cols=%s, viewMode=%s, viewType=%s, tocMode=%s)"%(current,start,rows,cols,viewMode,viewType,tocMode))
         pageinfo = {}
         pageinfo['viewMode'] = viewMode