# HG changeset patch
# User abukhman
# Date 1282651562 -7200
# Node ID 530f6983f72d72a968dcd44e1c218b85c56a4f62
# Parent  06bb2a289068621bf9e312a1753cd3538d2df247
characterNormalization

diff -r 06bb2a289068 -r 530f6983f72d MpdlXmlTextServer.py
--- a/MpdlXmlTextServer.py	Tue Aug 24 13:49:23 2010 +0200
+++ b/MpdlXmlTextServer.py	Tue Aug 24 14:06:02 2010 +0200
@@ -137,7 +137,7 @@
         url = docinfo['url']
         viewMode= pageinfo['viewMode']
         tocMode = pageinfo['tocMode']
-        #characterNormalization = pageinfo ['characterNormalization']
+        characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()   
         if mode == "text_dict":
@@ -165,7 +165,7 @@
                     if hrefNode:
                         href= hrefNode.nodeValue
                         if href.startswith('#note-'):
-                            hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn))
+                            hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s&characterNormalization=%s#note-"%(url,viewMode,tocMode,tocPN,pn,characterNormalization))
                 return serializeNode(pagenode)
         if mode == "xml":
               # first div contains text
@@ -307,7 +307,7 @@
         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'%(selfurl,url, viewMode, tocMode, tocPN))
+        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) text: %s"%(text))
diff -r 06bb2a289068 -r 530f6983f72d documentViewer.py
--- a/documentViewer.py	Tue Aug 24 13:49:23 2010 +0200
+++ b/documentViewer.py	Tue Aug 24 14:06:02 2010 +0200
@@ -701,7 +701,7 @@
                 pageinfo['numgroups'] += 1        
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
-        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')
+        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg')
         pageinfo['query'] = self.REQUEST.get('query',' ')
         pageinfo['queryType'] = self.REQUEST.get('queryType',' ')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')