--- documentViewer/MpdlXmlTextServer.py 2010/10/15 12:01:46 1.146 +++ documentViewer/MpdlXmlTextServer.py 2010/10/18 12:08:39 1.184 @@ -181,15 +181,20 @@ 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"%(docpath, mode, pn)) + 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("getOrigPages :%s"%(pagedivs)) - return pagedivs + logging.debug("YYYYYYpagedivs :%s"%(pagedivs)) + if len(pagedivs)>0: + 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"""