--- cdli/cdli_basket.py	2009/06/22 10:48:35	1.3
+++ cdli/cdli_basket.py	2011/07/20 09:33:35	1.6
@@ -136,7 +136,7 @@ class uploadATFfinallyThread(Thread):
         
         self.result=""
         #find context within ZODB
-        from Zope import DB
+        from Zope2 import DB
         conn = DB.open()
         root = conn.root()
         app  = root['Application']
@@ -310,7 +310,7 @@ class uploadATFThread(Thread):
         idTmp=self.idTmp
         self.result=""
         #find context within ZODB
-        from Zope import DB
+        from Zope2 import DB
         conn = DB.open()
         root = conn.root()
         app  = root['Application']
@@ -574,6 +574,21 @@ class CDLIBasketContainer(OrderedFolder)
             None
     
     security.declareProtected('manage','uploadBasket_html')        
+   
+    def uploadBasketAsync_html(self,basketId='0'):
+        """upload an atf file, html form, jetzt aufruf der nicht asyncronen version mit ticktes"""
+        
+
+        basketId=str(basketId)
+        if not basketId=='0':
+            basketName=getattr(self.basketContainer,basketId).title
+        else:
+            basketName=""
+            
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadBasketAsync_html.zpt')).__of__(self)
+        return pt(basketId=basketId,basketName=basketName)
+   
+
             
     def uploadBasket_html(self,basketId='0'):
         """upload an atf file, html form"""
@@ -1123,8 +1138,10 @@ class CDLIBasket(Folder,CatalogAware):
        
         retrieved = self.CDLICache.retrieve(hash)
         if retrieved:
+            logging.debug("add Objects: retrieved")
             newContent=Set(map(swap,retrieved))
         else:
+            logging.debug("add Objects: new")
             newContent=Set([(self.getFileObjectLastVersion(x),self.getFileObject(x)) for x in ids])             
        
      
@@ -1170,9 +1187,9 @@ class CDLIBasket(Folder,CatalogAware):
     def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None):
         """change a basket"""
         if submit=="update":
-            return self.updateObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
+            self.updateObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
         elif submit=="delete":
-            return self.deleteObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
+            self.deleteObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
             
     def deleteObjects(self,ids,RESPONSE=None,REQUEST=None):
         """delete objects"""