--- versionedFile/versionedFile.py	2004/06/04 08:10:26	1.4
+++ versionedFile/versionedFile.py	2004/07/05 11:24:01	1.5
@@ -1,11 +1,14 @@
 from OFS.Folder import Folder
 from OFS.Image import File
 from OFS.Image import cookId
-from Globals import DTMLFile, InitializeClass
+from Globals import DTMLFile, InitializeClass,package_home
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from AccessControl import getSecurityManager
 from Products.PageTemplates.PageTemplate import PageTemplate
+from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from AccessControl import ClassSecurityInfo
+import os.path
+
 
 def sortv(x,y):
     return cmp(x[0],y[0])
@@ -18,6 +21,31 @@ class versionedFileFolder(Folder):
     security= ClassSecurityInfo()
     security.declareProtected('AUTHENTICATED_USER','addFileForm')
     
+    manage_options = Folder.manage_options+(
+		{'label':'Generate Index.html','action':'generateIndexHTML'},
+		)
+
+    def generateIndexHTML(self,RESPONSE=None):
+        """lege standard index.html an"""
+
+        
+
+        
+        if not hasattr(self,'index.html'):
+            zt=ZopePageTemplate('index.html')
+            self._setObject('index.html',zt)
+            default_content_fn = os.path.join(package_home(globals()),
+                                               'zpt/versionFileFolderMain.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"""
         
@@ -38,7 +66,7 @@ class versionedFileFolder(Folder):
         """main"""
         ext=self.ZopeFind(self,obj_ids=["index.html"])
         if ext:
-            return ext[0]
+            return ext[0][1]()
         
         pt=PageTemplateFile('Products/versionedFile/zpt/versionFileFolderMain').__of__(self)
         return pt()
@@ -50,7 +78,7 @@ class versionedFileFolder(Folder):
         return out()
 
 
-    def addFile(self,vC,file,content_type='',RESPONSE=None):
+    def addFile(self,vC,file,author,content_type='',RESPONSE=None):
         """ add a new file"""
         id=file.filename
         
@@ -59,7 +87,7 @@ class versionedFileFolder(Folder):
         ob=self._getOb(id)
         ob.title=id
         file2=file
-        ob.manage_addVersionedFileObject(id,vC,file2,content_type=content_type)
+        ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type)
 
         RESPONSE.redirect(self.REQUEST['URL1'])
 
@@ -118,22 +146,27 @@ class versionedFileObject(File):
 
     def lastEditor(self):
         """last Editor"""
-        jar=self._p_jar
-        oid=self._p_oid
-        if jar is None or oid is None: return None
-        return jar.db().history(oid)[0]['user_name']
+        if hasattr(self,'author'):
+            return self.author            
+        else:
+            jar=self._p_jar
+            oid=self._p_oid
+
+            if jar is None or oid is None: return None
+
+            return jar.db().history(oid)[0]['user_name']
 
     
     
         
 manage_addVersionedFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject', version='1')
 
-def manage_addVersionedFileObject(self,id,vC='',file='',title='',precondition='', content_type='',
+def manage_addVersionedFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='',
                    REQUEST=None):
     """Add a new File object.
 
     Creates a new File object 'id' with the contents of 'file'"""
-    
+
     id=str(id)
     title=str(title)
     content_type=str(content_type)
@@ -146,6 +179,7 @@ def manage_addVersionedFileObject(self,i
     # First, we create the file without data:
     self._setObject(id, versionedFileObject(id,title,'',content_type, precondition))
     self._getOb(id).versionComment=str(vC)
+    setattr(self._getOb(id),'author',author)
     
     # Now we "upload" the data.  By doing this in two steps, we
     # can use a database trick to make the upload more efficient.
@@ -163,11 +197,12 @@ def manage_addVersionedFileObject(self,i
 class versionedFile(Folder):
     """Versioniertes File"""
 
-    def __init__(self, id, title, lockedBy):
+    def __init__(self, id, title, lockedBy,author):
         """init"""
         self.id=id
         self.title=title
         self.lockedBy=lockedBy
+        self.author=author
         
     meta_type="versionedFile"
 
@@ -241,12 +276,13 @@ class versionedFile(Folder):
         else:
             return "Sorry file is locked by somebody else"
         
-    def manage_addVersionedFileObject(self,id,vC,file='',title='',precondition='', content_type='',RESPONSE=None):
+    def manage_addVersionedFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',RESPONSE=None):
         """add"""
         
         vC=self.REQUEST['vC']
+        author=self.REQUEST['author']
         id="V%i"%self.getVersion()+"_"+self.title
-        manage_addVersionedFileObject(self,id,vC,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type)
+        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()))
 
         if RESPONSE:
@@ -269,10 +305,11 @@ def manage_addVersionedFileForm(self):
     pt=PageTemplateFile('Products/versionedFile/zpt/addVersionedFile.zpt').__of__(self)
     return pt()
 
-def manage_addVersionedFile(self,id,title,lockedBy, RESPONSE=None):
+def manage_addVersionedFile(self,id,title,lockedBy, author=None, RESPONSE=None):
     """add the OSAS_root"""
-    newObj=versionedFile(id,title,lockedBy)
+    newObj=versionedFile(id,title,lockedBy,author)
     self._setObject(id,newObj)
+   
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')