# HG changeset patch
# User abukhman
# Date 1288104295 -7200
# Node ID 4ec3930627118134162b76b5fef08d5536cb4927
# Parent  a7a5a26dccb4efbad6b8c619b5904370368e9b5e
*** empty log message ***

diff -r a7a5a26dccb4 -r 4ec393062711 MpdlXmlTextServer.py
--- a/MpdlXmlTextServer.py	Tue Oct 26 16:40:04 2010 +0200
+++ b/MpdlXmlTextServer.py	Tue Oct 26 16:44:55 2010 +0200
@@ -196,7 +196,7 @@
             return originalPage
     
     
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']
diff -r a7a5a26dccb4 -r 4ec393062711 documentViewer.py
--- a/documentViewer.py	Tue Oct 26 16:40:04 2010 +0200
+++ b/documentViewer.py	Tue Oct 26 16:44:55 2010 +0200
@@ -772,12 +772,12 @@
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
         #pageinfo ['originalPage'] = self.getOrigPages(docinfo=None, pageinfo=None)
-        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization',None)
-        pageinfo['query'] = self.REQUEST.get('query',None)
-        pageinfo['queryType'] = self.REQUEST.get('queryType',None)
+        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')
+        pageinfo['query'] = self.REQUEST.get('query','')
+        pageinfo['queryType'] = self.REQUEST.get('queryType','')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
         pageinfo['textPN'] = self.REQUEST.get('textPN','1')
-        pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery',None)
+        pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')
         pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30')
         pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10')
         pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1')