# HG changeset patch
# User abukhman
# Date 1286805511 -7200
# Node ID ccdce5aca47b11ed36f41268c28a55e888da2e64
# Parent  f4ece44559e5668e85b17484e4c6952e2f426007
*** empty log message ***

diff -r f4ece44559e5 -r ccdce5aca47b MpdlXmlTextServer.py
--- 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)