--- documentViewer/MpdlXmlTextServer.py 2010/10/08 12:26:25 1.67 +++ 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 @@ -154,6 +156,7 @@ class MpdlXmlTextServer(SimpleItem): docpath = docinfo['textURLPath'] path = docinfo['textURLPath'] url = docinfo['url'] + name = docinfo['name'] viewMode= pageinfo['viewMode'] tocMode = pageinfo['tocMode'] characterNormalization=pageinfo['characterNormalization'] @@ -203,9 +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%s'%url) - - #hrefNode.nodeValue=href.replace('chgis','') + 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)