--- cdli/DownloadBasket.py	2008/10/06 10:46:46	1.3
+++ cdli/DownloadBasket.py	2008/10/06 12:26:57	1.4
@@ -96,27 +96,29 @@ class DownloadBasketFinallyThread(Thread
         self.counter=0
         #fh=file("/var/tmp/test","w")
         files=[]
+        lockedFiles=[]
         objects=basketVersion.getContent()
         self.number=len(objects)
+        logging.error("objects:"+repr(self.number))
         for object in objects:
        
                 self.counter+=1
 #                logging.error("ret:"+repr(object[0]))
 #                logging.error("    -"+repr(procedure))
-		try:
+                try:
 	                lockedBy=object[1].lockedBy
-		except:
-			logging.error("no object:"+repr(self.counter))
-			logging.error("no object:"+repr(object))
-			continue
+                except:
+                    logging.error("no object:"+repr(self.counter))
+                    logging.error("no object:"+repr(object))
+                    continue
 			
 #                lockedBy=""
 #                logging.error("    -"+repr(lockedBy))
 #                
                 if (procedure=="downloadAll") or (lockedBy=='') or (lockedBy==user):
-                    #logging.error("ret1")
+                    logging.error("ret1")
                     if current=="no": #version as they are in the basket
-                        #logging.error("ret2")
+                        logging.error("ret2")
                         #object[0].addToFile2("/var/tmp/test2")
                         #ret+=str(object[0].getData())+"\n"
                         files.append(object[0].getFileName())
@@ -132,6 +134,9 @@ class DownloadBasketFinallyThread(Thread
                         #if len(founds)>0:      
                           #  ret+=str(founds[0].getObject().getLastVersion().getData())+"\n"
                       
+                else:
+                    logging.error("ret4")
+                    lockedFiles.append(object[0].getId())
       
                 #if lock and lockedBy=='':
                     #obj=self.ctx.getFileObject(object[1].getId())
@@ -159,6 +164,11 @@ class DownloadBasketFinallyThread(Thread
         if not hasattr(self.ctx,'resultHash'):
             self.ctx.resultHash={}
         self.ctx.resultHash[self.getName()]=files
+        
+        if not hasattr(self.ctx,'resultLockedHash'):
+            self.ctx.resultLockedHash={}
+        self.ctx.resultLockedHash[self.getName()]=lockedFiles
+        
         transaction.get().commit()
         self.conn.close()
         logging.error("---------download thread:run9")