--- cdli/cdli_files.py 2006/03/28 15:10:02 1.13 +++ cdli/cdli_files.py 2006/05/04 14:40:09 1.15 @@ -976,7 +976,10 @@ class CDLIFileFolder(versionedFileFolder return ret - + def checkCatalog(self,fn): + """check if fn is in the catalog""" + + def uploadATF(self,upload,basketId=0,RESPONSE=None): """upload an atf file""" #TODO: add comments @@ -989,6 +992,7 @@ class CDLIFileFolder(versionedFileFolder changed=[] errors=[] newPs=[] + psNotInCatalog=[] basketNameFromFile, numberOfFiles=splitatf(upload,dir) if basketId == '0': @@ -1005,6 +1009,11 @@ class CDLIFileFolder(versionedFileFolder for fn in os.listdir(dir): + + if self.checkCatalog(fn): + psNotInCatalog.append(fn) + + founds=self.CDLICatalog.search({'title':fn}) if len(founds)==0: @@ -1092,6 +1101,8 @@ class CDLIFileFolder(versionedFileFolder def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): """findObjectsFromList (, TAB oder LINE separated)""" + + if upload: # list from file upload txt=upload.read() txt=txt.replace(",","\n") @@ -1117,7 +1128,7 @@ class CDLIFileFolder(versionedFileFolder pt=getattr(self,'filelist.html') return pt(basketName=basketName,numberOfObjects=numberOfObjects) - if list: # got already a list + if list is not None: # got already a list ret=[] for fileId in list: if len(fileId.split("."))==1: @@ -1131,7 +1142,9 @@ class CDLIFileFolder(versionedFileFolder if start: RESPONSE.redirect("filelist.html?start:int="+str(start)) - + + print "nothing" + def createAllFilesAsSingleFile(self,RESPONSE=None): """download all files"""