--- documentViewer/MpdlXmlTextServer.py	2010/10/11 14:04:21	1.74
+++ documentViewer/MpdlXmlTextServer.py	2010/10/13 15:49:08	1.96
@@ -140,16 +140,27 @@ 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))
+        #xpath='//place'
+        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'],'//place',pn))
+        #logging.debug("documentViewer getGisPlaces (text) text:%s"%(text))
         pagedom = Parse(text)
-        result =pagedom.xpath("//result/resultPage/")
+        result =pagedom.xpath("//result/resultPage/place")
+        logging.debug("getGisPlaces (place) result:%s"%(result))
         for l in result:
             hrefNode= l.getAttributeNodeNS(None, u"id")
-        docinfo['place']=getTextFromNode(result[0])
-        return docinfo
+            logging.debug("documentViewer getGisPlaces (characterNormalization) l:%s"%(l))
+            if hrefNode:
+                href= hrefNode.nodeValue
+                if href.startswith('id='):
+                    hrefNode.nodeValue = href.replace('id=',"?")                      
+        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"""
@@ -206,9 +217,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/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'])
+                              hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name)
                               l.setAttributeNS(None, 'target', '_blank') 
                   return serializeNode(pagenode)