Mercurial > hg > documentViewer
changeset 133:40730cfbcb8e
fixed problem with getnumpages and **args
| author | casties |
|---|---|
| date | Thu, 17 Jun 2010 20:34:36 +0200 |
| parents | 39167e96e582 |
| children | 6a33aa624ba4 |
| files | MpdlXmlTextServer.py documentViewer.py |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/MpdlXmlTextServer.py Thu Jun 17 19:38:59 2010 +0200 +++ b/MpdlXmlTextServer.py Thu Jun 17 20:34:36 2010 +0200 @@ -121,7 +121,7 @@ return serializeNode(pagenode) return "no text here" - def getNumPages(self,docinfo=None): + def getNumPages(self, docinfo): """get list of pages from fulltext and put in docinfo""" if 'numPages' in docinfo: # already there @@ -328,4 +328,4 @@ RESPONSE.redirect('manage_main') - \ No newline at end of file +
--- a/documentViewer.py Thu Jun 17 19:38:59 2010 +0200 +++ b/documentViewer.py Thu Jun 17 20:34:36 2010 +0200 @@ -172,9 +172,9 @@ """get search""" return self.template.fulltextclient.getSearch(**args) - def getNumPages(self, **args): + def getNumPages(self, docinfo): """get numpages""" - return self.template.fulltextclient.getNumPages(**args) + return self.template.fulltextclient.getNumPages(docinfo) def getTranslate(self, **args): """get translate""" @@ -587,7 +587,7 @@ docinfo['textURLPath'] = textUrl if not docinfo['imagePath']: # text-only, no page images - docinfo = self.getNumPages(docinfo) #im moment einfach auf eins setzen, navigation ueber die thumbs geht natuerlich nicht + docinfo = self.getNumPages(docinfo) presentationUrls = dom.xpath("//texttool/presentation") docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag