--- cdli/cdli_files.py 2006/02/15 21:57:39 1.6 +++ cdli/cdli_files.py 2006/02/17 12:10:39 1.7 @@ -407,6 +407,7 @@ class CDLIBasketContainer(OrderedFolder) if fromFileList: + return self.cdli_main.findObjectsFromList(list=self.REQUEST.SESSION['fileIds'],basketName=basket.title,numberOfObjects=added) if RESPONSE: @@ -973,7 +974,7 @@ class CDLIFileFolder(versionedFileFolder RESPONSE.redirect(self.aq_parent.absolute_url()) - def findObjectsFromList(self,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): + 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() @@ -990,10 +991,14 @@ class CDLIFileFolder(versionedFileFolder #self.REQUEST.SESSION['ids']=" OR ".join(ids) pt=getattr(self,'filelist.html') + self.REQUEST.SESSION['searchList']=ids return pt(search=ids) + if basketName: + #TODO: get rid of one of these.. + pt=getattr(self,'filelist.html') - return pt(search=list,basketName=basketName,numberOfObjects=numberOfObjects) + return pt(basketName=basketName,numberOfObjects=numberOfObjects) if list: # got already a list ret=[] @@ -1002,10 +1007,13 @@ class CDLIFileFolder(versionedFileFolder fileId=fileId+".atf" ret+=self.CDLICatalog({'title':fileId}) + #TODO: get rid of one of these.. self.REQUEST.SESSION['fileIds']=[x.getObject().getId() for x in ret]#store fieldIds in session for further usage + self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] return ret - #RESPONSE.redirect("filelist.html?path=%s"%" OR ".join(ids)) + if start: + RESPONSE.redirect("filelist.html?start:int="+str(start)) def createAllFilesAsSingleFile(self,RESPONSE=None): """download all files"""