Changeset 376:4f381768909a in documentViewer for MpdlXmlTextServer.py

Timestamp:

Oct 25, 2010, 10:49:04 AM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

File:

• MpdlXmlTextServer.py (modified) (3 diffs)

MpdlXmlTextServer.py

@@ -197 +197 @@
     
     
-    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']
@@ -204 +204 @@
         name = docinfo['name']
         viewMode= pageinfo['viewMode']
+        sn = pageinfo['sn']
         highlightQuery = pageinfo['highlightQuery']
+        
         tocMode = pageinfo['tocMode']
-        sn =pageinfo['sn']
         characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
@@ -214 +215 @@
         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)