Changeset 373:0aa294b31236 in documentViewer for MpdlXmlTextServer.py

Timestamp:

Oct 25, 2010, 10:35:27 AM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

File:

• MpdlXmlTextServer.py (modified) (2 diffs)

MpdlXmlTextServer.py

@@ -206 +206 @@
         highlightQuery = pageinfo['highlightQuery']
         tocMode = pageinfo['tocMode']
+        sn =pageinfo['sn']
         characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
@@ -214 +215 @@
             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)