--- documentViewer/MpdlXmlTextServer.py	2010/10/13 15:06:03	1.88
+++ documentViewer/MpdlXmlTextServer.py	2010/10/15 12:03:37	1.147
@@ -42,8 +42,6 @@ class MpdlXmlTextServer(SimpleItem):
         """get search list"""
         docpath = docinfo['textURLPath'] 
         url = docinfo['url']
-        logging.debug("documentViewer (gettoc) docpath: %s"%(docpath))
-        logging.debug("documentViewer (gettoc) url: %s"%(url))
         pagesize = pageinfo['queryPageSize']
         pn = pageinfo['searchPN']
         sn = pageinfo['sn']
@@ -140,22 +138,58 @@ 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']
+        hrefList=[]
+        myList= ""
+        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
+            hrefList.append(href)
+            myList = ",".join(hrefList)
+        logging.debug("getGisPlaces :%s"%(myList))                             
+        return myList
+    
+    def getAllGisPlaces (self, docinfo=None, pageinfo=None):
+        """Show all Gis Places of whole Book """
+        xpath ='//echo:place'
+        docpath =docinfo['textURLPath']
+        url = docinfo['url']
+        selfurl =self.absolute_url()
+        pn =pageinfo['current']
+        hrefList=[]
+        myList=""
+        text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'],xpath))
+        dom =Parse(text)
+        result = dom.xpath("//result/resultPage/place")
+        for l in result:
+            hrefNode = l.getAttributeNodeNS(None, u"id")
+            href= hrefNode.nodeValue
+            hrefList.append(href)
+            myList = ",".join(hrefList)
+            logging.debug("getALLGisPlaces :%s"%(myList))
+        return myList
+    
+    def getOrigPages (self, docinfo=None, pageinfo=None):
+        """Show original page """
+        #docpath = docinfo['textURLPath'] 
+        #url = docinfo['url']
+        selfurl = self.absolute_url()
+        pn =pageinfo['current']
+        viewMode=  pageinfo['viewMode']
+        text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], mode,  pn))
+        dom =Parse(text)
+        pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
+        logging.debug("getOrigPages :%s"%(pagedivs))
+        return pagedivs
     
     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"""