Mercurial > hg > documentViewer
diff documentViewer.py @ 419:69205c9d9404
*** empty log message ***
author | abukhman |
---|---|
date | Thu, 06 Jan 2011 16:44:18 +0100 |
parents | ea9aaecd73f1 |
children | 6646227c281e |
line wrap: on
line diff
--- a/documentViewer.py Thu Dec 23 18:13:01 2010 +0100 +++ b/documentViewer.py Thu Jan 06 16:44:18 2011 +0100 @@ -198,21 +198,9 @@ return self.template.fulltextclient.getTextPage(**args) def getQuery(self, **args): - """get query""" + """get query in search""" 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): """get search""" return self.template.fulltextclient.getSearch(**args) @@ -224,31 +212,7 @@ def getAllGisPlaces(self, **args): """get all gis places """ 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): """get translate""" return self.template.fulltextclient.getTranslate(**args) @@ -335,6 +299,9 @@ 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') return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) @@ -724,9 +691,10 @@ if textUrls and (len(textUrls) > 0): textUrl = getTextFromNode(textUrls[0]) docinfo['textURLPath'] = textUrl - if not docinfo['imagePath']: + #if not docinfo['imagePath']: # text-only, no page images - docinfo = self.getNumTextPages(docinfo) + #docinfo = self.getNumTextPages(docinfo) + presentationUrls = dom.xpath("//texttool/presentation") docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag @@ -854,6 +822,7 @@ pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') + toc = int (pageinfo['tocPN']) pageinfo['textPages'] =int (toc)