--- documentViewer/MpdlXmlTextServer.py	2010/10/08 12:18:14	1.63
+++ documentViewer/MpdlXmlTextServer.py	2010/10/13 16:42:19	1.102
@@ -140,20 +140,35 @@ class MpdlXmlTextServer(SimpleItem):
         docinfo['numPages']=int(getTextFromNode(result[0]))
         return docinfo
     
-    def getGisPlases(self, docinfo):
+    def getGisPlaces(self, docinfo=None, pageinfo=None):
         """ Show all Gis Places of whole Page"""
         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
+        docpath = docinfo['textURLPath'] 
+        url = docinfo['url']
+        selfurl = self.absolute_url()
+        pn = pageinfo['current']
+        
+        text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn))
+        dom = Parse(text)
+        result = dom.xpath("//result/resultPage/place")
+        logging.debug("getGisPlaces (place) result:%s"%(result))
+        for l in result:
+            hrefNode= l.getAttributeNodeNS(None, u"id")
+            logging.debug("documentViewer getGisPlaces (characterNormalization) l:%s"%(l))
+            if hrefNode:
+                href= hrefNode.nodeValue
+                if href.startswith('N'):
+                    #hrefNode.nodeValue = href.replace('id=',"?")   
+                    logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue))
+                    logging.debug("documentViewer getGisPlaces (characterNormalization) 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 +218,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)