--- cdli/cdli_files.py	2006/06/17 15:03:19	1.27
+++ cdli/cdli_files.py	2006/07/04 08:47:10	1.31
@@ -215,7 +215,7 @@ class uploadATFThread(Thread):
         ctx = self.getContext(app,serverport=self.serverport)
         self.uploadATFThread(ctx,self.upload,self.basketId)
      
-        ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue
+        #ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue
 
         get_transaction().commit()
         
@@ -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']
@@ -1054,7 +1054,7 @@ def manage_addCDLIBasketVersion(self,use
     else:
         return ob
     
-class CDLIFileObject(versionedFileObject,CatalogAware):
+class CDLIFileObject(CatalogAware,versionedFileObject):
     """CDLI file object"""
     
     meta_type="CDLI File Object"
@@ -1065,6 +1065,10 @@ class CDLIFileObject(versionedFileObject
  
     security.declarePublic('makeThisVersionCurrent')
     
+    def PrincipiaSearchSource(self):
+           """Return cataloguable key for ourselves."""
+           return str(self)
+       
     def makeThisVersionCurrent_html(self):
         """form for making this version current"""
         
@@ -1669,19 +1673,33 @@ class CDLIRoot(Folder):
 #                                       tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:]
 #                        else:
 #                                       tmp[key]=self._v_uploadATF[threadName].returnValue[key]
-              
-                tmp=self.cdli_main.tmpStore2[threadName]
-                del(self.cdli_main.tmpStore2[threadName])
-                self._v_uploadATF[threadName].continueVar=False
+#                        print repr(tmp[key]),repr(key)
+#                                       
+#                #
+                #tmp=self.cdli_main.tmpStore2[threadName]
+                tmp=self._v_uploadATF[threadName].returnValue
+                
+                #self._v_uploadATF[threadName].continueVar=False
+                
                 self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']]
                 self.REQUEST.SESSION['errors']=[x.getId() for x in tmp['errors']]
                 self.REQUEST.SESSION['newPs']=tmp['newPs']
                 self.REQUEST.SESSION['tmpdir']=tmp['dir']
-      
+                #del(self.cdli_main.tmpStore2[threadName])
+                print "here the templates"
+               
                 pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
+                print "init p"
                 return pt(changed=tmp['changed'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],
                   basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])
-                                       
+                     
+    def redoUpload(self,threadName):
+       """redo the upload"""
+       tmp=self.cdli_main.tmpStore2[threadName]
+       pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
+       return pt(changed=tmp['changed'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],
+                  basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])
+                 
     def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None):
         """nowupload the files"""