--- documentViewer/MpdlXmlTextServer.py	2010/10/14 10:03:06	1.112
+++ documentViewer/MpdlXmlTextServer.py	2010/10/18 10:50:51	1.176
@@ -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']
@@ -147,21 +145,58 @@ class MpdlXmlTextServer(SimpleItem):
         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")
             href= hrefNode.nodeValue
-            #koka=href
-            #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"%(serializeNode(href)))                            
-        return serializeNode(href)
+            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'], 'text',  pn))
+        #text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))
+        logging.debug("TEXTIXAXA:%s"%(text))
+        dom =Parse(text)
+        pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
+        if len(pagedivs)>0:
+            docinfo['originalPage'] = getTextFromNode(pagedivs[0])
+        #return docinfo['originalPage']
+        #return originalPage
+        return docinfo
+        
     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"""
         docpath = docinfo['textURLPath']