--- documentViewer/MpdlXmlTextServer.py	2010/10/14 12:53:44	1.134
+++ documentViewer/MpdlXmlTextServer.py	2010/10/15 12:01:46	1.146
@@ -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']
@@ -148,7 +146,7 @@ class MpdlXmlTextServer(SimpleItem):
         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")
@@ -156,11 +154,42 @@ class MpdlXmlTextServer(SimpleItem):
             hrefNode= l.getAttributeNodeNS(None, u"id")
             href= hrefNode.nodeValue
             hrefList.append(href)
-            #hoho =hrefList.replace('','')
-            logging.debug("getGisPlaces :%s"%(hrefList))
-        
-                            
-        return hrefList
+            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"%(docpath, 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"""