--- documentViewer/MpdlXmlTextServer.py 2010/10/13 15:16:01 1.90 +++ documentViewer/MpdlXmlTextServer.py 2010/10/14 14:53:14 1.141 @@ -146,20 +146,22 @@ class MpdlXmlTextServer(SimpleItem): docpath = docinfo['textURLPath'] url = docinfo['url'] selfurl = self.absolute_url() - - 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/*") + 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") - 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) + href= hrefNode.nodeValue + hrefList.append(href) + myList = ",".join(hrefList) + #hoho =hrefList.replace('','') + #probe =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name) + #l.setAttributeNS(None, 'target', '_blank') + logging.debug("getGisPlaces :%s"%(myList)) + return myList 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"""