--- documentViewer/MpdlXmlTextServer.py 2010/10/18 10:01:16 1.168 +++ documentViewer/MpdlXmlTextServer.py 2010/10/18 12:08:39 1.184 @@ -178,9 +178,9 @@ 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'] @@ -189,12 +189,13 @@ class MpdlXmlTextServer(SimpleItem): 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']") + logging.debug("YYYYYYpagedivs :%s"%(pagedivs)) if len(pagedivs)>0: - docinfo['originalPage'] = getTextFromNode(pagedivs[0]) + originalPage= getTextFromNode(pagedivs[0]) #return docinfo['originalPage'] - #return originalPage - return docinfo - + 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']