--- documentViewer/MpdlXmlTextServer.py	2010/10/11 14:49:37	1.78
+++ documentViewer/MpdlXmlTextServer.py	2010/10/13 15:49:08	1.96
@@ -140,21 +140,26 @@ 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/")
-        logging.debug("YYYY result%s"%result)
+        result =pagedom.xpath("//result/resultPage/place")
+        logging.debug("getGisPlaces (place) result:%s"%(result))
         for l in result:
-            hrefNode= l.getAttributeNodeNS(None, u"place")
-            logging.debug("YYYY hrefNode%s"%hrefNode)
+            hrefNode= l.getAttributeNodeNS(None, u"id")
+            logging.debug("documentViewer getGisPlaces (characterNormalization) l:%s"%(l))
             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)
+                    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=""):