--- documentViewer/MpdlXmlTextServer.py 2010/10/11 13:30:49 1.71 +++ documentViewer/MpdlXmlTextServer.py 2010/10/11 14:04:21 1.74 @@ -145,7 +145,9 @@ class MpdlXmlTextServer(SimpleItem): xpath='//place' text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath)) pagedom = Parse(text) - result =pagedom.xpath("//result/resultPage/place") + result =pagedom.xpath("//result/resultPage/") + for l in result: + hrefNode= l.getAttributeNodeNS(None, u"id") docinfo['place']=getTextFromNode(result[0]) return docinfo @@ -204,8 +206,9 @@ class MpdlXmlTextServer(SimpleItem): if hrefNode: href=hrefNode.nodeValue if href.startswith('http://chinagis.mpiwg-berlin.mpg.de'): - hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/'%name) + hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/name=%s'%name) #hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl%s'%url) + logging.debug("YYYYY docinfo[name] %s"%docinfo['name']) l.setAttributeNS(None, 'target', '_blank') return serializeNode(pagenode)