--- cdli/cdli_files.py 2008/10/15 07:48:05 1.99 +++ cdli/cdli_files.py 2008/10/15 10:00:06 1.101 @@ -231,14 +231,14 @@ class BasketContent(SimpleItem): def getContent(self,filtered=True): """get content""" ret=[] - if filtered: - for x in self.contentList: - if not((x[0] is None) or (x[1] is None)): - ret.append(x) + if filtered: + for x in self.contentList: + if not((x[0] is None) or (x[1] is None)): + ret.append(x) return ret - - else: - return self.contentList + + else: + return self.contentList def allContent(self): """get all content""" @@ -1228,6 +1228,7 @@ class CDLIBasket(Folder,CatalogAware): def swap(x): return (x[1],x[0]) + logging.info("add to basket (%s)"%(repr(ids))) logging.info("add to basket (%s)"%(self.getId())) lastVersion=self.getLastVersion() @@ -1265,7 +1266,9 @@ class CDLIBasket(Folder,CatalogAware): logging.debug("not from store!") 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) added = len(content)-len(oldContent) if not username: