--- cdli/cdli_files.py	2008/10/09 07:44:46	1.97
+++ cdli/cdli_files.py	2008/10/13 10:45:02	1.98
@@ -659,6 +659,10 @@ class CDLIBasketContainer(OrderedFolder)
     def deleteBaskets(self,ids=None):
         """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'])
         
@@ -670,19 +674,30 @@ class CDLIBasketContainer(OrderedFolder)
         
         if type(ids) is not ListType:
             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)
         trash.manage_pasteObjects(cut)
-        
+        return None
     security.declareProtected('manage','manageBaskets')       
     def manageBaskets(self,submit,ids=None,basket1="",basket2="",joinBasket="",subtractBasket="",REQUEST=None,RESPONSE=None):
         """manage baskets, delete or copy"""
         if submit=="delete":
-            self.deleteBaskets(ids)
-        
+            ret= self.deleteBaskets(ids)
+            if ret:
+                return ret
         elif submit=="join":
             flag,msg=self.joinBasket(joinBasket, ids)
             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":
             logging.info("BBBb %s %s"%(basket1,basket2))
             flag,msg=self.subtractBasket(subtractBasket, basket1,basket2)
@@ -821,6 +836,7 @@ class CDLIBasketContainer(OrderedFolder)
         @param basket2: see above
       
         """
+        
         logging.info("CCCCC %s %s"%(basket1,basket2))
    
         try:
@@ -861,12 +877,16 @@ class CDLIBasketContainer(OrderedFolder)
         @param newbasket: name of the new basket
         @param oldbaskets: list of baskets to be joined
         """
+        if oldBaskets is None:
+            return False, "No Baskets selected!"
+        
         try:
             newB=self.addBasket(newBasket)
         except:
             return False, "cannot create the new basket"
         
         newBasketContent={}
+     
         for ob in oldBaskets:
             x= getattr(self,ob,None)
             if x is None: