--- cdli/cdli_files.py	2006/06/17 15:03:19	1.27
+++ cdli/cdli_files.py	2006/06/18 12:53:56	1.29
@@ -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"""
         
@@ -1662,22 +1666,24 @@ class CDLIRoot(Folder):
                 return pt(txt='/uploadATF',threadName=threadName)
                 
             else:
-#                tmp={}
-#                for key in self._v_uploadATF[threadName].returnValue.keys():
-#                        t=self._v_uploadATF[threadName].returnValue[key]
-#                        if type(t) is ListType:
-#                                       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])
+                tmp={}
+                for key in self._v_uploadATF[threadName].returnValue.keys():
+                        t=self._v_uploadATF[threadName].returnValue[key]
+                        if type(t) is ListType:
+                                       tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:]
+                        else:
+                                       tmp[key]=self._v_uploadATF[threadName].returnValue[key]
+                        print repr(tmp[key]),repr(key)
+                                       
+                #tmp=self.cdli_main.tmpStore2[threadName]
+                
                 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])
                 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'])