--- documentViewer/documentViewer.py 2010/11/08 14:59:40 1.153 +++ documentViewer/documentViewer.py 2010/11/08 16:08:18 1.155 @@ -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) @@ -399,11 +411,11 @@ class documentViewer(Folder): def getOptionToggle(self, newState=None, optionName='text_options_open', initialState=True): """returns new option state""" - opt = self.REQUEST.SESSION.get(optionName,None) - if opt is None: + 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']