--- documentViewer/MpdlXmlTextServer.py 2010/10/15 14:06:01 1.158 +++ documentViewer/MpdlXmlTextServer.py 2010/10/18 11:57:07 1.179 @@ -178,22 +178,25 @@ class MpdlXmlTextServer(SimpleItem): logging.debug("getALLGisPlaces :%s"%(myList)) return myList - def getOrigPages (self, docinfo=None, pageinfo=None): + 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'] - pagedivs="" + 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("getOrigPages :%s"%(pagedivs)) - original =getTextFromNode(pagedivs[0]) - logging.debug("XXXXXXXXXXXgetOrigPagesXXXXXXXX :%s"%(original)) - return original - + if len(pagedivs)>0: + 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']