# HG changeset patch
# User abukhman
# Date 1288002927 -7200
# Node ID 0aa294b31236f975f37b188be361f4489522fe85
# Parent  36de9945504c8f503cea158b9248442ad1404cbf
*** empty log message ***

diff -r 36de9945504c -r 0aa294b31236 MpdlXmlTextServer.py
--- a/MpdlXmlTextServer.py	Mon Oct 25 12:31:10 2010 +0200
+++ b/MpdlXmlTextServer.py	Mon Oct 25 12:35:27 2010 +0200
@@ -205,6 +205,7 @@
         viewMode= pageinfo['viewMode']
         highlightQuery = pageinfo['highlightQuery']
         tocMode = pageinfo['tocMode']
+        sn =pageinfo['sn']
         characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()   
@@ -213,11 +214,10 @@
         else:
             textmode = mode
         #logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
-        #textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)
-        textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,characterNormalization, highlightQuery, sn)
+        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 = "document=%s&mode=%s&pn=%s&characterNormalization=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,characterNormalization, 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)