--- cdli/cdli_files.py 2006/08/24 09:04:51 1.42 +++ cdli/cdli_files.py 2006/08/24 09:28:29 1.44 @@ -1309,6 +1309,18 @@ class CDLIFile(versionedFile,CatalogAwar return pt() + def getBasketFromId(self,basketid, context=None): + """get basket from id""" + + if not context: + context=self + + for basket in self.ZopeFind(context,obj_metatypes=["CDLIBasket"]): + if basket[0]==basketid: + return basket[1] + else: + None + def isContainedInBaskets(self,context=None): """check is this file is part of any basket @@ -1892,6 +1904,7 @@ class CDLIRoot(Folder): if (not hasattr(self,'_v_uploadATF')): self._v_uploadATF={} + self._v_uploadATF[threadName]=thread @@ -1945,7 +1958,7 @@ class CDLIRoot(Folder): obj=self.ZopeFind(root,obj_ids=[folder]) if ext: - ext.result+="

Adding: %s

"%f + ext.result+="

adding: %s

"%f if not obj: manage_addCDLIFileFolder(root,folder,folder) fobj=getattr(root,folder)