version 1.161, 2010/12/20 13:52:07
|
version 1.164, 2011/01/11 10:55:37
|
Line 198 class documentViewer(Folder):
|
Line 198 class documentViewer(Folder):
|
return self.template.fulltextclient.getTextPage(**args) |
return self.template.fulltextclient.getTextPage(**args) |
|
|
def getQuery(self, **args): |
def getQuery(self, **args): |
"""get query""" |
"""get query in search""" |
return self.template.fulltextclient.getQuery(**args) |
return self.template.fulltextclient.getQuery(**args) |
|
|
def getQueryResultHits(self, **args): |
|
"""get query""" |
|
return self.template.fulltextclient.getQueryResultHits(**args) |
|
|
|
def getQueryResultHitsText(self, **args): |
|
"""get query""" |
|
return self.template.fulltextclient.getQueryResultHitsText(**args) |
|
|
|
def getQueryResultHitsFigures(self, **args): |
|
"""get query""" |
|
return self.template.fulltextclient.getQueryResultHitsFigures(**args) |
|
|
|
def getSearch(self, **args): |
def getSearch(self, **args): |
"""get search""" |
"""get search""" |
return self.template.fulltextclient.getSearch(**args) |
return self.template.fulltextclient.getSearch(**args) |
Line 225 class documentViewer(Folder):
|
Line 213 class documentViewer(Folder):
|
"""get all gis places """ |
"""get all gis places """ |
return self.template.fulltextclient.getAllGisPlaces(**args) |
return self.template.fulltextclient.getAllGisPlaces(**args) |
|
|
def getOrigPages(self, **args): |
|
"""get original page number """ |
|
return self.template.fulltextclient.getOrigPages(**args) |
|
|
|
def getAllPlaces(self, **args): |
|
"""get original page number """ |
|
return self.template.fulltextclient.getAllPlaces(**args) |
|
|
|
def getTocEntries(self, **args): |
|
"""get original page number """ |
|
return self.template.fulltextclient.getTocEntries(**args) |
|
|
|
def getFigureEntries(self, **args): |
|
"""get original page number """ |
|
return self.template.fulltextclient.getFigureEntries(**args) |
|
|
|
def getNumPages(self, docinfo): |
|
"""get numpages""" |
|
return self.template.fulltextclient.getNumPages(docinfo) |
|
|
|
def getNumTextPages(self, docinfo): |
|
"""get numpages text""" |
|
return self.template.fulltextclient.getNumTextPages(docinfo) |
|
|
|
def getTranslate(self, **args): |
def getTranslate(self, **args): |
"""get translate""" |
"""get translate""" |
return self.template.fulltextclient.getTranslate(**args) |
return self.template.fulltextclient.getTranslate(**args) |
Line 335 class documentViewer(Folder):
|
Line 299 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 (docinfo.get('textURLPath',None)): |
|
page = self.getTextPage(docinfo=docinfo, pageinfo=pageinfo) |
|
pageinfo['textPage'] = page |
pt = getattr(self.template, 'viewer_main') |
pt = getattr(self.template, 'viewer_main') |
return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) |
return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) |
|
|
Line 351 class documentViewer(Folder):
|
Line 318 class documentViewer(Folder):
|
|
|
def getBrowser(self): |
def getBrowser(self): |
"""getBrowser the version of browser """ |
"""getBrowser the version of browser """ |
names="" |
bt = browserCheck(self) |
names = browserCheck(self) |
logging.debug("BROWSER VERSION: %s"%(bt)) |
return names |
return bt |
|
|
def findDigilibUrl(self): |
def findDigilibUrl(self): |
"""try to get the digilib URL from zogilib""" |
"""try to get the digilib URL from zogilib""" |
Line 372 class documentViewer(Folder):
|
Line 339 class documentViewer(Folder):
|
else: |
else: |
return style |
return style |
|
|
def getLink(self,param=None,val=None): |
def getLink(self, param=None, val=None, params=None, baseUrl=None, paramSep='&'): |
"""link to documentviewer with parameter param set to val""" |
"""returns URL to documentviewer with parameter param set to val or from dict params""" |
params=self.REQUEST.form.copy() |
# copy existing request params |
|
urlParams=self.REQUEST.form.copy() |
|
# change single param |
if param is not None: |
if param is not None: |
if val is None: |
if val is None: |
if params.has_key(param): |
if urlParams.has_key(param): |
del params[param] |
del urlParams[param] |
else: |
else: |
params[param] = str(val) |
urlParams[param] = str(val) |
|
|
if params.get("mode", None) == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath |
# change more params |
params["mode"] = "imagepath" |
if params is not None: |
params["url"] = getParentDir(params["url"]) |
for k in params.keys(): |
|
v = params[k] |
# quote values and assemble into query string |
if v is None: |
#ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
# val=None removes param |
ps = urllib.urlencode(params) |
if urlParams.has_key(k): |
url=self.REQUEST['URL1']+"?"+ps |
del urlParams[k] |
|
|
|
else: |
|
urlParams[k] = v |
|
|
|
# FIXME: does this belong here? |
|
if urlParams.get("mode", None) == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath |
|
urlParams["mode"] = "imagepath" |
|
urlParams["url"] = getParentDir(urlParams["url"]) |
|
|
|
# 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 = urllib.urlencode(urlParams) |
|
if baseUrl is None: |
|
baseUrl = self.REQUEST['URL1'] |
|
|
|
url = "%s?%s"%(baseUrl, ps) |
return url |
return url |
|
|
def getLinkAmp(self,param=None,val=None): |
|
"""link to documentviewer with parameter param set to val""" |
|
params=self.REQUEST.form.copy() |
|
if param is not None: |
|
if val is None: |
|
if params.has_key(param): |
|
del params[param] |
|
else: |
|
params[param] = str(val) |
|
|
|
# quote values and assemble into query string |
def getLinkAmp(self, param=None, val=None, params=None, baseUrl=None): |
logging.debug("XYXXXXX: %s"%repr(params.items())) |
"""link to documentviewer with parameter param set to val""" |
ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
return self.getLink(param, val, params, baseUrl, '&') |
url=self.REQUEST['URL1']+"?"+ps |
|
return url |
|
|
|
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""" |
Line 718 class documentViewer(Folder):
|
Line 692 class documentViewer(Folder):
|
if textUrls and (len(textUrls) > 0): |
if textUrls and (len(textUrls) > 0): |
textUrl = getTextFromNode(textUrls[0]) |
textUrl = getTextFromNode(textUrls[0]) |
docinfo['textURLPath'] = textUrl |
docinfo['textURLPath'] = textUrl |
if not docinfo['imagePath']: |
#if not docinfo['imagePath']: |
# text-only, no page images |
# text-only, no page images |
docinfo = self.getNumTextPages(docinfo) |
#docinfo = self.getNumTextPages(docinfo) |
|
|
|
|
presentationUrls = dom.xpath("//texttool/presentation") |
presentationUrls = dom.xpath("//texttool/presentation") |
docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag |
docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag |
Line 848 class documentViewer(Folder):
|
Line 823 class documentViewer(Folder):
|
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') |
pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') |
pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') |
|
|
toc = int (pageinfo['tocPN']) |
toc = int (pageinfo['tocPN']) |
pageinfo['textPages'] =int (toc) |
pageinfo['textPages'] =int (toc) |
|
|