--- documentViewer/MpdlXmlTextServer.py 2010/10/18 10:45:30 1.172 +++ documentViewer/MpdlXmlTextServer.py 2010/10/18 12:07:11 1.183 @@ -178,25 +178,22 @@ class MpdlXmlTextServer(SimpleItem): logging.debug("getALLGisPlaces :%s"%(myList)) return myList - def getOrigPages (self, docinfo=None): + def getOrigPages (self, docinfo=None, pageinfo=None): """Show original page """ - #docpath = docinfo['textURLPath'] + docpath = docinfo['textURLPath'] #url = docinfo['url'] selfurl = self.absolute_url() - #pn =pageinfo['current'] + pn =pageinfo['current'] - #viewMode= pageinfo['viewMode'] - #text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text', pn)) - text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath'])) - loging.debug("TEXTIXAXA:%s"%(text)) + viewMode= pageinfo['viewMode'] + text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text', pn)) dom =Parse(text) pagedivs = dom.xpath("//div[@class='pageNumberOrig']") if len(pagedivs)>0: - docinfo['originalPage'] = getTextFromNode(pagedivs[0]) - #return docinfo['originalPage'] - #return originalPage - return docinfo - + originalPage= getTextFromNode(pagedivs[0]) + #return docinfo['originalPage'] + return originalPage + 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""" docpath = docinfo['textURLPath']