Changeset 475:5a3ab27385ce in documentViewer for documentViewer.py
- Timestamp:
- Aug 5, 2011, 5:04:20 PM (13 years ago)
- Branch:
- elementtree
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
documentViewer.py
r474 r475 277 277 """ 278 278 279 logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))279 logging.debug("documentViewer(index_html) mode=%s url=%s viewMode=%s viewType=%s start=%s pn=%s"%(mode,url,viewMode,viewType,start,pn)) 280 280 281 281 if not hasattr(self, 'template'): … … 306 306 viewType = "dict" 307 307 308 308 # stringify viewType 309 if isinstance(viewType, list): 310 viewType = ','.join([t for t in viewType if t]) 311 309 312 pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, viewType=viewType, tocMode=tocMode) 310 313 311 # get template /template/viewer_main 312 pt = getattr(self.template, 'viewer_main') 314 # get template /template/viewer_$viewMode 315 pt = getattr(self.template, 'viewer_%s'%viewMode, None) 316 if pt is None: 317 logging.error("No template for viewMode=%s!"%viewMode) 318 # TODO: error page? 319 return "No template for viewMode=%s!"%viewMode 320 313 321 # and execute with parameters 314 322 return pt(docinfo=docinfo, pageinfo=pageinfo) … … 381 389 urlParams = self.getParams(param=param, val=val, params=params) 382 390 # quote values and assemble into query string (not escaping '/') 383 ps = paramSep.join(["%s=%s"%(k,urllib.quote_plus( v,'/')) for (k, v) in urlParams.items()])391 ps = paramSep.join(["%s=%s"%(k,urllib.quote_plus(unicode(v),'/')) for (k, v) in urlParams.items()]) 384 392 if baseUrl is None: 385 393 baseUrl = self.getDocumentViewerURL()
Note: See TracChangeset
for help on using the changeset viewer.