--- ECHO_content/ECHO_collection.py 2008/12/17 12:12:26 1.301 +++ ECHO_content/ECHO_collection.py 2009/02/02 15:08:58 1.302 @@ -1,4 +1,4 @@ -"""New version of the product started February, 8th. Without scientific classification, use content-type for further classification.""" +"""New version of the produc started February, 8th. Without scientific classification, use content-type for further classification.""" """Echo collection provides the classes for the ECHO content web-site. class ECHO_collection is the basis class for an ECHO collection. @@ -106,6 +106,7 @@ def setECHO_collectionInformation(self,t self.weight=weight import ECHO_resource +from ECHO_resource import manage_addECHO_resource class ECHO_resource(ECHO_resource.ECHO_resource): """depricated use class in ECHO_resource.py""" @@ -721,7 +722,7 @@ class ECHO_collection(CatalogAware, Fold ret=None for name in zf.namelist(): - fn=tempfile.mkstemp()[1] + ds,fn=tempfile.mkstemp() tf=file(fn,"w") x=zf.read(name) tf.write(x) @@ -732,8 +733,10 @@ class ECHO_collection(CatalogAware, Fold if not ret: ret="" ret+="Cannot import: %s (Already existing?)
"%name + os.close(ds) os.remove(fn) + zf.close() if ret: return """%s"""%ret if RESPONSE: