# HG changeset patch
# User abukhman
# Date 1286270451 -7200
# Node ID c92e6b923913bf2fe970d633c44f882ea4ebe539
# Parent  9794ccda39de21909ed60db5a561c2bf1773daa5
*** empty log message ***

diff -r 9794ccda39de -r c92e6b923913 MpdlXmlTextServer.py
--- a/MpdlXmlTextServer.py	Mon Sep 27 14:59:40 2010 +0200
+++ b/MpdlXmlTextServer.py	Tue Oct 05 11:20:51 2010 +0200
@@ -122,13 +122,21 @@
         """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=%sxpath=%s"%(docinfo['textURLPath'], xpath))
+        docinfo['numPages']=text.xpath
+        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"""