--- versionedFile/versionedFile.py	2004/07/05 11:24:01	1.5
+++ versionedFile/versionedFile.py	2004/07/08 15:55:27	1.7
@@ -23,6 +23,7 @@ class versionedFileFolder(Folder):
     
     manage_options = Folder.manage_options+(
 		{'label':'Generate Index.html','action':'generateIndexHTML'},
+                {'label':'Generate history_template.html','action':'generateHistoryHTML'},
 		)
 
     def generateIndexHTML(self,RESPONSE=None):
@@ -45,7 +46,27 @@ class versionedFileFolder(Folder):
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
+
+    def generateHistoryHTML(self,RESPONSE=None):
+        """lege standard index.html an"""
+
+        
+
         
+        if not hasattr(self,'history_template.html'):
+            zt=ZopePageTemplate('history_template.html')
+            self._setObject('history_template.html',zt)
+            default_content_fn = os.path.join(package_home(globals()),
+                                               'zpt/versionHistory.zpt')
+            text = open(default_content_fn).read()
+            zt.pt_edit(text, 'text/html')
+
+        else:
+            return "already exists!"
+        
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+
     def getVersionedFiles(self):
         """get all versioned files"""
         
@@ -135,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
@@ -240,7 +280,12 @@ class versionedFile(Folder):
     security.declareProtected('AUTHENTICATED_USER','unlock')
 
     def history(self):
-        """history"""
+        """history"""  
+
+        ext=self.ZopeFind(self.aq_parent,obj_ids=["history_template.html"])
+        if ext:
+            return getattr(self,ext[0][1].getId())()
+        
         pt=PageTemplateFile('Products/versionedFile/zpt/versionHistory').__of__(self)
         return pt()
 
@@ -276,11 +321,16 @@ class versionedFile(Folder):
         else:
             return "Sorry file is locked by somebody else"
         
-    def manage_addVersionedFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',RESPONSE=None):
+    def manage_addVersionedFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',RESPONSE=None):
         """add"""
         
         vC=self.REQUEST['vC']
         author=self.REQUEST['author']
+        
+        if changeName=="yes":
+            self.title=file.filename[0:]
+
+
         id="V%i"%self.getVersion()+"_"+self.title
         manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type)
         objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion()))
@@ -290,6 +340,11 @@ class versionedFile(Folder):
 
     security.declareProtected('AUTHENTICATED_USER','downloadLocked')
 
+    def download(self):
+        """download and lock"""
+        self.getLastVersion().content_type="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':
@@ -297,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="octet/stream"
         self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId())
     
 def manage_addVersionedFileForm(self):