Changeset 392:9b2adae6c6e2 in documentViewer

Timestamp:

Nov 2, 2010, 3:51:41 PM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

• MpdlXmlTextServer.py (modified) (3 diffs)
• documentViewer.py (modified) (2 diffs)

MpdlXmlTextServer.py

@@ -39 +39 @@
         return documentViewer.getHttpData(url,data,timeout=self.timeout)
 
-    def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None):
+    def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None, optionsClose=None):
         """get search list"""
         docpath = docinfo['textURLPath'] 
@@ -214 +214 @@
     
     
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None, optionsClose=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
@@ -334 +334 @@
         return data
     
-    def getQuery (self,  docinfo=None, pageinfo=None, query=None, queryType=None, pn=1):
+    def getQuery (self,  docinfo=None, pageinfo=None, query=None, queryType=None, pn=1, optionsClose=None):
          """number of"""
          docpath = docinfo['textURLPath'] 

documentViewer.py

@@ -279 +279 @@
   
     security.declareProtected('View','index_html')
-    def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization=""):
+    def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization="", optionsClose=None):
         '''
         view it
@@ -800 +800 @@
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
-        #pageinfo ['originalPage'] = self.getOrigPages(docinfo=None, pageinfo=None)
         pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')
         pageinfo['query'] = self.REQUEST.get('query','')
-        #pageinfo['optionsClose']= self.REQUEST.get('optionsClose','')  
+        pageinfo['optionsClose']= self.REQUEST.get('optionsClose','')  
         pageinfo['queryType'] = self.REQUEST.get('queryType','')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')