--- documentViewer/MpdlXmlTextServer.py 2010/10/14 10:03:06 1.112 +++ documentViewer/MpdlXmlTextServer.py 2010/10/14 12:39:27 1.132 @@ -147,20 +147,20 @@ class MpdlXmlTextServer(SimpleItem): url = docinfo['url'] selfurl = self.absolute_url() pn = pageinfo['current'] - + hrefList=[] + text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn)) dom = Parse(text) result = dom.xpath("//result/resultPage/place") for l in result: hrefNode= l.getAttributeNodeNS(None, u"id") href= hrefNode.nodeValue - #koka=href - #logging.debug("getGisPlaces :%s"%(href)) - #if href.startswith('id='): - #hrefNode.nodeValue = href.replace('id=',"?") - #logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue)) - logging.debug("getGisPlaces :%s"%(serializeNode(href))) - return serializeNode(href) + hrefList.append(href) + hoho= hrefList.remove("['u%s']"%href) + logging.debug("getGisPlaces :%s"%(hoho)) + + + return hrefList 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"""