--- documentViewer/MpdlXmlTextServer.py	2010/09/24 13:48:03	1.41
+++ documentViewer/MpdlXmlTextServer.py	2010/10/05 10:53:05	1.50
@@ -122,13 +122,25 @@ class MpdlXmlTextServer(SimpleItem):
         """get list of pages from fulltext and put in docinfo"""
         if 'numPages' in docinfo:
             # already there
-            return docinfo
-        
+            return docinfo        
         xquery = '//pb'
         text = self.getServerData("xquery.xql","document=%s&xquery=%s"%(docinfo['textURLPath'],xquery))
-        #text = self.template.fulltextclient.eval("/mpdl/interface/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:
+            # allredy there
+            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']))
+        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"""
@@ -185,6 +197,7 @@ class MpdlXmlTextServer(SimpleItem):
                           href=hrefNode.nodeValue
                           if href.startswith('http://chinagis.mpiwg-berlin.mpg.de'):
                               hrefNode.nodeValue =href.replace('chinagis_REST','chinagis')
+                              l.setAttributeNS(None, 'target', '_blank')
                   return serializeNode(pagenode)
                     
         if mode == "pureXml":