# HG changeset patch # User abukhman # Date 1287403487 -7200 # Node ID 0b660cb2889e07557e607f8a851d45f510cc53f9 # Parent fb9bbc7c0659699019b19b57a8f60991553a39b3 *** empty log message *** diff -r fb9bbc7c0659 -r 0b660cb2889e MpdlXmlTextServer.py --- a/MpdlXmlTextServer.py Mon Oct 18 14:02:15 2010 +0200 +++ b/MpdlXmlTextServer.py Mon Oct 18 14:04:47 2010 +0200 @@ -178,24 +178,22 @@ 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'] + #docpath = docinfo['textURLPath'] + #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']") if len(pagedivs)>0: originalPage = getTextFromNode(pagedivs[0]) - #return docinfo['originalPage'] + #return docinfo['originalPage'] return originalPage - #return docinfo + #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"""