--- documentViewer/MpdlXmlTextServer.py	2010/10/05 10:52:07	1.49
+++ documentViewer/MpdlXmlTextServer.py	2010/10/13 15:35:41	1.92
@@ -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,18 +135,37 @@ 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('resultPage')
-        pagedom = Parse(text)
-        docinfo['numPages']= pagedom.xpath("//resultPage")
-        #logging.debug("documentViewer (characterNormalization) docinfo['numPages']: %s"%(docinfo['numPages']))
+        dom = Parse(text)
+        result= dom.xpath("//result/resultPage")
+        docinfo['numPages']=int(getTextFromNode(result[0]))
         return docinfo
-       
+    
+    def getGisPlaces(self, docinfo=None, pageinfo=None):
+        """ Show all Gis Places of whole Page"""
+        #xpath='//place'
+        docpath = docinfo['textURLPath'] 
+        url = docinfo['url']
+        selfurl = self.absolute_url()
+        
+        text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],'//place',pn))
+        logging.debug("documentViewer getGisPlaces (text) text:%s"%(text))
+        pagedom = Parse(text)
+        result =pagedom.xpath("//result/resultPage/*")
+        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)
+    
     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']
         path = docinfo['textURLPath']
         url = docinfo['url']
+        name = docinfo['name']
         viewMode= pageinfo['viewMode']
         tocMode = pageinfo['tocMode']
         characterNormalization=pageinfo['characterNormalization']
@@ -196,8 +215,8 @@ 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'%name)
+                              l.setAttributeNS(None, 'target', '_blank') 
                   return serializeNode(pagenode)
                     
         if mode == "pureXml":