--- documentViewer/MpdlXmlTextServer.py 2010/10/18 12:02:15 1.180 +++ documentViewer/MpdlXmlTextServer.py 2010/10/18 12:08:39 1.184 @@ -181,22 +181,21 @@ class MpdlXmlTextServer(SimpleItem): def getOrigPages (self, docinfo=None, pageinfo=None): """Show original page """ docpath = docinfo['textURLPath'] - url = docinfo['url'] + #url = docinfo['url'] selfurl = self.absolute_url() 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'])) - logging.debug("TEXTIXAXA:%s"%(text)) dom =Parse(text) pagedivs = dom.xpath("//div[@class='pageNumberOrig']") + logging.debug("YYYYYYpagedivs :%s"%(pagedivs)) if len(pagedivs)>0: - originalPage = getTextFromNode(pagedivs[0]) - #return docinfo['originalPage'] + originalPage= getTextFromNode(pagedivs[0]) + #return docinfo['originalPage'] return originalPage - #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""" docpath = docinfo['textURLPath']