--- cdli/cdli_files.py	2008/09/26 16:03:30	1.85
+++ cdli/cdli_files.py	2008/09/29 12:37:37	1.86
@@ -1363,7 +1363,7 @@ class CDLIBasketVersion(Implicit,Persist
     security.declareProtected('manage','downloadObjectsAsOneFile')
     def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"):
         """download all selected files in one file"""
-        
+       
         if self.temp_folder.downloadCounterBaskets > 10000:
             return """I am sorry, currently the server has to many requests for downloads, please come back later!"""
 
@@ -1379,7 +1379,7 @@ class CDLIBasketVersion(Implicit,Persist
         
     def downloadObjectsAsOneFileFinally(self,lock=None,procedure=None,REQUEST=None,current="no"):
         """print do the download"""
-
+        logging.debug("HIHHHH")
         ret=""
         lockedObjects={}
 
@@ -1444,8 +1444,14 @@ class CDLIBasketVersion(Implicit,Persist
                             
                 if lock and object[1].lockedBy=='':
                     object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']
-        basket_name=self.aq_parent.title+"_V"+self.getId()
         
+        if (not isinstance(self.aq_parent,CDLIBasket)):
+            basket_name=self.aq_parent.aq_parent.title+"_V"+self.getId()
+        else:
+            basket_name=self.aq_parent.title+"_V"+self.getId()
+        
+        
+    
         #write basketname to header of atf file
         ret="#basket: %s\n"%basket_name+ret
 
@@ -2226,6 +2232,56 @@ class CDLIRoot(Folder):
                 'graphemes':cdliSplitter.graphemeSplitter()}
     
     
+    def viewATF(self,id,RESPONSE):
+        """view an Object"""
+        ob = self.CDLICatalog({'title':id})
+        logging.debug(ob[0].getObject().getLastVersion().absolute_url()+"/view")
+        if len(ob)>0:
+            RESPONSE.redirect(ob[0].getObject().getLastVersion().absolute_url()+"/view")
+        return "not found"
+    
+    def history(self,id,RESPONSE):
+        """view an Object"""
+        ob = self.CDLICatalog({'title':id})
+        if len(ob)>0:
+            RESPONSE.redirect(ob[0].absolute_url+"/history")
+        return "not found"
+    
+
+    def downloadLocked(self,id,RESPONSE):
+        """view an Object"""
+        ob = self.CDLICatalog({'title':id})
+        if len(ob)>0:
+            RESPONSE.redirect(ob[0].absolute_url+"/downloadLocked")
+        return "not found"
+    
+    def download(self,id,RESPONSE):
+        """view an Object"""
+        ob = self.CDLICatalog({'title':id})
+        if len(ob)>0:
+            RESPONSE.redirect(ob[0].getLastVersion().absolute_url())
+        return "not found"
+    def addCDLIFileObjectForm(self,id,RESPONSE):
+        """view an Object"""
+        ob = self.CDLICatalog({'title':id})
+        if len(ob)>0:
+            RESPONSE.redirect(ob[0].absolute_url+"/addCDLIFileObjectForm")
+        return "not found"
+    
+    def addVersionedFileObjectForm(self,id,RESPONSE):
+        """view an Object"""
+        ob = self.CDLICatalog({'title':id})
+        if len(ob)>0:
+            RESPONSE.redirect(ob[0].absolute_url+"/addVersionedFileObjectForm")
+        return "not found"
+    
+    def unlock(self,id,RESPONSE):
+        """view an Object"""
+        ob = self.CDLICatalog({'title':id})
+        if len(ob)>0:
+            RESPONSE.redirect(ob[0].absolute_url+"/unlock")
+        return "not found"
+    
     def getFileObject(self,fileId):
         """get an object"""
         x=self.v_files.get(fileId)