--- zogiLib/zogiLib.py	2004/06/07 17:56:55	1.26
+++ zogiLib/zogiLib.py	2004/06/22 13:35:50	1.28
@@ -15,6 +15,8 @@ import urllib
 import types
 from Globals import package_home
 
+ZOGIVERSION = "0.9.4 ROC:22.6.2004"
+
 def sendFile(self, filename, type):
     """sends an object or a local file (in the product) as response"""
     paths = filename.split('/')
@@ -424,7 +426,7 @@ class zogiLib(Folder):
             {'label':'Main Config','action':'changeZogiLibForm'},
             )
 
-    def __init__(self, id, title, digilibBaseUrl, localFileBase, version="book", basePath=""):
+    def __init__(self, id, title, digilibBaseUrl, localFileBase, version="book", basePath="", dlTarget=None):
         """init"""
 
         self.id=id
@@ -433,7 +435,14 @@ class zogiLib(Folder):
         self.localFileBase=localFileBase
         self.basePath=basePath
         self.layout=version
+        if dlTarget:
+            self.dlTarget = dlTarget
+        else:
+            self.dlTarget = "digilib"
 
+    def version(self):
+        """version information"""
+        return ZOGIVERSION
 
     def getDLInfo(self):
         """get DLInfo from digilib server"""
@@ -536,9 +545,8 @@ class zogiLib(Folder):
 
 
     def option_js(self):
-        """option_js"""
-        pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/option_js')).__of__(self)
-        return pt()
+        """javascript"""
+        return sendFile(self, 'js/option.js', 'text/plain')
 
     def dl_lib_js(self):
         """javascript"""
@@ -714,9 +722,11 @@ class zogiLib(Folder):
         # assemble query string
         ret = ""
         for param in dlParams.keys():
+            if dlParams[param] == None: continue
             val = str(dlParams[param])
             if val != "":
                 ret += param + "=" + val + "&"
+
         # omit trailing "&"
         return ret.rstrip('&')
 
@@ -979,13 +989,17 @@ class zogiLib(Folder):
         pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/changeZogiLibForm.zpt')).__of__(self)
         return pt()
     
-    def changeZogiLib(self,title,digilibBaseUrl, localFileBase, version, basePath, RESPONSE=None):
+    def changeZogiLib(self,title,digilibBaseUrl, localFileBase, version, basePath, dlTarget, RESPONSE=None):
         """change it"""
         self.title=title
         self.digilibBaseUrl=digilibBaseUrl
         self.localFileBase=localFileBase
         self.basePath = basePath
         self.layout=version
+        if dlTarget:
+            self.dlTarget = dlTarget
+        else:
+            self.dlTarget = "digilib"
 
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -996,9 +1010,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,digilibBaseUrl, localFileBase,version="book",basePath="",RESPONSE=None):
+def manage_addZogiLib(self,id,title,digilibBaseUrl, localFileBase,version="book",basePath="",dlTarget="digilib",RESPONSE=None):
     """add dgilib"""
-    newObj=zogiLib(id,title,digilibBaseUrl, localFileBase, version, basePath)
+    newObj=zogiLib(id,title,digilibBaseUrl, localFileBase, version, basePath, dlTarget)
     self.Destination()._setObject(id,newObj)
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')