--- cdli/cdli_files.py	2006/07/04 11:54:08	1.33
+++ cdli/cdli_files.py	2006/07/14 14:51:50	1.36
@@ -1384,12 +1384,17 @@ class CDLIFileFolder(versionedFileFolder
     
     
             
-    def findObjectsFromList(self,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
+    def findObjectsFromList(self,enterList=None,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
         """findObjectsFromList (, TAB oder LINE separated)"""
                                        
         
         if upload: # list from file upload
             txt=upload.read()
+                                       
+        if enterList:
+            txt=enterList
+            
+        if upload or enterList:
             txt=txt.replace(",","\n")
             txt=txt.replace("\t","\n")
             txt=txt.replace("\r","\n")
@@ -1416,9 +1421,11 @@ class CDLIFileFolder(versionedFileFolder
         if list is not None: # got already a list
             ret=[]
             for fileId in list:
-                if len(fileId.split("."))==1:
+                if fileId.find("*"): #check for wildcards
+                        fileId=fileId
+                elif len(fileId.split("."))==1:
                         fileId=fileId+".atf"
-
+                
                 ret+=self.CDLICatalog({'title':fileId})
             #TODO: get rid of one of these..
             ids=[x.getObject().getId() for x in ret]
@@ -1631,7 +1638,7 @@ class CDLIRoot(Folder):
        
             thread=uploadATFThread()
             threadName=thread.getName()[0:]                                
-            if not hasattr(self,'_v_uploadATF'):
+            if (not hasattr(self,'_v_uploadATF')):
                    self._v_uploadATF={}
                                        
             self._v_uploadATF[threadName]=thread
@@ -1654,7 +1661,7 @@ class CDLIRoot(Folder):
             
         else:
             #recover thread, if lost
-            if not hasattr(self,'_v_uploadATF'):
+            if (not hasattr(self,'_v_uploadATF')):
                self._v_uploadATF={}
             if not self._v_uploadATF.get(threadName,None):
                  for thread in threading.enumerate():
@@ -1716,6 +1723,10 @@ class CDLIRoot(Folder):
         if not threadName or threadName=="":
             thread=uploadATFfinallyThread()
             threadName=thread.getName()[0:]
+
+            if (not hasattr(self,'_v_uploadATF')):
+		   		self._v_uploadATF={}
+
             self._v_uploadATF[threadName]=thread