--- documentViewer/documentViewer.py	2010/10/26 14:44:55	1.146
+++ documentViewer/documentViewer.py	2010/11/16 11:31:57	1.157
@@ -18,7 +18,7 @@ import math
 import urlparse 
 import cStringIO
 import re
-
+import string
 
 def logger(txt,method,txt2):
     """logging"""
@@ -51,15 +51,32 @@ def serializeNode(node, encoding='utf-8'
     buf.close()
     return s
 
-def getBrowserType(self):
-        """get browser type object"""
-        if self.REQUEST.SESSION.has_key('browserType'):
-            return self.REQUEST.SESSION['browserType']
-        else:
-            bt = browserCheck(self)
-            self.REQUEST.SESSION.set('browserType', bt)    
-            logging.debug("documentViewer (BROWSER TYPE) bt %s"%bt)                    
-            return bt
+def browserCheck(self):
+    """check the browsers request to find out the browser type"""
+    bt = {}
+    ua = self.REQUEST.get_header("HTTP_USER_AGENT")
+    bt['ua'] = ua
+    bt['isIE'] = False
+    bt['isN4'] = False
+    if string.find(ua, 'MSIE') > -1:
+        bt['isIE'] = True
+    else:
+        bt['isN4'] = (string.find(ua, 'Mozilla/4.') > -1)
+        
+    try:
+        nav = ua[string.find(ua, '('):]
+        ie = string.split(nav, "; ")[1]
+        if string.find(ie, "MSIE") > -1:
+            bt['versIE'] = string.split(ie, " ")[1]
+    except: pass
+    
+    bt['isMac'] = string.find(ua, 'Macintosh') > -1
+    bt['isWin'] = string.find(ua, 'Windows') > -1
+    bt['isIEWin'] = bt['isIE'] and bt['isWin']
+    bt['isIEMac'] = bt['isIE'] and bt['isMac']
+    bt['staticHTML'] = False
+
+    return bt
 
        
 def getParentDir(path):
@@ -134,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())
@@ -181,6 +199,22 @@ class documentViewer(Folder):
     def getQuery(self, **args):
         """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)
 
     def getSearch(self, **args):
         """get search"""
@@ -257,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, query=None, querySearch=None, characterNormalization="", optionToggle=None):
         '''
         view it
         @param mode: defines how to access the document behind url 
@@ -304,8 +338,15 @@ class documentViewer(Folder):
         for m in mk:
             ret+="mk=%s"%m
         return ret
-
-
+    
+    
+    def getBrowser(self):
+        """getBrowser the version of browser """
+        names=""
+        names = browserCheck(self)
+        #logging.debug("XXXXXXXXXXXXXXXX: %s"%names)
+        return names
+        
     def findDigilibUrl(self):
         """try to get the digilib URL from zogilib"""
         url = self.template.zogilib.getDLBaseUrl()
@@ -369,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"""
@@ -662,7 +717,7 @@ class documentViewer(Folder):
         presentationUrls = dom.xpath("//texttool/presentation")
         docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get info von bib tag
         docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
-        #docinfo =self.getOrigPages(docinfo=docinfo)
+        
         
         if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen 
              # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten
@@ -771,9 +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['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')