--- documentViewer/MpdlXmlTextServer.py	2010/08/11 10:17:46	1.7
+++ documentViewer/MpdlXmlTextServer.py	2010/08/24 12:06:02	1.20
@@ -1,7 +1,6 @@
 
 from OFS.SimpleItem import SimpleItem
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile 
-
 from Ft.Xml import EMPTY_NAMESPACE, Parse
 
 import sys
@@ -10,7 +9,6 @@ import urllib
 import documentViewer
 from documentViewer import getTextFromNode, serializeNode
 
-
 class MpdlXmlTextServer(SimpleItem):
     """TextServer implementation for MPDL-XML eXist server"""
     meta_type="MPDL-XML TextServer"
@@ -30,19 +28,16 @@ class MpdlXmlTextServer(SimpleItem):
             self.serverUrl = serverUrl
         else:
             self.serverUrl = "http://%s/mpdl/interface/"%serverName
-
         
     def getHttpData(self, url, data=None):
         """returns result from url+data HTTP request"""
         return documentViewer.getHttpData(url,data,timeout=self.timeout)
-
     
     def getServerData(self, method, data=None):
         """returns result from text server for method+data"""
         url = self.serverUrl+method
         return documentViewer.getHttpData(url,data,timeout=self.timeout)
 
-
     def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None, lemma=None):
         """get search list"""
         docpath = docinfo['textURLPath'] 
@@ -57,6 +52,7 @@ class MpdlXmlTextServer(SimpleItem):
         queryType =pageinfo['queryType']
         viewMode=  pageinfo['viewMode']
         tocMode = pageinfo['tocMode']
+        #characterNormalization = pageinfo ['characterNormalization']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()
         
@@ -134,20 +130,21 @@ class MpdlXmlTextServer(SimpleItem):
         docinfo['numPages'] = text.count("<pb ")
         return docinfo
        
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']
         url = docinfo['url']
         viewMode= pageinfo['viewMode']
         tocMode = pageinfo['tocMode']
+        characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()   
         if mode == "text_dict":
             textmode = "textPollux"
         else:
             textmode = mode
-        
+        #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
         textParam = "document=%s&mode=%s&pn=%s"%(docpath,textmode,pn)
         if highlightQuery is not None:
             textParam +="&highlightQuery=%s&sn=%s"%(highlightQuery,sn)           
@@ -168,7 +165,7 @@ class MpdlXmlTextServer(SimpleItem):
                     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
@@ -305,13 +302,15 @@ class MpdlXmlTextServer(SimpleItem):
         url = docinfo['url']
         selfurl = self.absolute_url()  
         viewMode=  pageinfo['viewMode']
+        #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'%(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))
         return text
     
     def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):