# HG changeset patch
# User abukhman
# Date 1288003744 -7200
# Node ID 4f381768909aafa0965078389cd30cc45a6fa1c0
# Parent  b576a54bf8ebe4bbdce3a9f8f8300b4df2495d11
*** empty log message ***

diff -r b576a54bf8eb -r 4f381768909a MpdlXmlTextServer.py
--- a/MpdlXmlTextServer.py	Mon Oct 25 12:42:00 2010 +0200
+++ b/MpdlXmlTextServer.py	Mon Oct 25 12:49:04 2010 +0200
@@ -196,16 +196,17 @@
             return originalPage
     
     
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']
         url = docinfo['url']
         name = docinfo['name']
         viewMode= pageinfo['viewMode']
+        sn = pageinfo['sn']
         highlightQuery = pageinfo['highlightQuery']
+        
         tocMode = pageinfo['tocMode']
-        sn =pageinfo['sn']
         characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()   
@@ -213,11 +214,10 @@
             textmode = "textPollux"
         else:
             textmode = mode
-        logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
+        #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 = "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)           
             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)