--- documentViewer/MpdlXmlTextServer.py	2010/10/18 12:39:14	1.185
+++ documentViewer/MpdlXmlTextServer.py	2010/10/25 10:35:27	1.193
@@ -38,7 +38,7 @@ class MpdlXmlTextServer(SimpleItem):
         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):
+    def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None):
         """get search list"""
         docpath = docinfo['textURLPath'] 
         url = docinfo['url']
@@ -203,7 +203,9 @@ class MpdlXmlTextServer(SimpleItem):
         url = docinfo['url']
         name = docinfo['name']
         viewMode= pageinfo['viewMode']
+        highlightQuery = pageinfo['highlightQuery']
         tocMode = pageinfo['tocMode']
+        sn =pageinfo['sn']
         characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()   
@@ -211,11 +213,12 @@ class MpdlXmlTextServer(SimpleItem):
             textmode = "textPollux"
         else:
             textmode = mode
-        #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
+        #logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
         textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)
         if highlightQuery is not None:
-            textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)           
-        
+            textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)
+            #textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,characterNormalization, highlightQuery, sn)           
+            logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
         pagexml = self.getServerData("page-fragment.xql",textParam)
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False)