Changeset 398:55f9eeebc338 in documentViewer

Timestamp:

Nov 9, 2010, 11:38:25 AM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

• MpdlXmlTextServer.py (modified) (4 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, optionsClose=None):
+    def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None, optionToggle=None):
         """get search list"""
         docpath = docinfo['textURLPath'] 
@@ -215 +215 @@
     
     
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None, optionsClose=None):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None, optionToggle=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
@@ -335 +335 @@
         return data
     
-    def getQuery (self,  docinfo=None, pageinfo=None, query=None, queryType=None, pn=1, optionsClose=None):
+    def getQuery (self,  docinfo=None, pageinfo=None, query=None, queryType=None, pn=1, optionToggle=None):
          """number of"""
          docpath = docinfo['textURLPath'] 
@@ -459 +459 @@
         viewMode=  pageinfo['viewMode']
         characterNormalization = pageinfo ['characterNormalization']
+        optionToggle =pageinfo ['optionToggle']
         tocMode = pageinfo['tocMode']
         tocPN = pageinfo['tocPN']  
         
-        data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=%s"%(docpath,queryType, pagesize, pn,characterNormalization))  
+        data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=%s&optionToggle=%s"%(docpath,queryType, pagesize, pn,characterNormalization,optionToggle))  
         page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl,url, viewMode, tocMode, tocPN))
         text = page.replace('mode=image','mode=texttool')

documentViewer.py

@@ -291 +291 @@
   
     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="", optionsClose=None):
+    def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization="", optionToggle=None):
         '''
         view it
@@ -827 +827 @@
         pageinfo['tocMode'] = tocMode
         pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')
-        pageinfo['query'] = self.REQUEST.get('query','')
-        pageinfo['optionsClose']= self.REQUEST.get('optionsClose','')  
+        pageinfo['optionToggle'] = self.REQUEST.get('optionToggle','')
+        pageinfo['query'] = self.REQUEST.get('query','') 
         pageinfo['queryType'] = self.REQUEST.get('queryType','')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')