--- documentViewer/documentViewer.py	2010/11/08 15:06:59	1.154
+++ documentViewer/documentViewer.py	2010/11/09 11:38:25	1.156
@@ -290,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="", 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
         @param mode: defines how to access the document behind url 
@@ -411,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']
@@ -826,8 +826,8 @@ class documentViewer(Folder):
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
         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')