Mercurial > hg > documentViewer

changeset 165:820a2a4b23c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
characterNormalization
author abukhman
date Tue, 24 Aug 2010 14:11:26 +0200
parents 530f6983f72d
children ffb5c62bd459
files MpdlXmlTextServer.py documentViewer.py
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MpdlXmlTextServer.py	Tue Aug 24 14:06:02 2010 +0200
+++ b/MpdlXmlTextServer.py	Tue Aug 24 14:11:26 2010 +0200
@@ -302,14 +302,14 @@
         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))
         text = page.replace('mode=image','mode=texttool')
-        #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
+        logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
         #logging.debug("documentViewer (characterNormalization) text: %s"%(text))
         return text
     
--- a/documentViewer.py	Tue Aug 24 14:06:02 2010 +0200
+++ b/documentViewer.py	Tue Aug 24 14:11:26 2010 +0200
@@ -701,7 +701,7 @@
                 pageinfo['numgroups'] += 1        
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
-        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg')
+        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')
         pageinfo['query'] = self.REQUEST.get('query',' ')
         pageinfo['queryType'] = self.REQUEST.get('queryType',' ')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')