Changeset 167:7e2b97941a66 in documentViewer for MpdlXmlTextServer.py

Timestamp:

Aug 24, 2010, 12:43:24 PM (14 years ago)

Author:

abukhman

Branch:

default

Message:

characterNormalization

File:

• MpdlXmlTextServer.py (modified) (3 diffs)

MpdlXmlTextServer.py

@@ -43 +43 @@
         docpath = docinfo['textURLPath'] 
         url = docinfo['url']
-        #logging.debug("documentViewer (gettoc) docpath: %s"%(docpath))
-        #logging.debug("documentViewer (gettoc) url: %s"%(url))
+        logging.debug("documentViewer (gettoc) docpath: %s"%(docpath))
+        logging.debug("documentViewer (gettoc) url: %s"%(url))
         pagesize = pageinfo['queryPageSize']
         pn = pageinfo['searchPN']
@@ -254 +254 @@
          tocSearch = int(getTextFromNode(numdivs[0]))
          tc=int((tocSearch/10)+1)
-         #logging.debug("documentViewer (gettoc) tc: %s"%(tc))
+         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))
+        logging.debug("documentViewer (gettoc) mode: %s"%(mode))
         if mode == "none":
             return docinfo        
@@ -303 +303 @@
         selfurl = self.absolute_url()  
         viewMode=  pageinfo['viewMode']
-        characterNormalization =pageinfo['characterNormalization']
+        characterNormalization =pageinfo ['characterNormalization']
         tocMode = pageinfo['tocMode']
         tocPN = pageinfo['tocPN']  
         
-        data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath,queryType, pagesize, pn))  
-        page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&characterNormalization=%s'%(selfurl,url, viewMode, tocMode, tocPN,characterNormalization))
+        data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=%s"%(docpath,queryType, pagesize, pn,characterNormalization))  
+        page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl,url, viewMode, tocMode, tocPN))
         text = page.replace('mode=image','mode=texttool')
         logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))