--- cdli/cdli_files.py 2006/07/25 07:51:49 1.40 +++ cdli/cdli_files.py 2006/08/24 09:28:29 1.44 @@ -173,7 +173,7 @@ class uploadATFfinallyThread(Thread): #if a basketname is give, add files to the basket if not (basketname ==''): self.result+="

Add basket

" - basketId=ctx2.basketContainer.ketIdfromName(basketname) + basketId=ctx2.basketContainer.getBasketIdfromName(basketname) if not basketId: # create new basket ob=ctx2.basketContainer.addBasket(basketname) @@ -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 @@ -1785,7 +1797,13 @@ class CDLIRoot(Folder): def checkThreads(self): """check threads""" - return threading.enumerate() + ret="" + for thread in threading.enumerate(): + ret+="

%s : %s

"%(repr(thread),thread.isAlive()) + + return ret + + def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None): """standard ausgabe""" @@ -1886,6 +1904,7 @@ class CDLIRoot(Folder): if (not hasattr(self,'_v_uploadATF')): self._v_uploadATF={} + self._v_uploadATF[threadName]=thread @@ -1939,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)