Changeset 164:530f6983f72d in documentViewer

Timestamp:

Aug 24, 2010, 12:06:02 PM (15 years ago)

Author:

abukhman

Branch:

default

Message:

characterNormalization

Files:

• MpdlXmlTextServer.py (modified) (3 diffs)
• documentViewer.py (modified) (1 diff)

MpdlXmlTextServer.py

@@ -138 +138 @@
         viewMode= pageinfo['viewMode']
         tocMode = pageinfo['tocMode']
-        #characterNormalization = pageinfo ['characterNormalization']
+        characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()   
@@ -166 +166 @@
                         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":
@@ -308 +308 @@
         
         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))

documentViewer.py

@@ -702 +702 @@
         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',' ')