--- cdli/cdli_files.py 2006/03/15 14:56:48 1.9 +++ cdli/cdli_files.py 2006/03/18 01:39:10 1.11 @@ -957,12 +957,10 @@ class CDLIFileFolder(versionedFileFolder uploadFns=[] for fn in uploadFns: - print "UP:",fn founds=self.CDLICatalog.search({'title':fn}) - print " -----",founds if len(founds)>0: self.REQUEST.SESSION['author']=str(self.REQUEST['AUTHENTICATED_USER']) - print "-------- author:",self.REQUEST.SESSION['author'] + founds[0].getObject().manage_addCDLIFileObject('',comment,self.REQUEST.SESSION['author'],file=file(os.path.join(self.REQUEST.SESSION['tmpdir'],fn))) @@ -990,12 +988,12 @@ class CDLIFileFolder(versionedFileFolder founds[0].getObject().lockedBy="" if not (basketname ==''): - basketId=self.basketFolder.getBasketIdfromName(basketname) + basketId=self.basketContainer.getBasketIdfromName(basketname) if not basketId: # create new basket ob=self.basketContainer.addBasket(basketname) basketId=ob.getId() - basket=getattr(self.basketFolder,str(basketId)) + basket=getattr(self.basketContainer,str(basketId)) ids=os.listdir(self.REQUEST.SESSION['tmpdir']) basket.addObjects(ids,deleteOld=True)