# HG changeset patch # User abukhman # Date 1287152583 -7200 # Node ID 446cb6197547ce065d2eb9e48412a3fa93f91365 # Parent c7e38112c23ad62371958319b6bc1ecbedf6aa15 *** empty log message *** diff -r c7e38112c23a -r 446cb6197547 MpdlXmlTextServer.py --- a/MpdlXmlTextServer.py Fri Oct 15 16:09:39 2010 +0200 +++ b/MpdlXmlTextServer.py Fri Oct 15 16:23:03 2010 +0200 @@ -190,10 +190,8 @@ dom =Parse(text) pagedivs = dom.xpath("//div[@class='pageNumberOrig']") if len(pagedivs)>0: - logging.debug("getOrigPages :%s"%(pagedivs)) - original =getTextFromNode(pagedivs[0]) - logging.debug("XXXXXXXXXXXgetOrigPagesXXXXXXXX :%s"%(original)) - return original + docinfo['originalPage'] = getTextFromNode(pagedivs[0]) + return docinfo def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): """returns single page from fulltext""" diff -r c7e38112c23a -r 446cb6197547 documentViewer.py --- a/documentViewer.py Fri Oct 15 16:09:39 2010 +0200 +++ b/documentViewer.py Fri Oct 15 16:23:03 2010 +0200 @@ -755,6 +755,7 @@ """returns pageinfo with the given parameters""" pageinfo = {} current = getInt(current) + pageinfo ['originalPage'] = originalPage pageinfo['current'] = current rows = int(rows or self.thumbrows) pageinfo['rows'] = rows @@ -787,6 +788,8 @@ toc = int (pageinfo['tocPN']) pageinfo['textPages'] =int (toc) + + if 'tocSize_%s'%tocMode in docinfo: tocSize = int(docinfo['tocSize_%s'%tocMode]) tocPageSize = int(pageinfo['tocPageSize'])