--- versionedFile/versionedFile.py	2004/07/08 15:15:06	1.6
+++ versionedFile/versionedFile.py	2004/07/08 16:30:53	1.9
@@ -156,7 +156,26 @@ class versionedFileObject(File):
                                Kind='File',kind='file')
     manage_editForm._setName('manage_editForm')
 
+    def download(self):
+        """download and lock"""
+        
+        
+        self.content_type="octet/stream"
+        self.REQUEST.RESPONSE.redirect(self.absolute_url())
+    
+    def downloadLocked(self):
+        """download and lock"""
+        
+        
+        if self.REQUEST['AUTHENTICATED_USER']=='Anonymous User':
+            return "please login first"
+        if not self.aq_parent.lockedBy=="":
+            return "cannot be locked because is already locked by %s"%self.lockedBy
+        self.aq_parent.lockedBy=self.REQUEST['AUTHENTICATED_USER']
 
+        self.content_type="octet/stream"
+        self.REQUEST.RESPONSE.redirect(self.absolute_url())
+    
     def setVersionNumber(self,versionNumber):
         """set version"""
         self.versionNumber=versionNumber
@@ -279,7 +298,7 @@ class versionedFile(Folder):
         ret.sort(sortv)
         return ret
 
-        
+    security.declareProtected('AUTHENTICATED_USER','unlock')   
     def unlock(self,RESPONSE):
         """unlock"""
         if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]:
@@ -288,7 +307,7 @@ class versionedFile(Folder):
         else:
             return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER'])
         
-    security= ClassSecurityInfo()
+    
     security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm')
 
     def addVersionedFileObjectForm(self):
@@ -321,6 +340,11 @@ class versionedFile(Folder):
 
     security.declareProtected('AUTHENTICATED_USER','downloadLocked')
 
+    def download(self):
+        """download and lock"""
+        self.getLastVersion().content_type="application/octet-stream"
+        self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId())
+    
     def downloadLocked(self):
         """download and lock"""
         if self.REQUEST['AUTHENTICATED_USER']=='Anonymous User':
@@ -328,7 +352,7 @@ class versionedFile(Folder):
         if not self.lockedBy=="":
             return "cannot be locked because is already locked by %s"%self.lockedBy
         self.lockedBy=self.REQUEST['AUTHENTICATED_USER']
-        
+        self.getLastVersion().content_type="application/octet-stream"
         self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId())
     
 def manage_addVersionedFileForm(self):