--- documentViewer/documentViewer.py 2010/11/02 15:32:44 1.151 +++ documentViewer/documentViewer.py 2010/11/09 11:38:25 1.156 @@ -199,6 +199,18 @@ class documentViewer(Folder): """get query""" 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): """get query""" return self.template.fulltextclient.getPDF(**args) @@ -278,7 +290,7 @@ class documentViewer(Folder): return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode) 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 @param mode: defines how to access the document behind url @@ -397,6 +409,20 @@ class documentViewer(Folder): pt = getattr(self.template, 'info_xml') 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): """returns if access to the resource is granted""" @@ -799,10 +825,9 @@ class documentViewer(Folder): pageinfo['numgroups'] += 1 pageinfo['viewMode'] = viewMode pageinfo['tocMode'] = tocMode - #pageinfo ['originalPage'] = self.getOrigPages(docinfo=None, pageinfo=None) 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') pageinfo['textPN'] = self.REQUEST.get('textPN','1')