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

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

version 1.148, 2010/10/29 12:53:45 version 1.156, 2010/11/09 11:38:25
Line 18  import math Line 18  import math
 import urlparse   import urlparse 
 import cStringIO  import cStringIO
 import re  import re
   import string
   
 def logger(txt,method,txt2):  def logger(txt,method,txt2):
     """logging"""      """logging"""
Line 199  class documentViewer(Folder): Line 199  class documentViewer(Folder):
         """get query"""          """get query"""
         return self.template.fulltextclient.getQuery(**args)          return self.template.fulltextclient.getQuery(**args)
           
       def getQueryResultHits(self, **args):
           """get query"""
           return self.template.fulltextclient.getQueryResultHits(**args)
       
       def getQueryResultHitsText(self, **args):
           """get query"""
           return self.template.fulltextclient.getQueryResultHitsText(**args)
       
       def getQueryResultHitsFigures(self, **args):
           """get query"""
           return self.template.fulltextclient.getQueryResultHitsFigures(**args)
       
     def getPDF(self, **args):      def getPDF(self, **args):
         """get query"""          """get query"""
         return self.template.fulltextclient.getPDF(**args)          return self.template.fulltextclient.getPDF(**args)
Line 278  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=""):      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 326  class documentViewer(Folder): Line 338  class documentViewer(Folder):
             ret+="mk=%s"%m              ret+="mk=%s"%m
         return ret          return ret
   
       
     def getBrowser(self):      def getBrowser(self):
         """getBrowser the version of browser """          """getBrowser the version of browser """
         bt = browserCheck(self)          names=""
         logging.debug("XXXXXXXXXXXXXXXX: %s"%bt)          names = browserCheck(self)
         return bt          #logging.debug("XXXXXXXXXXXXXXXX: %s"%names)
           return names
                   
     def findDigilibUrl(self):      def findDigilibUrl(self):
         """try to get the digilib URL from zogilib"""          """try to get the digilib URL from zogilib"""
Line 395  class documentViewer(Folder): Line 409  class documentViewer(Folder):
         pt = getattr(self.template, 'info_xml')          pt = getattr(self.template, 'info_xml')
         return pt(docinfo=docinfo)          return pt(docinfo=docinfo)
   
       def getOptionToggle(self, newState=None, optionName='text_options_open', initialState=True):
           """returns new option state"""
           if not self.REQUEST.SESSION.has_key(optionName):
               # not in session -- initial
               opt = {'lastState': newState, 'state': initialState}
           else:
               opt = self.REQUEST.SESSION.get(optionName)
               if opt['lastState'] != newState:
                   # state in session has changed -- toggle
                   opt['state'] = not opt['state']
                   opt['lastState'] = newState
           
           self.REQUEST.SESSION[optionName] = opt
           return opt['state']
           
     def isAccessible(self, docinfo):      def isAccessible(self, docinfo):
         """returns if access to the resource is granted"""          """returns if access to the resource is granted"""
Line 797  class documentViewer(Folder): Line 825  class documentViewer(Folder):
                 pageinfo['numgroups'] += 1                          pageinfo['numgroups'] += 1        
         pageinfo['viewMode'] = viewMode          pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode          pageinfo['tocMode'] = tocMode
         #pageinfo ['originalPage'] = self.getOrigPages(docinfo=None, pageinfo=None)  
         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['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')
Removed from v.1.148  
changed lines
  Added in v.1.156

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