--- versionedFile/versionedFile.py	2004/07/08 15:15:06	1.6
+++ versionedFile/versionedFile.py	2004/07/26 17:10:49	1.13
@@ -67,11 +67,28 @@ class versionedFileFolder(Folder):
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
-    def getVersionedFiles(self):
+    def getVersionedFiles(self,sortField='title'):
         """get all versioned files"""
+
+        def sortName(x,y):
+            return cmp(x[1].title,y[1].title)
+
+        def sortDate(x,y):
+            return cmp(x[1].getLastVersion().bobobase_modification_time,y[1].getLastVersion().bobobase_modification_time)
+
+        def sortAuthor(x,y):
+            
+            return cmp(x[1].getLastVersion().lastEditor(),y[1].getLastVersion().lastEditor())
         
 	versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile'])
-       
+
+        if sortField=='title':
+            versionedFiles.sort(sortName)
+        elif sortField=='date':
+            versionedFiles.sort(sortDate)
+        elif sortField=='author':
+            versionedFiles.sort(sortAuthor)
+
         return versionedFiles
 
 
@@ -99,9 +116,12 @@ class versionedFileFolder(Folder):
         return out()
 
 
-    def addFile(self,vC,file,author,content_type='',RESPONSE=None):
+    def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None):
         """ add a new file"""
-        id=file.filename
+        if newName=='':
+            id=file.filename
+        else:
+            id=newName
         
         vC=self.REQUEST.form['vC']
         manage_addVersionedFile(self,id,'','')
@@ -156,7 +176,26 @@ class versionedFileObject(File):
                                Kind='File',kind='file')
     manage_editForm._setName('manage_editForm')
 
+    def download(self):
+        """download and lock"""
+        
+        
+        self.content_type="application/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="application/octet-stream"
+        self.REQUEST.RESPONSE.redirect(self.absolute_url())
+    
     def setVersionNumber(self,versionNumber):
         """set version"""
         self.versionNumber=versionNumber
@@ -279,7 +318,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 +327,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):
@@ -302,7 +341,7 @@ class versionedFile(Folder):
         else:
             return "Sorry file is locked by somebody else"
         
-    def manage_addVersionedFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',RESPONSE=None):
+    def manage_addVersionedFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',newName='', RESPONSE=None):
         """add"""
         
         vC=self.REQUEST['vC']
@@ -311,6 +350,8 @@ class versionedFile(Folder):
         if changeName=="yes":
             self.title=file.filename[0:]
 
+        if not newName=='':
+            self.title=newName[0:]
 
         id="V%i"%self.getVersion()+"_"+self.title
         manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type)
@@ -321,6 +362,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 +374,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):