Mercurial > hg > documentViewer
changeset 236:ccdce5aca47b
*** empty log message ***
| author | abukhman |
|---|---|
| date | Mon, 11 Oct 2010 15:58:31 +0200 |
| parents | f4ece44559e5 |
| children | d596d6839fb8 |
| files | MpdlXmlTextServer.py |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/MpdlXmlTextServer.py Mon Oct 11 15:54:43 2010 +0200 +++ b/MpdlXmlTextServer.py Mon Oct 11 15:58:31 2010 +0200 @@ -145,7 +145,9 @@ 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,7 +156,7 @@ docpath = docinfo['textURLPath'] path = docinfo['textURLPath'] url = docinfo['url'] - name = docinfo['name'] + nameR = docinfo['name'] viewMode= pageinfo['viewMode'] tocMode = pageinfo['tocMode'] characterNormalization=pageinfo['characterNormalization'] @@ -204,7 +206,7 @@ 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/'%nameR) #hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl%s'%url) l.setAttributeNS(None, 'target', '_blank') return serializeNode(pagenode)