--- documentViewer/MpdlXmlTextServer.py 2010/10/11 14:49:37 1.78 +++ documentViewer/MpdlXmlTextServer.py 2010/10/11 15:54:24 1.85 @@ -143,18 +143,17 @@ class MpdlXmlTextServer(SimpleItem): def getGisPlases(self, docinfo): """ Show all Gis Places of whole Page""" xpath='//place' - text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath)) + text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'], xpath,pn)) pagedom = Parse(text) - result =pagedom.xpath("//result/resultPage/") - logging.debug("YYYY result%s"%result) + result =pagedom.xpath("//result/resultPage") for l in result: hrefNode= l.getAttributeNodeNS(None, u"place") - logging.debug("YYYY hrefNode%s"%hrefNode) + logging.debug("documentViewer (characterNormalization) l:%s"%(l)) if hrefNode: href= hrefNode.nodeValue if href.startswith('id='): - hrefNode.nodeValue = href.replace('id=',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%sid="%(url,viewMode,tocMode,tocPN,pn)) - logging.debug("YYYY href%s"%href) + hrefNode.nodeValue = href.replace('id=',"?") + return serializeNode(pagenode) def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):