Changeset 401:79570b30b7cb in documentViewer


Ignore:
Timestamp:
Nov 9, 2010, 12:41:41 PM (14 years ago)
Author:
abukhman
Branch:
default
Message:

* empty log message *

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • MpdlXmlTextServer.py

    r400 r401  
    465465       
    466466        data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=%s&optionToggle=%s"%(docpath,queryType, pagesize, pn,characterNormalization,optionToggle)) 
    467         page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl,url, viewMode, tocMode, tocPN))
     467        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))
    468468        text = page.replace('mode=image','mode=texttool')
    469469        logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))

  • zpt/page_main_gis.zpt

    r381 r401  
    1 
    2 <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','');">
    3   <div tal:content="structure python:here.getTextPage(mode='gis',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, characterNormalization=characterNormalization)"></div>
     1<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','');">
     2  <div tal:content="structure python:here.getTextPage(mode='gis',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, characterNormalization=characterNormalization, optionToggle=optionToggle)"></div>
    43</tal:block>

  • zpt/page_main_text.zpt

    r383 r401  
    1 
    2 <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','');">
    3   <div tal:content="structure python:here.getTextPage(mode='text',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, highlightQuery=highlightQuery,sn=sn, characterNormalization=characterNormalization)"></div>
     1<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','');">
     2  <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>
    43</tal:block>

  • zpt/page_main_text_dict.zpt

    r380 r401  
    1 <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','');">
    2   <div tal:content="structure python:here.getTextPage(mode='text_dict',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, characterNormalization=characterNormalization)"></div>
     1<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','');">
     2  <div tal:content="structure python:here.getTextPage(mode='text_dict',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, characterNormalization=characterNormalization,optionToggle=optionToggle)"></div>
    33</tal:block>

  • zpt/page_main_xml.zpt

    r380 r401  
    1 
    2 <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','')  ">
    3   <div tal:content="structure python:here.getTextPage(mode='xml',pn=pageinfo['current'],docinfo=docinfo, pageinfo=pageinfo)"></div>
     1<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','');  ">
     2  <div tal:content="structure python:here.getTextPage(mode='xml',pn=pageinfo['current'],docinfo=docinfo, pageinfo=pageinfo,optionToggle=optionToggle)"></div>
    43</tal:block>
Note: See TracChangeset for help on using the changeset viewer.