diff MpdlXmlTextServer.py @ 167:7e2b97941a66

characterNormalization
author abukhman
date Tue, 24 Aug 2010 14:43:24 +0200
parents ffb5c62bd459
children 21ac9164eedf
line wrap: on
line diff
--- a/MpdlXmlTextServer.py	Tue Aug 24 14:34:32 2010 +0200
+++ b/MpdlXmlTextServer.py	Tue Aug 24 14:43:24 2010 +0200
@@ -42,8 +42,8 @@
         """get search list"""
         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']
         sn = pageinfo['sn']
@@ -253,12 +253,12 @@
          numdivs = pagedom.xpath("//div[@class='queryResultHits']")
          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        
         if 'tocSize_%s'%mode in docinfo:
@@ -302,12 +302,12 @@
         url = docinfo['url']
         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))
         #logging.debug("documentViewer (characterNormalization) text: %s"%(text))