version 1.175.2.13, 2011/08/01 17:30:38
|
version 1.175.2.16, 2011/08/03 19:04:18
|
Line 300 class documentViewer(Folder):
|
Line 300 class documentViewer(Folder):
|
|
|
pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, tocMode=tocMode) |
pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, tocMode=tocMode) |
|
|
if viewMode != 'images' and docinfo.get('textURLPath', None): |
|
# get full text page |
|
page = self.getTextPage(mode=viewMode, pn=pn, docinfo=docinfo, pageinfo=pageinfo) |
|
pageinfo['textPage'] = page |
|
|
|
# get template /template/viewer_main |
# get template /template/viewer_main |
pt = getattr(self.template, 'viewer_main') |
pt = getattr(self.template, 'viewer_main') |
# and execute with parameters |
# and execute with parameters |
Line 344 class documentViewer(Folder):
|
Line 339 class documentViewer(Folder):
|
else: |
else: |
return style |
return style |
|
|
def getLink(self, param=None, val=None, params=None, baseUrl=None, paramSep='&'): |
def getParams(self, param=None, val=None, params=None): |
"""returns URL to documentviewer with parameter param set to val or from dict params""" |
"""returns dict with URL parameters. |
|
|
|
Takes URL parameters and additionally param=val or dict params. |
|
Deletes key if value is None.""" |
# copy existing request params |
# copy existing request params |
urlParams=self.REQUEST.form.copy() |
newParams=self.REQUEST.form.copy() |
# change single param |
# change single param |
if param is not None: |
if param is not None: |
if val is None: |
if val is None: |
if urlParams.has_key(param): |
if newParams.has_key(param): |
del urlParams[param] |
del newParams[param] |
else: |
else: |
urlParams[param] = str(val) |
newParams[param] = str(val) |
|
|
# change more params |
# change more params |
if params is not None: |
if params is not None: |
Line 362 class documentViewer(Folder):
|
Line 360 class documentViewer(Folder):
|
v = params[k] |
v = params[k] |
if v is None: |
if v is None: |
# val=None removes param |
# val=None removes param |
if urlParams.has_key(k): |
if newParams.has_key(k): |
del urlParams[k] |
del newParams[k] |
|
|
else: |
else: |
urlParams[k] = v |
newParams[k] = v |
|
|
# FIXME: does this belong here? |
return newParams |
if urlParams.get("mode", None) == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath |
|
urlParams["mode"] = "imagepath" |
|
urlParams["url"] = getParentPath(urlParams["url"]) |
|
|
|
|
def getLink(self, param=None, val=None, params=None, baseUrl=None, paramSep='&'): |
|
"""returns URL to documentviewer with parameter param set to val or from dict 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(v,'/')) for (k, v) in urlParams.items()]) |
#ps = urllib.urlencode(urlParams) |
|
if baseUrl is None: |
if baseUrl is None: |
baseUrl = self.REQUEST['URL1'] |
baseUrl = self.getDocumentViewerURL() |
|
|
url = "%s?%s"%(baseUrl, ps) |
url = "%s?%s"%(baseUrl, ps) |
return url |
return url |
|
|
|
|
def getLinkAmp(self, param=None, val=None, params=None, baseUrl=None): |
def getLinkAmp(self, param=None, val=None, params=None, baseUrl=None): |
"""link to documentviewer with parameter param set to val""" |
"""link to documentviewer with parameter param set to val""" |
return self.getLink(param, val, params, baseUrl, '&') |
return self.getLink(param, val, params, baseUrl, '&') |
|
|
|
|
def getInfo_xml(self,url,mode): |
def getInfo_xml(self,url,mode): |
"""returns info about the document as XML""" |
"""returns info about the document as XML""" |
if not self.digilibBaseUrl: |
if not self.digilibBaseUrl: |
Line 564 class documentViewer(Folder):
|
Line 561 class documentViewer(Folder):
|
textUrl = texttool.get('text-url-path', None) |
textUrl = texttool.get('text-url-path', None) |
if textUrl: |
if textUrl: |
docinfo['textURLPath'] = textUrl |
docinfo['textURLPath'] = textUrl |
#TODO: ugly: |
|
#textUrlkurz = string.split(textUrl, ".")[0] |
# page flow |
#docinfo['textURLPathkurz'] = textUrlkurz |
docinfo['pageFlow'] = texttool.get('page-flow', 'ltr') |
|
|
|
# odd pages are left |
|
docinfo['oddPage'] = texttool.get('odd-scan-orientation', 'left') |
|
|
|
# number of title page (0: not defined) |
|
docinfo['titlePage'] = texttool.get('title-scan-no', 0) |
|
|
# old presentation stuff |
# old presentation stuff |
presentation = texttool.get('presentation', None) |
presentation = texttool.get('presentation', None) |
Line 576 class documentViewer(Folder):
|
Line 579 class documentViewer(Folder):
|
else: |
else: |
docinfo['presentationUrl'] = os.path.join(docPath, presentation) |
docinfo['presentationUrl'] = os.path.join(docPath, presentation) |
|
|
|
|
return docinfo |
return docinfo |
|
|
def getDocinfoFromBib(self, docinfo, bib): |
def getDocinfoFromBib(self, docinfo, bib): |
Line 664 class documentViewer(Folder):
|
Line 668 class documentViewer(Folder):
|
"""returns pageinfo with the given parameters""" |
"""returns pageinfo with the given parameters""" |
pageinfo = {} |
pageinfo = {} |
current = getInt(current) |
current = getInt(current) |
|
|
pageinfo['current'] = current |
pageinfo['current'] = current |
rows = int(rows or self.thumbrows) |
rows = int(rows or self.thumbrows) |
pageinfo['rows'] = rows |
pageinfo['rows'] = rows |
Line 677 class documentViewer(Folder):
|
Line 680 class documentViewer(Folder):
|
# int(current / grpsize) * grpsize +1)) |
# int(current / grpsize) * grpsize +1)) |
pageinfo['start'] = start |
pageinfo['start'] = start |
pageinfo['end'] = start + grpsize |
pageinfo['end'] = start + grpsize |
if (docinfo is not None) and ('numPages' in docinfo): |
pn = self.REQUEST.get('pn','1') |
np = int(docinfo['numPages']) |
pageinfo['pn'] = pn |
|
np = int(docinfo.get('numPages', 0)) |
|
if np == 0: |
|
# numPages unknown - maybe we can get it from text page |
|
if docinfo.get('textURLPath', None): |
|
# cache text page as well |
|
pageinfo['textPage'] = self.getTextPage(mode=viewMode, pn=pn, docinfo=docinfo, pageinfo=pageinfo) |
|
np = int(docinfo.get('numPages', 0)) |
|
|
pageinfo['end'] = min(pageinfo['end'], np) |
pageinfo['end'] = min(pageinfo['end'], np) |
pageinfo['numgroups'] = int(np / grpsize) |
pageinfo['numgroups'] = int(np / grpsize) |
if np % grpsize > 0: |
if np % grpsize > 0: |
Line 691 class documentViewer(Folder):
|
Line 702 class documentViewer(Folder):
|
pageinfo['query'] = self.REQUEST.get('query','') |
pageinfo['query'] = self.REQUEST.get('query','') |
pageinfo['queryType'] = self.REQUEST.get('queryType','') |
pageinfo['queryType'] = self.REQUEST.get('queryType','') |
pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') |
pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') |
pageinfo['textPN'] = self.REQUEST.get('textPN','1') |
|
pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','') |
pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','') |
pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') |
pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') |
pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') |
pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') |
Line 713 class documentViewer(Folder):
|
Line 723 class documentViewer(Folder):
|
pageinfo['tocPN'] = min(tocPages,toc) |
pageinfo['tocPN'] = min(tocPages,toc) |
|
|
pageinfo['searchPN'] =self.REQUEST.get('searchPN','1') |
pageinfo['searchPN'] =self.REQUEST.get('searchPN','1') |
pageinfo['sn'] =self.REQUEST.get('sn','') |
|
return pageinfo |
return pageinfo |
|
|
|
|