--- zogiLib/zogiLib.py	2004/07/23 16:01:28	1.38
+++ zogiLib/zogiLib.py	2004/08/25 16:31:28	1.43
@@ -14,7 +14,7 @@ import urllib
 import types
 from Globals import package_home
 
-ZOGIVERSION = "0.9.7 ROC:23.7.2004"
+ZOGIVERSION = "0.9.8 ROC:27.7.2004"
 
 def cropf(f):
     """returns a float with reduced precision"""
@@ -454,8 +454,8 @@ class zogiLib(Folder):
         except:
             return ret
 
-    def formatHTML(self,url,label=None,viewUrl=None):
 
+    def formatHTML(self,url,label=None,viewUrl=None):
 
         sets=xml.dom.minidom.parse(urllib.urlopen(url)).getElementsByTagName('dataset')
         ret=""
@@ -474,6 +474,7 @@ class zogiLib(Folder):
                     ret+="""<tr><td><b>%s:</b></td><td>%s</td></tr>"""%(label,text)
             ret+="</table>"
         return ret
+
     
     def getMetaData(self):
         """getMetaData"""
@@ -521,12 +522,13 @@ class zogiLib(Folder):
                     return self.formatHTML(link+'fn=%s&pn=%s&object=%s'%(fn,pn,ob),label,url)
         return ret
 
+
     def getDLInfo(self):
         """get DLInfo from digilib server"""
         paramH={}
         baseUrl=self.dlServerURL+"/dlInfo-xml.jsp"
         try:
-            url=urllib.urlopen(baseUrl+self.REQUEST['QUERY_STRING'])
+            url=urllib.urlopen(baseUrl+'?'+self.REQUEST['QUERY_STRING'])
             dom=xml.dom.minidom.parse(url)
             params=dom.getElementsByTagName('parameter')
             for param in params:
@@ -757,7 +759,7 @@ class zogiLib(Folder):
         else:
             modes=[]
 
-        self.REQUEST.SESSION['query'] = dlParams
+        self.REQUEST.SESSION['ZogiLibQuery'] = dlParams
         self.REQUEST.SESSION['dlModes'] = modes
         self.REQUEST.SESSION['dlInfo'] = self.getDLInfo()
         if not self.REQUEST.SESSION.has_key('browserType'):
@@ -767,7 +769,7 @@ class zogiLib(Folder):
 
     def checkQuery(self):
 	"""check if the query has been stored"""
-	if not (self.REQUEST.SESSION and self.REQUEST.SESSION.has_key('query')) :
+	if not (self.REQUEST.SESSION and self.REQUEST.SESSION.has_key('ZogiLibQuery')) :
 	    print "ZOGILIB: have to store query!!"
 	    self.storeQuery()
         return
@@ -790,18 +792,18 @@ class zogiLib(Folder):
     def getDLParam(self, param):
         """returns parameter"""
         try:
-            return self.REQUEST.SESSION['query'][param]
+            return self.REQUEST.SESSION['ZogiLibQuery'][param]
         except:
             return
 
     def setDLParam(self, param, value):
         """sets parameter"""
-        self.REQUEST.SESSION['query'][param] = value
+        self.REQUEST.SESSION['ZogiLibQuery'][param] = value
         return
 
     def getAllDLParams(self):
         """parameter string for digilib"""
-        dlParams = self.REQUEST.SESSION['query']
+        dlParams = self.REQUEST.SESSION['ZogiLibQuery']
         # save modes
         modes = self.REQUEST.SESSION['dlModes']
         dlParams['mo'] = string.join(modes, ',')
@@ -1157,9 +1159,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,layout="book",basePath="",dlTarget="digilib",dlToolbarBaseURL=None,RESPONSE=None):
+def manage_addZogiLib(self,id,title,dlServerURL,version="book",basePath="",dlTarget="digilib",dlToolbarBaseURL=None,RESPONSE=None):
     """add dgilib"""
-    newObj=zogiLib(id,title,dlServerURL, localFileBase, version, basePath, dlTarget, dlToolbarBaseURL)
+    newObj=zogiLib(id,title,dlServerURL, version, basePath, dlTarget, dlToolbarBaseURL)
     self.Destination()._setObject(id,newObj)
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')