--- zogiLib/zogiLib.py	2004/07/22 17:30:21	1.36
+++ zogiLib/zogiLib.py	2004/07/23 15:28:21	1.37
@@ -388,21 +388,25 @@ class zogiLib(Folder):
             {'label':'Main Config','action':'changeZogiLibForm'},
             )
 
-    def __init__(self, id, title, dlServerURL,localFileBase, version="book", basePath="", dlTarget=None):
+    def __init__(self, id, title, dlServerURL, layout="book", basePath="", dlTarget=None, dlToolbarBaseURL=None):
         """init"""
 
         self.id=id
         self.title=title
         self.dlServerURL = dlServerURL
-
-        self.localFileBase=localFileBase
         self.basePath=basePath
-        self.layout=version
+        self.layout=layout
         if dlTarget:
             self.dlTarget = dlTarget
         else:
             self.dlTarget = "digilib"
 
+        if dlToolbarBaseURL:
+            self.dlToolbarBaseURL = dlToolbarBaseURL
+        else:
+            self.dlToolbarBaseURL = dlServerURL + "/digimage.jsp?"
+
+
     def version(self):
         """version information"""
         return ZOGIVERSION
@@ -634,18 +638,17 @@ class zogiLib(Folder):
 	self.checkQuery()
         if self.REQUEST.has_key('frametarget'):
             self.dlTarget = self.REQUEST['frametarget']
-        print "current dltarget: ", self.dlTarget
 	bt = self.REQUEST.SESSION['browserType']
         if bt['staticHTML']:
             pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow_static.zpt')).__of__(self)
         else:
-	    finds=self.ZopeFind(self,obj_ids=['viewingTools.zpt'])
-	    if finds:
-                
-		return finds[0][1]()
+            tp = "viewingTools.zpt"
+            if hasattr(self, tp):
+                pt = getattr(self, tp)
 	    else:
                 pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self)
-                return pt()
+                
+        return pt()
 
     def mark1(self):
         """mark image"""
@@ -844,7 +847,7 @@ class zogiLib(Folder):
 
     def getToolbarPageURL(self):
         """returns a toolbar-enabled page URL"""
-        url=self.dlServerURL+'/digimage.jsp?'+self.getAllDLParams()
+        url=self.dlToolbarBaseURL+self.getAllDLParams()
         return url
     
     def getDLTarget(self):
@@ -1094,11 +1097,10 @@ class zogiLib(Folder):
         pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/changeZogiLibForm.zpt')).__of__(self)
         return pt()
     
-    def changeZogiLib(self,title,dlServerURL, localFileBase, version, basePath, dlTarget, RESPONSE=None):
+    def changeZogiLib(self,title,dlServerURL, version, basePath, dlTarget, dlToolbarBaseURL, RESPONSE=None):
         """change it"""
         self.title=title
         self.dlServerURL=dlServerURL
-        self.localFileBase=localFileBase
         self.basePath = basePath
         self.layout=version
         if dlTarget:
@@ -1106,6 +1108,11 @@ class zogiLib(Folder):
         else:
             self.dlTarget = "digilib"
 
+        if dlToolbarBaseURL:
+            self.dlToolbarBaseURL = dlToolbarBaseURL
+        else:
+            self.dlToolbarBaseURL = dlServerURL + "/digimage.jsp?"
+
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
@@ -1129,11 +1136,19 @@ class zogiLib(Folder):
 
         for entry in entries:
             print "  found ", entry
+            #
+            # replace digilibBaseUrl by dlServerURL
             if hasattr(entry[1], 'digilibBaseUrl'):
-                msg += "  fixing "+entry[0]+"\n"
+                msg += "  fixing digilibBaseUrl in "+entry[0]+"\n"
                 entry[1].dlServerURL = re.sub('/servlet/Scaler\?','',entry[1].digilibBaseUrl)
                 del entry[1].digilibBaseUrl
                 
+            #
+            # add dlToolbarBaseURL
+            if not hasattr(entry[1], 'dlToolbarBaseURL'):
+                msg += "  fixing dlToolbarBaseURL in "+entry[0]+"\n"
+                entry[1].dlToolbarBaseURL = entry[1].dlServerURL + "/digimage.jsp?"
+                
         return msg+"\n\nfixed all zogilib instances in: "+obj.title
 
           
@@ -1142,9 +1157,9 @@ def manage_addZogiLibForm(self):
     pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/addZogiLibForm')).__of__(self)
     return pt()
 
-def manage_addZogiLib(self,id,title,dlServerURL, localFileBase,version="book",basePath="",dlTarget="digilib",RESPONSE=None):
+def manage_addZogiLib(self,id,title,dlServerURL,layout="book",basePath="",dlTarget="digilib",dlToolbarBaseURL=None,RESPONSE=None):
     """add dgilib"""
-    newObj=zogiLib(id,title,dlServerURL, localFileBase, version, basePath, dlTarget)
+    newObj=zogiLib(id,title,dlServerURL, localFileBase, version, basePath, dlTarget, dlToolbarBaseURL)
     self.Destination()._setObject(id,newObj)
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')