--- documentViewer/MpdlXmlTextServer.py 2010/10/15 14:54:07 1.163 +++ documentViewer/MpdlXmlTextServer.py 2010/10/18 10:01:16 1.168 @@ -178,9 +178,9 @@ class MpdlXmlTextServer(SimpleItem): logging.debug("getALLGisPlaces :%s"%(myList)) return myList - def getOrigPages (self, docinfo=None, pageinfo=None): + def getOrigPages (self, docinfo=None): """Show original page """ - docpath = docinfo['textURLPath'] + #docpath = docinfo['textURLPath'] #url = docinfo['url'] selfurl = self.absolute_url() pn =pageinfo['current'] @@ -191,8 +191,10 @@ class MpdlXmlTextServer(SimpleItem): pagedivs = dom.xpath("//div[@class='pageNumberOrig']") if len(pagedivs)>0: docinfo['originalPage'] = getTextFromNode(pagedivs[0]) - return docinfo['originalPage'] - + #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']