version 1.96, 2008/10/08 14:46:37
|
version 1.99, 2008/10/15 07:48:05
|
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 659 class CDLIBasketContainer(OrderedFolder)
|
Line 670 class CDLIBasketContainer(OrderedFolder)
|
def deleteBaskets(self,ids=None): |
def deleteBaskets(self,ids=None): |
"""delete baskets, i.e. move them into trash folder""" |
"""delete baskets, i.e. move them into trash folder""" |
|
|
|
if ids is None: |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','cdliError_html.zpt')).__of__(self) |
|
txt="Sorry, no basket selected!" |
|
return pt(txt=txt) |
|
|
found=self.ZopeFind(self,obj_ids=['trash']) |
found=self.ZopeFind(self,obj_ids=['trash']) |
|
|
Line 670 class CDLIBasketContainer(OrderedFolder)
|
Line 685 class CDLIBasketContainer(OrderedFolder)
|
|
|
if type(ids) is not ListType: |
if type(ids) is not ListType: |
ids=[ids] |
ids=[ids] |
|
logging.error("XERXON:"+repr(ids)) |
|
if len(ids)==0: |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','cdliError_html.zpt')).__of__(self) |
|
txt="Sorry, no basket selected!" |
|
return pt(txt=txt) |
|
|
cut=self.manage_cutObjects(ids) |
cut=self.manage_cutObjects(ids) |
trash.manage_pasteObjects(cut) |
trash.manage_pasteObjects(cut) |
|
return None |
security.declareProtected('manage','manageBaskets') |
security.declareProtected('manage','manageBaskets') |
def manageBaskets(self,submit,ids=None,basket1="",basket2="",joinBasket="",subtractBasket="",REQUEST=None,RESPONSE=None): |
def manageBaskets(self,submit,ids=None,basket1="",basket2="",joinBasket="",subtractBasket="",REQUEST=None,RESPONSE=None): |
"""manage baskets, delete or copy""" |
"""manage baskets, delete or copy""" |
if submit=="delete": |
if submit=="delete": |
self.deleteBaskets(ids) |
ret= self.deleteBaskets(ids) |
|
if ret: |
|
return ret |
elif submit=="join": |
elif submit=="join": |
flag,msg=self.joinBasket(joinBasket, ids) |
flag,msg=self.joinBasket(joinBasket, ids) |
logging.info("joining %s %s"%(flag,msg)) |
logging.info("joining %s %s"%(flag,msg)) |
|
if not flag: |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','cdliError_html.zpt')).__of__(self) |
|
|
|
return pt(txt=msg) |
|
|
elif submit=="subtract": |
elif submit=="subtract": |
logging.info("BBBb %s %s"%(basket1,basket2)) |
logging.info("BBBb %s %s"%(basket1,basket2)) |
Line 821 class CDLIBasketContainer(OrderedFolder)
|
Line 847 class CDLIBasketContainer(OrderedFolder)
|
@param basket2: see above |
@param basket2: see above |
|
|
""" |
""" |
|
|
logging.info("CCCCC %s %s"%(basket1,basket2)) |
logging.info("CCCCC %s %s"%(basket1,basket2)) |
|
|
try: |
try: |
Line 861 class CDLIBasketContainer(OrderedFolder)
|
Line 888 class CDLIBasketContainer(OrderedFolder)
|
@param newbasket: name of the new basket |
@param newbasket: name of the new basket |
@param oldbaskets: list of baskets to be joined |
@param oldbaskets: list of baskets to be joined |
""" |
""" |
|
if oldBaskets is None: |
|
return False, "No Baskets selected!" |
|
|
try: |
try: |
newB=self.addBasket(newBasket) |
newB=self.addBasket(newBasket) |
except: |
except: |
return False, "cannot create the new basket" |
return False, "cannot create the new basket" |
|
|
newBasketContent={} |
newBasketContent={} |
|
|
for ob in oldBaskets: |
for ob in oldBaskets: |
x= getattr(self,ob,None) |
x= getattr(self,ob,None) |
if x is None: |
if x is None: |
Line 1428 class CDLIBasketVersion(Implicit,Persist
|
Line 1459 class CDLIBasketVersion(Implicit,Persist
|
|
|
self._v_downloadBasket[threadName]=thread |
self._v_downloadBasket[threadName]=thread |
logging.debug("dwonloadfinally:"+repr(self)) |
logging.debug("dwonloadfinally:"+repr(self)) |
|
|
if isinstance(self,CDLIBasketVersion): |
if isinstance(self,CDLIBasketVersion): |
obj=self |
obj=self |
else: |
else: |
Line 1444 class CDLIBasketVersion(Implicit,Persist
|
Line 1476 class CDLIBasketVersion(Implicit,Persist
|
logging.debug("dwonloadfinally2:"+repr(basketID)) |
logging.debug("dwonloadfinally2:"+repr(basketID)) |
logging.debug("dwonloadfinally2:"+repr(versionNumber)) |
logging.debug("dwonloadfinally2:"+repr(versionNumber)) |
|
|
|
|
if lock: |
if lock: |
logging.debug("-----start locking") |
logging.debug("-----start locking") |
for object in self.content.getContent(): |
for object in self.content.getContent(): |