Mercurial > hg > documentViewer

changeset 401:79570b30b7cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author abukhman
date Tue, 09 Nov 2010 13:41:41 +0100
parents b2b687b0d39a
children d3bd3c2674ee
files MpdlXmlTextServer.py zpt/page_main_gis.zpt zpt/page_main_text.zpt zpt/page_main_text_dict.zpt zpt/page_main_xml.zpt
diffstat 5 files changed, 9 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/MpdlXmlTextServer.py	Tue Nov 09 12:45:38 2010 +0100
+++ b/MpdlXmlTextServer.py	Tue Nov 09 13:41:41 2010 +0100
@@ -464,7 +464,7 @@
         tocPN = pageinfo['tocPN']  
         
         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))
+        page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&optionToggle=%s'%(selfurl,url, viewMode, tocMode, tocPN,optionToggle))
         text = page.replace('mode=image','mode=texttool')
         logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
         #logging.debug("documentViewer (characterNormalization) text: %s"%(text))
--- a/zpt/page_main_gis.zpt	Tue Nov 09 12:45:38 2010 +0100
+++ b/zpt/page_main_gis.zpt	Tue Nov 09 13:41:41 2010 +0100
@@ -1,4 +1,3 @@
-
-<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn',''); characterNormalization python:pageinfo.get('characterNormalization','');">
-  <div tal:content="structure python:here.getTextPage(mode='gis',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, characterNormalization=characterNormalization)"></div>
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn',''); characterNormalization python:pageinfo.get('characterNormalization',''); optionToggle python:pageinfo.get('optionToggle','');">
+  <div tal:content="structure python:here.getTextPage(mode='gis',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, characterNormalization=characterNormalization, optionToggle=optionToggle)"></div>
 </tal:block>
\ No newline at end of file
--- a/zpt/page_main_text.zpt	Tue Nov 09 12:45:38 2010 +0100
+++ b/zpt/page_main_text.zpt	Tue Nov 09 13:41:41 2010 +0100
@@ -1,4 +1,3 @@
-
-<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','');characterNormalization python:pageinfo.get('characterNormalization','');">
-  <div tal:content="structure python:here.getTextPage(mode='text',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, highlightQuery=highlightQuery,sn=sn, characterNormalization=characterNormalization)"></div>
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','');characterNormalization python:pageinfo.get('characterNormalization','');optionToggle python:pageinfo.get('optionToggle','');">
+  <div tal:content="structure python:here.getTextPage(mode='text',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, highlightQuery=highlightQuery,sn=sn, characterNormalization=characterNormalization,optionToggle=optionToggle)"></div>
 </tal:block>
\ No newline at end of file
--- a/zpt/page_main_text_dict.zpt	Tue Nov 09 12:45:38 2010 +0100
+++ b/zpt/page_main_text_dict.zpt	Tue Nov 09 13:41:41 2010 +0100
@@ -1,3 +1,3 @@
-<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','');characterNormalization python:pageinfo.get('characterNormalization','');">
-  <div tal:content="structure python:here.getTextPage(mode='text_dict',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, characterNormalization=characterNormalization)"></div>
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','');characterNormalization python:pageinfo.get('characterNormalization','');optionToggle python:pageinfo.get('optionToggle','');">
+  <div tal:content="structure python:here.getTextPage(mode='text_dict',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, characterNormalization=characterNormalization,optionToggle=optionToggle)"></div>
 </tal:block>
\ No newline at end of file
--- a/zpt/page_main_xml.zpt	Tue Nov 09 12:45:38 2010 +0100
+++ b/zpt/page_main_xml.zpt	Tue Nov 09 13:41:41 2010 +0100
@@ -1,4 +1,3 @@
-
-<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','')  ">
-  <div tal:content="structure python:here.getTextPage(mode='xml',pn=pageinfo['current'],docinfo=docinfo, pageinfo=pageinfo)"></div>
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','');optionToggle python:pageinfo.get('optionToggle','');  ">
+  <div tal:content="structure python:here.getTextPage(mode='xml',pn=pageinfo['current'],docinfo=docinfo, pageinfo=pageinfo,optionToggle=optionToggle)"></div>
 </tal:block>
\ No newline at end of file