Changeset 205:1fc7d73ce7ce in documentViewer

Timestamp:

Oct 5, 2010, 2:58:34 PM (15 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

• MpdlXmlTextServer.py (modified) (1 diff)
• documentViewer.py (modified) (1 diff)

MpdlXmlTextServer.py

@@ -131 +131 @@
     def getNumTextPages (self, docinfo):
         """get list of pages from fulltext (texts without images) and put in docinfo"""
-       # if 'numPages' 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')
-       # dom = Parse(text)
-        
-       # result= dom.xpath("//result/resultPage")
-       # docinfo['numPages']=int(getTextFromNode(result[0]))
-        #logging.debug("documentViewer (characterNormalization) docinfo['numPages']: %s"%(docinfo['numPages']))
+            return docinfo
+        xpath ='/count(//pb)'
+        text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))
+        docinfo['numPages']=text('resultPage')
+        dom = Parse(text)
+        result= dom.xpath("//result/resultPage")
+        docinfo['numPages']=int(getTextFromNode(result[0]))
         return docinfo
        

documentViewer.py

@@ -616 +616 @@
             if not docinfo['imagePath']:
                 # text-only, no page images
-                docinfo = self.getNumPages(docinfo)
+                docinfo = self.getNumTextPages(docinfo)
          
         presentationUrls = dom.xpath("//texttool/presentation")