--- cdli/cdli_files.py	2006/07/04 08:47:10	1.31
+++ cdli/cdli_files.py	2006/07/14 14:51:50	1.36
@@ -560,6 +560,7 @@ class CDLIBasketContainer(OrderedFolder)
     security=ClassSecurityInfo()
     meta_type="CDLIBasketContainer"
     
+    security.declareProtected('manage','deleteBaskets')        
     def deleteBaskets(self,ids=None):
         """delete baskets, i.e. move them into trash folder"""
         
@@ -577,6 +578,7 @@ class CDLIBasketContainer(OrderedFolder)
         cut=self.manage_cutObjects(ids)
         trash.manage_pasteObjects(cut)
         
+    security.declareProtected('manage','manageBaskets')       
     def manageBaskets(self,ids,submit,REQUEST=None,RESPONSE=None):
         """manage baskets, delete or copy"""
         if submit=="delete":
@@ -586,6 +588,8 @@ class CDLIBasketContainer(OrderedFolder)
             
         if RESPONSE:
             RESPONSE.redirect(self.absolute_url())
+    
+    security.declareProtected('View','getBasketIdfromName')       
     def getBasketIdfromName(self,basketname):
         """get id from name"""
 
@@ -611,7 +615,7 @@ class CDLIBasketContainer(OrderedFolder)
         return pt(basketId=basketId,basketName=basketName)
    
 
-        
+    security.declareProtected('View','index_html')    
     def index_html(self):
         """stanadard ansicht"""
         
@@ -926,7 +930,9 @@ class CDLIBasketVersion(SimpleItem):
     """version of a basket"""
     
     meta_type="CDLIBasketVersion"
+    security=ClassSecurityInfo()
     
+    security.declareProtected('View','downloadObjectsAsOneFile')
     def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None):
         """download all selected files in one file"""
         
@@ -1017,6 +1023,7 @@ class CDLIBasketVersion(SimpleItem):
         """get Comment"""
         return self.comment
  
+    security.declareProtected('View','index_html')
     def index_html(self):
             """view the basket"""
             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self)
@@ -1377,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")
@@ -1409,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]
@@ -1499,7 +1513,7 @@ class CDLIFileFolder(versionedFileFolder
                         len(getattr(self,self.default_catalog)({'path':folder[0]}))
                         ))
         return ret
-    
+    security.declareProtected('View','index_html')
     def index_html(self):
         """main"""
         ext=self.ZopeFind(self,obj_ids=["index.html"])
@@ -1624,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
@@ -1647,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():
@@ -1709,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
 
         
@@ -1826,4 +1844,3 @@ def manage_addCDLIRoot(self, id, title='
     if REQUEST is not None:
         return self.manage_main(self, REQUEST, update_menu=1)    
  
-