Mercurial > hg > documentViewer

changeset 373:0aa294b31236

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author abukhman
date Mon, 25 Oct 2010 12:35:27 +0200
parents 36de9945504c
children d573866dd95b
files MpdlXmlTextServer.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)