--- documentViewer/MpdlXmlTextServer.py	2010/09/23 15:29:06	1.33
+++ documentViewer/MpdlXmlTextServer.py	2010/09/24 11:55:35	1.35
@@ -48,7 +48,7 @@ class MpdlXmlTextServer(SimpleItem):
         pn = pageinfo['searchPN']
         sn = pageinfo['sn']
         highlightQuery = pageinfo['highlightQuery']
-        #query =pageinfo['query']
+        query =pageinfo['query']
         queryType =pageinfo['queryType']
         viewMode=  pageinfo['viewMode']
         tocMode = pageinfo['tocMode']
@@ -147,9 +147,10 @@ class MpdlXmlTextServer(SimpleItem):
         #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
         textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)
         if highlightQuery is not None:
-            textParam +="&highlightQuery=%s&sn=%s"%(highlightQuery,sn)           
+            textParam1 =urllib.quote(textParam)
+            textParam1 +="&highlightQuery=%s&sn=%s"%(highlightQuery,sn)           
         
-        pagexml = self.getServerData("page-fragment.xql",textParam)
+        pagexml = self.getServerData("page-fragment.xql",textParam1)
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False)
         
         pagedom = Parse(pagexml)
@@ -249,7 +250,7 @@ class MpdlXmlTextServer(SimpleItem):
          docpath = docinfo['textURLPath'] 
          pagesize = pageinfo['queryPageSize']
          pn = pageinfo['searchPN']
-         #query =pageinfo['query']
+         query =pageinfo['query']
          queryType =pageinfo['queryType']
          tocSearch = 0
          tocDiv = None