--- cdli/cdli_files.py	2008/10/01 15:58:11	1.87
+++ cdli/cdli_files.py	2008/10/02 11:42:42	1.88
@@ -1428,7 +1428,16 @@ class CDLIBasketVersion(Implicit,Persist
             logging.debug("dwonloadfinally:"+repr(self))
             basketID=self.aq_parent.aq_parent.getId()
             versionNumber=self.aq_parent.getId()
-            self._v_downloadBasket[threadName].set(lock,procedure,REQUEST,current,basketID,versionNumber)
+         
+            if lock:
+                logging.debug("-----start locking")
+                for object in self.content.getContent():
+                         if object[1].lockedBy =='':
+                             object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']
+                logging.debug("-----finished locking")
+                
+                    #obj.lockedBy=user
+            self._v_downloadBasket[threadName].set(lock,procedure,self.REQUEST['AUTHENTICATED_USER'],current,basketID,versionNumber)
 
             self._v_downloadBasket[threadName].start()
 
@@ -1440,7 +1449,9 @@ class CDLIBasketVersion(Implicit,Persist
                 return wait_template[0][1]()
             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadBasketWait.zpt')).__of__(self)
 
-            return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName)
+            return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName,
+                                counter=self._v_downloadBasket[threadName].getCounter(),
+                                number=self._v_downloadBasket[threadName].getNumberOfFiles())
             #_v_xmltrans.run()
         
         else:
@@ -1459,7 +1470,9 @@ class CDLIBasketVersion(Implicit,Persist
                         return wait_template[0][1]()
                 
                 pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadBasketWait.zpt')).__of__(self)
-                return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName)
+                return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName,
+                          counter=self._v_downloadBasket[threadName].getCounter(),
+                          number=self._v_downloadBasket[threadName].getNumberOfFiles())
             else: