version 1.175.2.20, 2011/08/05 13:31:27
|
version 1.175.2.21, 2011/08/05 17:04:20
|
Line 276 class documentViewer(Folder):
|
Line 276 class documentViewer(Folder):
|
@param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none) |
@param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none) |
""" |
""" |
|
|
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'): |
if not hasattr(self, 'template'): |
# this won't work |
# this won't work |
Line 305 class documentViewer(Folder):
|
Line 305 class documentViewer(Folder):
|
viewMode = "text" |
viewMode = "text" |
viewType = "dict" |
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) |
pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, viewType=viewType, tocMode=tocMode) |
|
|
# get template /template/viewer_main |
# get template /template/viewer_$viewMode |
pt = getattr(self.template, 'viewer_main') |
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 |
# and execute with parameters |
return pt(docinfo=docinfo, pageinfo=pageinfo) |
return pt(docinfo=docinfo, pageinfo=pageinfo) |
|
|
Line 380 class documentViewer(Folder):
|
Line 388 class documentViewer(Folder):
|
"""returns URL to documentviewer with parameter param set to val or from dict params""" |
"""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) |
# quote values and assemble into query string (not escaping '/') |
# 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: |
if baseUrl is None: |
baseUrl = self.getDocumentViewerURL() |
baseUrl = self.getDocumentViewerURL() |
|
|