--- documentViewer/MpdlXmlTextServer.py	2010/10/11 15:54:24	1.85
+++ documentViewer/MpdlXmlTextServer.py	2010/10/14 09:22:37	1.107
@@ -140,21 +140,28 @@ 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&pn=%s"%(docinfo['textURLPath'], xpath,pn))
-        pagedom = Parse(text)
-        result =pagedom.xpath("//result/resultPage")
+        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"place")
-            logging.debug("documentViewer (characterNormalization) l:%s"%(l))
+            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=',"?")
-                                
-        return serializeNode(pagenode)
+                #if href.startswith('id='):
+                    #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(href)
     
     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"""