--- zogiLib/zogiLib.py	2004/06/04 12:28:12	1.23
+++ zogiLib/zogiLib.py	2004/06/04 15:11:08	1.24
@@ -12,6 +12,7 @@ import os
 import re
 import string
 import urllib
+import types
 from Globals import package_home
 
 def getString(self,key,default=''):
@@ -468,21 +469,28 @@ class zogiLib(Folder):
         """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) = self.REQUEST.SESSION['scalerDiv']
+        # if not explicitly defined take normal request
         if not requestString:
             requestString = self.getAllDLParams()
         url = self.digilibBaseUrl+requestString
+        # 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 = ""
         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'));"
-        b_par = ""
-        s_par = ""
-        if (bottom != 0) or (side != 0):
-            b_par = "-" + str(int(bottom))
-            s_par = "-" + str(int(side))
+        # 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:
@@ -491,9 +499,14 @@ class zogiLib(Folder):
             tag += '</div>'
         return tag
 
-    def createScalerDiv(self):
+    def createScalerDiv(self, requestString = None, bottom = 0, side = 0):
         """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)
+        else:
+            if self.REQUEST.SESSION.has_key('scalerDiv'):
+                del self.REQUEST.SESSION['scalerDiv']
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/zogilib_img_div')).__of__(self)
         return pt()
 
@@ -633,12 +646,19 @@ class zogiLib(Folder):
 	"""check if the query has been stored"""
 	if not (self.REQUEST.SESSION):
 	    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 +669,7 @@ class zogiLib(Folder):
         try:
             return self.REQUEST.SESSION['query'][param]
         except:
-            return None
+            return
 
     def setDLParam(self, param, value):
         """sets parameter"""
@@ -715,9 +735,7 @@ class zogiLib(Folder):
     def getBiggerWS(self):
         """ws+1"""
         ws = self.getDLParam('ws')
-        print "ws: ", ws
         if ws:
-            print "WS!"
             return int(ws)+1
         else:
             return 2