[BACK]Return to documentViewer.py CVS log [TXT] [DIR] Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.154 and 1.156

version 1.154, 2010/11/08 15:06:59 version 1.156, 2010/11/09 11:38:25
Line 290  class documentViewer(Folder): Line 290  class documentViewer(Folder):
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)          return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
       
     security.declareProtected('View','index_html')      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          view it
         @param mode: defines how to access the document behind url           @param mode: defines how to access the document behind url 
Line 411  class documentViewer(Folder): Line 411  class documentViewer(Folder):
   
     def getOptionToggle(self, newState=None, optionName='text_options_open', initialState=True):      def getOptionToggle(self, newState=None, optionName='text_options_open', initialState=True):
         """returns new option state"""          """returns new option state"""
         opt = self.REQUEST.SESSION.get(optionName,None)          if not self.REQUEST.SESSION.has_key(optionName):
         if opt is None:  
             # not in session -- initial              # not in session -- initial
             opt = {'lastState': newState, 'state': initialState}              opt = {'lastState': newState, 'state': initialState}
         else:          else:
               opt = self.REQUEST.SESSION.get(optionName)
             if opt['lastState'] != newState:              if opt['lastState'] != newState:
                 # state in session has changed -- toggle                  # state in session has changed -- toggle
                 opt['state'] = not opt['state']                  opt['state'] = not opt['state']
Line 826  class documentViewer(Folder): Line 826  class documentViewer(Folder):
         pageinfo['viewMode'] = viewMode          pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode          pageinfo['tocMode'] = tocMode
         pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')          pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')
           pageinfo['optionToggle'] = self.REQUEST.get('optionToggle','')
         pageinfo['query'] = self.REQUEST.get('query','')          pageinfo['query'] = self.REQUEST.get('query','')
         pageinfo['optionsClose']= self.REQUEST.get('optionsClose','')    
         pageinfo['queryType'] = self.REQUEST.get('queryType','')          pageinfo['queryType'] = self.REQUEST.get('queryType','')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')          pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
         pageinfo['textPN'] = self.REQUEST.get('textPN','1')          pageinfo['textPN'] = self.REQUEST.get('textPN','1')
Removed from v.1.154  
changed lines
  Added in v.1.156

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>