--- cdli/cdli_files.py	2006/06/20 13:13:55	1.30
+++ cdli/cdli_files.py	2006/07/04 08:47:10	1.31
@@ -294,8 +294,8 @@ class uploadATFThread(Thread):
             for found in founds:
                 #analyse the differences to the actual file
                 obj=found.getObject()
-       
-                if (not obj.lockedBy=='') and (not obj.lockedBy==self.username):
+
+                if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))):
                     errors.append(obj)
                 else:
                     data=file(os.path.join(dir,fn)).read()
@@ -689,7 +689,7 @@ class CDLIBasketContainer(OrderedFolder)
             baskets.sort(sortAuthor)
         elif sortField=='comment':
             baskets.sort(sortComment)
-
+        print "got the baskets"
         return baskets
 
 
@@ -963,7 +963,7 @@ class CDLIBasketVersion(SimpleItem):
         for object in self.basketContent:
             
                 if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']):
-                    ret+=object[0].data
+                    ret+=str(object[0].data)
                 
                 if lock and object[1].lockedBy=='':
                     object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']