[BACK]Return to cdli_files.py CVS log [TXT] [DIR] Up to [Repository] / cdli

Diff for /cdli/cdli_files.py between versions 1.6 and 1.7

version 1.6, 2006/02/15 21:57:39 version 1.7, 2006/02/17 12:10:39
Line 407  class CDLIBasketContainer(OrderedFolder) Line 407  class CDLIBasketContainer(OrderedFolder)
                   
                   
         if fromFileList:          if fromFileList:
   
             return self.cdli_main.findObjectsFromList(list=self.REQUEST.SESSION['fileIds'],basketName=basket.title,numberOfObjects=added)              return self.cdli_main.findObjectsFromList(list=self.REQUEST.SESSION['fileIds'],basketName=basket.title,numberOfObjects=added)
                 
         if RESPONSE:          if RESPONSE:
Line 973  class CDLIFileFolder(versionedFileFolder Line 974  class CDLIFileFolder(versionedFileFolder
             RESPONSE.redirect(self.aq_parent.absolute_url())              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)"""          """findObjectsFromList (, TAB oder LINE separated)"""
         if upload: # list from file upload          if upload: # list from file upload
             txt=upload.read()              txt=upload.read()
Line 990  class CDLIFileFolder(versionedFileFolder Line 991  class CDLIFileFolder(versionedFileFolder
             #self.REQUEST.SESSION['ids']=" OR ".join(ids)              #self.REQUEST.SESSION['ids']=" OR ".join(ids)
                           
             pt=getattr(self,'filelist.html')              pt=getattr(self,'filelist.html')
               self.REQUEST.SESSION['searchList']=ids
             return pt(search=ids)              return pt(search=ids)
           
         if basketName:          if basketName:
               #TODO: get rid of one of these..
               
             pt=getattr(self,'filelist.html')              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          if list: # got already a list
             ret=[]              ret=[]
Line 1002  class CDLIFileFolder(versionedFileFolder Line 1007  class CDLIFileFolder(versionedFileFolder
                         fileId=fileId+".atf"                          fileId=fileId+".atf"
                                                   
                 ret+=self.CDLICatalog({'title':fileId})                  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['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              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):      def createAllFilesAsSingleFile(self,RESPONSE=None):
         """download all files"""          """download all files"""
Removed from v.1.6  
changed lines
  Added in v.1.7

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>