--- documentViewer/MpdlXmlTextServer.py	2010/10/05 09:58:00	1.46
+++ documentViewer/MpdlXmlTextServer.py	2010/10/08 12:25:40	1.66
@@ -118,8 +118,8 @@ class MpdlXmlTextServer(SimpleItem):
                 return serializeNode(pagenode)      
         return "no text here"   
                        
-    def getNumPages(self, docinfo):
-        """get list of pages from fulltext and put in docinfo"""
+    """def getNumPages(self, docinfo):
+        ""get list of pages from fulltext and put in docinfo""
         if 'numPages' in docinfo:
             # already there
             return docinfo        
@@ -127,7 +127,7 @@ class MpdlXmlTextServer(SimpleItem):
         text = self.getServerData("xquery.xql","document=%s&xquery=%s"%(docinfo['textURLPath'],xquery))
         docinfo['numPages'] = text.count("<pb ")
         return docinfo
-     
+     """
     def getNumTextPages (self, docinfo):
         """get list of pages from fulltext (texts without images) and put in docinfo"""
         if 'numPages' in docinfo:
@@ -135,11 +135,20 @@ class MpdlXmlTextServer(SimpleItem):
             return docinfo
         xpath ='/count(//pb)'
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))
-        logging.debug("documentViewer (text) text: %s"%(text))
-        docinfo['numPages']=text.xpath(resultPage)
-        #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
+        dom = Parse(text)
+        result= dom.xpath("//result/resultPage")
+        docinfo['numPages']=int(getTextFromNode(result[0]))
+        return docinfo
+    
+    def getGisPlases(self, docinfo):
+        """ Show all Gis Places of whole Page"""
+        xpath='//place'
+        text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))
+        pagedom = Parse(text)
+        result =pagedom.xpath("//result/resultPage/place")
+        docinfo['place']=getTextFromNode(result[0])
         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']
@@ -194,8 +203,10 @@ class MpdlXmlTextServer(SimpleItem):
                       if hrefNode:
                           href=hrefNode.nodeValue
                           if href.startswith('http://chinagis.mpiwg-berlin.mpg.de'):
-                              hrefNode.nodeValue =href.replace('chinagis_REST','chinagis')
-                              l.setAttributeNS(None, 'target', '_blank')
+                              hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl/','chinagis/REST/db/mpdl%s'%url)
+
+                             #hrefNode.nodeValue=href.replace('chgis','')
+                              l.setAttributeNS(None, 'target', '_blank') 
                   return serializeNode(pagenode)
                     
         if mode == "pureXml":