--- documentViewer/MpdlXmlTextServer.py	2010/10/08 12:18:14	1.63
+++ documentViewer/MpdlXmlTextServer.py	2010/10/11 14:49:37	1.78
@@ -145,15 +145,24 @@ 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")
-        docinfo['place']=getTextFromNode(result[0])
-        return docinfo
+        result =pagedom.xpath("//result/resultPage/")
+        logging.debug("YYYY result%s"%result)
+        for l in result:
+            hrefNode= l.getAttributeNodeNS(None, u"place")
+            logging.debug("YYYY hrefNode%s"%hrefNode)
+            if hrefNode:
+                href= hrefNode.nodeValue
+                if href.startswith('id='):
+                    hrefNode.nodeValue = href.replace('id=',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%sid="%(url,viewMode,tocMode,tocPN,pn))
+                    logging.debug("YYYY href%s"%href)
+        return serializeNode(pagenode)
     
     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"""
         docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']
         url = docinfo['url']
+        name = docinfo['name']
         viewMode= pageinfo['viewMode']
         tocMode = pageinfo['tocMode']
         characterNormalization=pageinfo['characterNormalization']
@@ -203,9 +212,7 @@ 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/url=%s'%url)
-
-                             #hrefNode.nodeValue=href.replace('chgis','')
+                              hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name)
                               l.setAttributeNS(None, 'target', '_blank') 
                   return serializeNode(pagenode)