--- documentViewer/documentViewer.py	2010/10/18 10:43:44	1.139
+++ documentViewer/documentViewer.py	2010/11/02 15:32:44	1.151
@@ -12,14 +12,13 @@ import Ft.Xml.Domlette
 import os.path
 import sys
 import urllib
-
 import urllib2
 import logging
 import math
 import urlparse 
 import cStringIO
 import re
-
+import string
 
 def logger(txt,method,txt2):
     """logging"""
@@ -52,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):
@@ -182,6 +198,10 @@ class documentViewer(Folder):
     def getQuery(self, **args):
         """get query"""
         return self.template.fulltextclient.getQuery(**args)
+    
+    def getPDF(self, **args):
+        """get query"""
+        return self.template.fulltextclient.getPDF(**args)
 
     def getSearch(self, **args):
         """get search"""
@@ -305,8 +325,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()
@@ -663,7 +690,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
@@ -744,16 +771,15 @@ class documentViewer(Folder):
             raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode))
                         
         logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo)
-       
+        #logging.debug("documentViewer (getdocinfo) docinfo: %s"%)
         self.REQUEST.SESSION['docinfo'] = docinfo
         return docinfo
                
-    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization="",originalPage=None):
+    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""):
         """returns pageinfo with the given parameters"""
         pageinfo = {}
         current = getInt(current)
     
-        pageinfo ['originalPage'] = self.REQUEST.get('originalPage','')
         pageinfo['current'] = current
         rows = int(rows or self.thumbrows)
         pageinfo['rows'] = rows
@@ -773,10 +799,11 @@ class documentViewer(Folder):
                 pageinfo['numgroups'] += 1        
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
-        #pageinfo['characterNormalization'] =characterNormalization
-        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization',' ')
-        pageinfo['query'] = self.REQUEST.get('query',' ')
-        pageinfo['queryType'] = self.REQUEST.get('queryType',' ')
+        #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['queryType'] = self.REQUEST.get('queryType','')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
         pageinfo['textPN'] = self.REQUEST.get('textPN','1')
         pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')
@@ -786,7 +813,7 @@ class documentViewer(Folder):
         toc = int (pageinfo['tocPN'])
         pageinfo['textPages'] =int (toc)
         
-        logging.debug("originalPage: %s"%originalPage)
+        
         
         if 'tocSize_%s'%tocMode in docinfo:
             tocSize = int(docinfo['tocSize_%s'%tocMode])