--- documentViewer/MpdlXmlTextServer.py	2010/10/13 15:06:03	1.88
+++ documentViewer/MpdlXmlTextServer.py	2010/10/14 11:56:31	1.124
@@ -140,22 +140,31 @@ class MpdlXmlTextServer(SimpleItem):
         docinfo['numPages']=int(getTextFromNode(result[0]))
         return docinfo
     
-    def getGisPlaces(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='//place'%s&pn=%s"%(docinfo['textURLPath'],pn))
-        logging.debug("documentViewer getGisPlaces (text) text:%s"%(text))
-        pagedom = Parse(text)
-        result =pagedom.xpath("//result/resultPage/*")
+        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'],xpath,pn))
+        dom = Parse(text)
+        result = dom.xpath("//result/resultPage/place")
         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('id='):
-                    hrefNode.nodeValue = href.replace('id=',"?")
-                                
-        return serializeNode(pagenode)
+            href= hrefNode.nodeValue
+           
+            #href = ",".join(href)
+            logging.debug("getGisPlaces :%s"%(href))
+            return href
+            #return ";".join(["%s=%s" % (href, href) for href, href in params.items()])
+            #logging.debug("getGisPlaces :%s"%(href))
+                #if href.startswith('id='):
+                    #hrefNode.nodeValue = href.replace('id=',"?")   
+                    #logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue))
+        logging.debug("getGisPlaces :%s"%(href))                            
+        return "no text here"
     
     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"""