--- documentViewer/MpdlXmlTextServer.py 2010/10/13 16:44:09 1.103 +++ documentViewer/MpdlXmlTextServer.py 2010/10/14 12:11:15 1.128 @@ -147,21 +147,27 @@ 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") - 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('N'): + href= hrefNode.nodeValue + hrefList.append(href) + #href=href.href + #href = ",".join(href) + logging.debug("getGisPlaces :%s"%(hrefList)) + + #return ";".join(["%s=%s" % (href, href) for href, href in params.items()]) + #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("documentViewer getGisPlaces (characterNormalization) href:%s"%(href)) - return serializeNode(href) + #logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue)) + #logging.debug("getGisPlaces :%s"%(href)) + return hrefList + #return "no text here" 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"""