--- zogiLib/zogiLib.py	2006/02/01 12:25:11	1.62
+++ zogiLib/zogiLib.py	2006/06/15 16:44:00	1.63
@@ -18,7 +18,7 @@ import string
 import urllib
 import xml.dom.minidom
 
-ZOGIVERSION = "0.10.1b ROC 8.11.2005"
+ZOGIVERSION = "0.10.2b ROC 15.6.2006"
 
 def cropf(f):
     """returns a float with reduced precision"""
@@ -144,11 +144,11 @@ class zogiLib(Folder):
     def __init__(self, id, title, dlServerURL, layout="book", basePath="", dlTarget=None, dlToolbarBaseURL=None):
         """init"""
 
-        self.id=id
-        self.title=title
+        self.id = id
+        self.title = title
         self.dlServerURL = dlServerURL
-        self.basePath=basePath
-        self.layout=layout
+        self.basePath = basePath
+        self.layout = layout
         self.dlTarget = dlTarget
 
         if dlToolbarBaseURL:
@@ -392,7 +392,7 @@ class zogiLib(Folder):
     def createScalerImg(self, requestString=None, bottom=0, side=0, width=500, height=500):
         """generate Scaler IMG Tag"""
         self.checkQuery()
-        bt = self.REQUEST.SESSION['browserType']
+        bt = self.getBrowserType()
         # override with parameters from session
         if  self.REQUEST.SESSION.has_key('scalerDiv'):
             (requestString, bottom, side, width, height) = self.REQUEST.SESSION['scalerDiv']
@@ -457,9 +457,6 @@ class zogiLib(Folder):
         """make shure that the query has been saved"""
         if not self.REQUEST.has_key('dlParams'):
             self.storeQuery()
-        if not self.REQUEST.SESSION.has_key('browserType'):
-            bt = browserCheck(self)
-            self.REQUEST.SESSION.set('browserType', bt)            
 
     def storeQuery(self, more=None, withpt=False):
         """parse query parameters into a hash in REQUEST"""
@@ -542,6 +539,15 @@ class zogiLib(Folder):
             
         return self.display()
 
+    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)                        
+            return bt
+
 
     def display(self):
         """(re)display page"""
@@ -635,13 +641,13 @@ class zogiLib(Folder):
     def dl_StaticHTML(self):
         """set rendering to static HTML"""
         self.checkQuery()
-        self.REQUEST.SESSION['browserType']['staticHTML'] = True
+        self.getBrowserType()['staticHTML'] = True
         return self.display()
 
     def dl_DynamicHTML(self):
         """set rendering to dynamic HTML"""
         self.checkQuery()
-        self.REQUEST.SESSION['browserType']['staticHTML'] = False
+        self.getBrowserType()['staticHTML'] = False
         return self.display()
         
     def dl_HMirror(self):
@@ -859,23 +865,23 @@ def manage_addZogiLibPageTemplateForm(se
     pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/addZogiLibPageTemplateForm')).__of__(self)
     return pt()
 
-def manage_addZogiLibPageTemplate(self, id=None, title=None, layout=None, text=None,
+def manage_addZogiLibPageTemplate(self, title=None, layout=None, text=None,
                            REQUEST=None, submit=None):
     "Add a Page Template with optional file content."
 
     if not layout: layout = "book"
-    if not id: id = "main_%s"%layout;
+    id = 'main_%s'%layout
     self._setObject(id, zogiLibPageTemplate(id))
     ob = getattr(self, id)
     ob.pt_edit(open(os.path.join(package_home(globals()),'zpt/main_%s.zpt'%layout)).read(),None)
     if title:
         ob.pt_setTitle(title)
     try:
-        u = self.DestinationURL()
+        url = self.DestinationURL()
     except AttributeError:
-        u = REQUEST['URL1']
+        url = REQUEST['URL1']
         
-    u = "%s/%s" % (u, urllib.quote(id))
-    REQUEST.RESPONSE.redirect(u+'/manage_main')
+    url = "%s/%s" % (url, urllib.quote(id))
+    REQUEST.RESPONSE.redirect(url+'/manage_main')
     return ''