Diff for /cdli/cdli_basket.py between versions 1.5 and 1.6

version 1.5, 2011/07/19 12:43:26 version 1.6, 2011/07/20 09:33:35
Line 1138  class CDLIBasket(Folder,CatalogAware): Line 1138  class CDLIBasket(Folder,CatalogAware):
                 
         retrieved = self.CDLICache.retrieve(hash)          retrieved = self.CDLICache.retrieve(hash)
         if retrieved:          if retrieved:
               logging.debug("add Objects: retrieved")
             newContent=Set(map(swap,retrieved))              newContent=Set(map(swap,retrieved))
         else:          else:
               logging.debug("add Objects: new")
             newContent=Set([(self.getFileObjectLastVersion(x),self.getFileObject(x)) for x in ids])                           newContent=Set([(self.getFileObjectLastVersion(x),self.getFileObject(x)) for x in ids])             
                 
             
Line 1185  class CDLIBasket(Folder,CatalogAware): Line 1187  class CDLIBasket(Folder,CatalogAware):
     def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None):      def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None):
         """change a basket"""          """change a basket"""
         if submit=="update":          if submit=="update":
             return self.updateObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)              self.updateObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
         elif submit=="delete":          elif submit=="delete":
             return self.deleteObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)              self.deleteObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
                           
     def deleteObjects(self,ids,RESPONSE=None,REQUEST=None):      def deleteObjects(self,ids,RESPONSE=None,REQUEST=None):
         """delete objects"""          """delete objects"""

Removed from v.1.5  
changed lines
  Added in v.1.6


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