cdli/cdli_files.py - diff

Return to cdli_files.py CVS log

Up to [Repository] / cdli

version 1.99, 2008/10/15 07:48:05	version 1.100, 2008/10/15 09:54:54
Line 1228 class CDLIBasket(Folder,CatalogAware):	Line 1228 class CDLIBasket(Folder,CatalogAware):
def swap(x):	def swap(x):
return (x[1],x[0])	return (x[1],x[0])

	logging.info("add to basket (%s)"%(repr(ids)))
logging.info("add to basket (%s)"%(self.getId()))	logging.info("add to basket (%s)"%(self.getId()))
lastVersion=self.getLastVersion()	lastVersion=self.getLastVersion()

Line 1265 class CDLIBasket(Folder,CatalogAware):	Line 1266 class CDLIBasket(Folder,CatalogAware):
logging.debug("not from store!")	logging.debug("not from store!")
newContent=Set([(self.getFileObjectLastVersion(x),self.getFileObject(x)) for x in ids])	newContent=Set([(self.getFileObjectLastVersion(x),self.getFileObject(x)) for x in ids])

	#remove all Elements which are not stored
	if (None,None) in newContent:
	newContent.remove((None,None))
content=Set(oldContent).union(newContent)	content=Set(oldContent).union(newContent)
added = len(content)-len(oldContent)	added = len(content)-len(oldContent)
if not username:	if not username: