version 1.98, 2008/10/13 10:45:02
|
version 1.101, 2008/10/15 10:00:06
|
Line 228 class BasketContent(SimpleItem):
|
Line 228 class BasketContent(SimpleItem):
|
"""content""" |
"""content""" |
self.contentList=content[0:] |
self.contentList=content[0:] |
|
|
def getContent(self): |
def getContent(self,filtered=True): |
"""get content""" |
"""get content""" |
|
ret=[] |
|
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 |
return self.contentList |
|
|
|
def allContent(self): |
|
"""get all content""" |
|
return self.getContent(filtered=False) |
|
|
def setContent(self,content): |
def setContent(self,content): |
self.contentList=content[0:] |
self.contentList=content[0:] |
|
|
Line 1217 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 1254 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: |