--- zogiLib/zogiLib.py	2004/06/04 12:28:12	1.23
+++ zogiLib/zogiLib.py	2004/06/07 17:56:55	1.26
@@ -12,14 +12,9 @@ import os
 import re
 import string
 import urllib
+import types
 from Globals import package_home
 
-def getString(self,key,default=''):
-    try:
-        return self.REQUEST[key]
-    except:
-        return default
-
 def sendFile(self, filename, type):
     """sends an object or a local file (in the product) as response"""
     paths = filename.split('/')
@@ -41,22 +36,24 @@ def sendFile(self, filename, type):
 	self.REQUEST.RESPONSE.write(file(fn).read())
     return
 
-class BrowserCheck:
+def browserCheck(self):
     """check the browsers request to find out the browser type"""
-    
-    def __init__(self, zope):
-	self.ua = zope.REQUEST.get_header("HTTP_USER_AGENT")
-	self.isIE = string.find(self.ua, 'MSIE') > -1
-	self.isN4 = (string.find(self.ua, 'Mozilla/4.') > -1) and not self.isIE
-	self.nav = self.ua[string.find(self.ua, '('):]
-	ie = string.split(self.nav, "; ")[1]
-	if string.find(ie, "MSIE") > -1:
-	    self.versIE = string.split(ie, " ")[1]
-	self.isMac = string.find(self.ua, 'Macintosh') > -1
-	self.isWin = string.find(self.ua, 'Windows') > -1
-	self.isIEWin = self.isIE and self.isWin
-	self.isIEMac = self.isIE and self.isMac
+    bt = {}
+    ua = self.REQUEST.get_header("HTTP_USER_AGENT")
+    bt['ua'] = ua
+    bt['isIE'] = string.find(ua, 'MSIE') > -1
+    bt['isN4'] = (string.find(ua, 'Mozilla/4.') > -1) and not bt['isIE']
+    nav = ua[string.find(ua, '('):]
+    ie = string.split(nav, "; ")[1]
+    if string.find(ie, "MSIE") > -1:
+        bt['versIE'] = string.split(ie, " ")[1]
+    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 manage_addZogiLibMainTemplateForm(self):
     """Form for adding"""
@@ -455,45 +452,72 @@ class zogiLib(Folder):
 
     def createHeadJS(self):
         """generate all javascript tags for head"""
+	self.checkQuery()
+	bt = self.REQUEST.SESSION['browserType']
+        if bt['staticHTML']:
+            return
+        
         pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogilib_head_js')).__of__(self)
         return pt()
 
     def createParamJS(self):
         """generate javascript for parameters only"""
+	self.checkQuery()
+	bt = self.REQUEST.SESSION['browserType']
+        if bt['staticHTML']:
+            return
+
         pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogilib_param_js')).__of__(self)
         return pt()
         
                         
-    def createScalerImg(self, requestString = None, bottom = 0, side = 0):
+    def createScalerImg(self, requestString=None, bottom=0, side=0, width=500, height=500):
         """generate Scaler IMG Tag"""
 	self.checkQuery()
 	bt = self.REQUEST.SESSION['browserType']
+        # override with parameters from session
+        if  self.REQUEST.SESSION.has_key('scalerDiv'):
+            (requestString, bottom, side, width, height) = self.REQUEST.SESSION['scalerDiv']
+        # if not explicitly defined take normal request
         if not requestString:
             requestString = self.getAllDLParams()
         url = self.digilibBaseUrl+requestString
-        tag = ""
-        if bt.isN4:
-            tag += '<ilayer id="scaler">'
-        else:
-            tag += '<div id="scaler">'
-        tag += '<script type="text/javascript">'
-        tag += "var ps = bestPicSize(getElement('scaler'));"
+        # construct bottom and side insets
         b_par = ""
         s_par = ""
         if (bottom != 0) or (side != 0):
             b_par = "-" + str(int(bottom))
             s_par = "-" + str(int(side))
-        tag += 'document.write(\'<img id="pic" src="%s&dw=\'+(ps.width%s)+\'&dh=\'+(ps.height%s)+\'" />\')'%(url, s_par, b_par)
-        tag += '</script>'
-        if bt.isN4:
-            tag += '</ilayer>'
+        tag = ""
+        if bt['staticHTML']:
+            tag += '<div id="scaler"><img id="pic" src="%s&dw=%i&dh=%i" /></div>'%(url, int(width-side), int(height-bottom))
         else:
-            tag += '</div>'
+            if bt['isN4']:
+                # N4 needs layers
+                tag += '<ilayer id="scaler">'
+            else:
+                tag += '<div id="scaler">'
+            tag += '<script type="text/javascript">'
+            tag += "var ps = bestPicSize(getElement('scaler'));"
+            # write img tag with javascript
+            tag += 'document.write(\'<img id="pic" src="%s&dw=\'+(ps.width%s)+\'&dh=\'+(ps.height%s)+\'" />\');'%(url, s_par, b_par)
+            tag += '</script>'
+            if bt['isN4']:
+                tag += '</ilayer>'
+            else:
+                tag += '</div>'
         return tag
 
-    def createScalerDiv(self):
+    def createScalerDiv(self, requestString = None, bottom = 0, side = 0, width=500, height=500):
         """generate scaler img and table with navigation arrows"""
 	self.checkQuery()
+        if requestString != None or bottom != 0 or side != 0:
+            self.REQUEST.SESSION['scalerDiv'] = (requestString, bottom, side, width, height)
+        else:
+            if self.REQUEST.SESSION.has_key('scalerDiv'):
+                # make shure to remove unused parameter
+                del self.REQUEST.SESSION['scalerDiv']
+                
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/zogilib_img_div')).__of__(self)
         return pt()
 
@@ -501,7 +525,9 @@ class zogiLib(Folder):
         """generate other divs"""
 	self.checkQuery()
 	bt = self.REQUEST.SESSION['browserType']
-        if bt.isN4:
+        if bt['staticHTML']:
+            return
+        if bt['isN4']:
             f = 'zpt/zogilib_divsN4.zpt'
         else:
             f = 'zpt/zogilib_divs.zpt'
@@ -524,7 +550,12 @@ class zogiLib(Folder):
 
     def optionwindow(self):
         """showoptions"""
-        pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self)
+	self.checkQuery()
+	bt = self.REQUEST.SESSION['browserType']
+        if bt['staticHTML']:
+            pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow_static.zpt')).__of__(self)
+        else:
+            pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self)
         return pt()
 
     def mark1(self):
@@ -595,11 +626,18 @@ class zogiLib(Folder):
             
     def index_html(self):
         """main action"""
+	self.checkQuery()
+	bt = self.REQUEST.SESSION['browserType']
         tp = "zogiLibMainTemplate"
         if hasattr(self, tp):
 	    pt = getattr(self, tp)
         else:
-            pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogiLibMain_%s'%self.layout)).__of__(self)
+            tpt = self.layout
+            if bt['staticHTML']:
+                tpt = "static"
+                
+            pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogiLibMain_%s'%tpt)).__of__(self)
+            
         return pt()
 
 
@@ -616,7 +654,8 @@ class zogiLib(Folder):
                     pv = fm.split('=')
                     dlParams[pv[0]] = pv[1]
                 except:
-                    print "ouch!"
+                    pass
+                
         # parse digilib mode parameter
         if 'mo' in dlParams:
             if len(dlParams['mo']) > 0:
@@ -627,18 +666,28 @@ class zogiLib(Folder):
         self.REQUEST.SESSION['query'] = dlParams
         self.REQUEST.SESSION['dlModes'] = modes
         self.REQUEST.SESSION['dlInfo'] = self.getDLInfo()
-        self.REQUEST.SESSION['browserType'] = BrowserCheck(self)
+        if not self.REQUEST.SESSION.has_key('browserType'):
+            self.REQUEST.SESSION['browserType'] = browserCheck(self)
+            
+        return
 
     def checkQuery(self):
 	"""check if the query has been stored"""
-	if not (self.REQUEST.SESSION):
+	if not (self.REQUEST.SESSION and self.REQUEST.SESSION.has_key('query')) :
 	    print "ZOGILIB: have to store query!!"
-	    storeQuery(self)
+	    self.storeQuery()
+        return
 
-    def zogilibPath(self):
+    def zogilibPath(self, otherbase=None):
         """returns an URL to the zogiLib instance"""
         url = self.REQUEST['URL1']
-        url += self.basePath
+        # should end with "/"
+        if len(url) > 0 and url[-1] != '/':
+            url += '/'
+        if type(otherbase) is str:
+            url += otherbase
+        else:
+            url += self.basePath
         # should end with "/"
         if len(url) > 0 and url[-1] != '/':
             url += '/'
@@ -649,7 +698,7 @@ class zogiLib(Folder):
         try:
             return self.REQUEST.SESSION['query'][param]
         except:
-            return None
+            return
 
     def setDLParam(self, param, value):
         """sets parameter"""
@@ -696,6 +745,18 @@ class zogiLib(Folder):
         else:
             self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'?'+params)
 
+
+    def setStaticHTML(self, static=True):
+        """sets the preference to static HTML"""
+        self.checkQuery()
+ 	self.REQUEST.SESSION['browserType']['staticHTML'] = static
+        return
+
+    def isStaticHTML(self):
+        """returns if the page is using static HTML only"""
+        self.checkQuery()
+	return self.REQUEST.SESSION['browserType']['staticHTML']
+
     def getPT(self):
         """pagenums"""
         di = self.REQUEST.SESSION['dlInfo']
@@ -707,27 +768,25 @@ class zogiLib(Folder):
     def getPN(self):
         """Pagenum"""
         pn = self.getDLParam('pn')
-        if pn:
+        try:
             return int(pn)
-        else:
+        except:
             return 1
 
     def getBiggerWS(self):
         """ws+1"""
         ws = self.getDLParam('ws')
-        print "ws: ", ws
-        if ws:
-            print "WS!"
-            return int(ws)+1
-        else:
-            return 2
+        try:
+            return float(ws)+0.5
+        except:
+            return 1.5
         
     def getSmallerWS(self):
         """ws-1"""
         ws=self.getDLParam('ws')
-        if ws:
-            return max(int(ws)-1, 1)
-        else:
+        try:
+            return max(float(ws)-0.5, 1)
+        except:
             return 1
 
     def hasMode(self, mode):
@@ -767,6 +826,18 @@ class zogiLib(Folder):
         wh = float(self.getDLParam('wh') or 1)
         return (wy + wh < 1)
 
+
+    def dl_StaticHTML(self):
+        """set rendering to static HTML"""
+        self.checkQuery()
+        self.REQUEST.SESSION['browserType']['staticHTML'] = True
+        return self.display()
+
+    def dl_DynamicHTML(self):
+        """set rendering to dynamic HTML"""
+        self.checkQuery()
+        self.REQUEST.SESSION['browserType']['staticHTML'] = False
+        return self.display()
         
     def dl_HMirror(self):
         """mirror action"""