Changeset 435:94baa8dbc7e8 in documentViewer

Timestamp:

Mar 1, 2011, 2:53:15 PM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

• MpdlXmlTextServer.py (modified) (12 diffs)
• documentViewer.py (modified) (3 diffs)

MpdlXmlTextServer.py

@@ -130 +130 @@
                 return serializeNode(pagenode)      
         return "no text here"   
-                       
            
     def getGisPlaces(self, docinfo=None, pageinfo=None):
@@ -202 +201 @@
         pagexml = self.getServerData("page-fragment.xql",textParam)
         dom = Parse(pagexml)
-        
         #original Pages
         pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
@@ -208 +206 @@
             if len(pagedivs)>0:
                 docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0])
-                #logging.debug("ORIGINAL PAGES: %s"%(docinfo['pageNumberOrig']))
         
         #original Pages Norm
@@ -215 +212 @@
             if len(pagedivs)>0:
                 docinfo['pageNumberOrigNorm']= getTextFromNode(pagedivs[0])
-                #logging.debug("ORIGINAL PAGES: %s"%(docinfo['pageNumberOrigNorm']))
-
         
         #figureEntries
@@ -227 +222 @@
                     try:
                         docinfo['countFigureEntries'] = int(s)
-                        #logging.debug("FIGURE ENTRIES: %s"%(s))
                     except:
                         docinfo['countFigureEntries'] = 0
@@ -234 +228 @@
                     try:
                         docinfo['countFigureEntries'] = int(s1)
-                        #logging.debug("FIGURE ENTRIES: %s"%(s1))
                     except:
                         docinfo['countFigureEntries'] = 0      
@@ -246 +239 @@
                 try:
                     docinfo['countPlaces'] = int(s)
-                    #logging.debug("PLACES HERE: %s"%(s))
                 except:
                     docinfo['countPlaces'] = 0
@@ -259 +251 @@
                     try:
                         docinfo['countTocEntries'] = int(s)
-                        #logging.debug("TEXT ENTRIES: %s"%(s))
                     except:
                         docinfo['countTocEntries'] = 0
@@ -266 +257 @@
                     try:
                         docinfo['countTocEntries'] = int(s1)
-                        #logging.debug("TEXT ENTRIES: %s"%(s1))
                     except:
                         docinfo['countTocEntries'] = 0
@@ -302 +292 @@
         if mode == "text":
             # first div contains text
-            #mode = viewMode
             pagedivs = dom.xpath("/div")
             if len(pagedivs) > 0:      
@@ -407 +396 @@
          numdivs = pagedom.xpath("//div[@class='queryResultHits']")
          tocSearch = int(getTextFromNode(numdivs[0]))
-         #logging.debug("documentViewer (gettoc) tocSearch: %s"%(tocSearch))
          tc=int((tocSearch/10)+1)
-         #logging.debug("documentViewer (gettoc) tc: %s"%(tc))
          return tc
     
     def getToc(self, mode="text", docinfo=None):
         """loads table of contents and stores in docinfo"""
-        #logging.debug("documentViewer (gettoc) mode: %s"%(mode))
         if mode == "none":
             return docinfo        
@@ -466 +452 @@
         page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&optionToggle=1'%(selfurl,url, viewMode, tocMode, tocPN))
         text = page.replace('mode=image','mode=texttool')
-        #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
-        #logging.debug("TEXT %s"%(text))
         return text
     

documentViewer.py

@@ -44 +44 @@
     return rc
 
-def serializeNode(node, encoding='utf-8'):
+def serializeNode(node, encoding="utf-8"):
     """returns a string containing node as XML"""
-    buf = cStringIO.StringIO()
-    Ft.Xml.Domlette.Print(node, stream=buf, encoding=encoding)
-    s = buf.getvalue()
-    buf.close()
+    stream = cStringIO.StringIO()
+    logging.debug("BUF: %s"%(stream))
+    Ft.Xml.Domlette.PrettyPrint(node, stream=stream, encoding=encoding)
+    s = stream.getvalue()
+    logging.debug("BUF: %s"%(s))
+    stream.close()
     return s
 
@@ -162 +164 @@
     #return None
 
-
-
 ##
 ## documentViewer class
@@ -899 +899 @@
         pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30')
         pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10')
-        pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1')
-        
+        pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1')     
         toc = int (pageinfo['tocPN'])
         pageinfo['textPages'] =int (toc)
-        
-        
         
         if 'tocSize_%s'%tocMode in docinfo: