--- documentViewer/documentViewer.py	2010/11/02 15:32:44	1.151
+++ documentViewer/documentViewer.py	2010/11/23 16:36:50	1.158
@@ -151,6 +151,7 @@ class documentViewer(Folder):
     page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals())
     page_main_gis =PageTemplateFile ('zpt/page_main_gis', globals())
     page_main_xml = PageTemplateFile('zpt/page_main_xml', globals())
+    page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals())
     head_main = PageTemplateFile('zpt/head_main', globals())
     docuviewer_css = PageTemplateFile('css/docuviewer.css', globals())
     info_xml = PageTemplateFile('zpt/info_xml', globals())
@@ -199,6 +200,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 +291,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):
         '''
         view it
         @param mode: defines how to access the document behind url 
@@ -397,6 +410,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"""
@@ -775,7 +802,7 @@ class documentViewer(Folder):
         self.REQUEST.SESSION['docinfo'] = docinfo
         return docinfo
                
-    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""):
+    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None):
         """returns pageinfo with the given parameters"""
         pageinfo = {}
         current = getInt(current)
@@ -799,10 +826,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['characterNormalization'] = self.REQUEST.get('characterNormalization','regPlusNorm')
+        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')