--- documentViewer/MpdlXmlTextServer.py 2010/10/13 15:49:08 1.96 +++ documentViewer/MpdlXmlTextServer.py 2010/10/13 16:46:19 1.104 @@ -142,25 +142,27 @@ class MpdlXmlTextServer(SimpleItem): def getGisPlaces(self, docinfo=None, pageinfo=None): """ Show all Gis Places of whole Page""" - #xpath='//place' + xpath='//place' docpath = docinfo['textURLPath'] url = docinfo['url'] selfurl = self.absolute_url() pn = pageinfo['current'] - text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],'//place',pn)) - #logging.debug("documentViewer getGisPlaces (text) text:%s"%(text)) - pagedom = Parse(text) - result =pagedom.xpath("//result/resultPage/place") + text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn)) + dom = Parse(text) + 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=',"?") - 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 (characterNormalization) 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"""