--- documentViewer/MpdlXmlTextServer.py 2010/10/13 16:34:32 1.100 +++ documentViewer/MpdlXmlTextServer.py 2010/10/13 16:48:14 1.105 @@ -150,17 +150,19 @@ class MpdlXmlTextServer(SimpleItem): text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn)) dom = Parse(text) - result = dom.xpath("//result/resultPage") + result = dom.xpath("//result/resultPage/place") logging.debug("getGisPlaces (place) result:%s"%(result)) for l in result: hrefNode= l.getAttributeNodeNS(None, u"id") logging.debug("documentViewer getGisPlaces (characterNormalization) l:%s"%(l)) if hrefNode: href= hrefNode.nodeValue - if href.startswith('id='): - hrefNode.nodeValue = href.replace('id=',"?") - logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue)) - return serializeNode(pagenode) + if href.startswith('N'): + #hrefNode.nodeValue = href.replace('id=',"?") + logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue)) + logging.debug("documentViewer getGisPlaces (characterNormalization) href:%s"%(href)) + logging.debug("documentViewer getGisPlaces ALL GIS TOGETHER href:%s"%(href)) + return serializeNode(href) 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"""