--- versionedFile/versionedFile.py	2004/07/26 17:10:49	1.13
+++ versionedFile/versionedFile.py	2004/11/30 09:43:04	1.21
@@ -9,23 +9,46 @@ from Products.PageTemplates.ZopePageTemp
 from AccessControl import ClassSecurityInfo
 import os.path
 
+import time
+try:
+    from Products.ECHO_content.ECHO_collection import ECHO_basis
+except:
+    print "ECHO Elements not imported"
+    class ECHO_basis:
+     """leer"""
+     manage_options=()
 
+	
 def sortv(x,y):
     return cmp(x[0],y[0])
  
-class versionedFileFolder(Folder):
+class versionedFileFolder(Folder,ECHO_basis):
     """Folder with versioned files"""
 
+    
     meta_type = "versionedFileFolder"
 
     security= ClassSecurityInfo()
     security.declareProtected('AUTHENTICATED_USER','addFileForm')
-    
-    manage_options = Folder.manage_options+(
+
+    if ECHO_basis:
+        optTMP= Folder.manage_options+ECHO_basis.manage_options
+    else:
+        optTMP= Folder.manage_options
+
+    manage_options =optTMP+(
 		{'label':'Generate Index.html','action':'generateIndexHTML'},
                 {'label':'Generate history_template.html','action':'generateHistoryHTML'},
-		)
+                )
 
+  
+    
+    def helpDownload(self):
+        """download help"""
+        
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','helpDownload')).__of__(self)
+        return pt()
+    
     def generateIndexHTML(self,RESPONSE=None):
         """lege standard index.html an"""
 
@@ -71,10 +94,10 @@ class versionedFileFolder(Folder):
         """get all versioned files"""
 
         def sortName(x,y):
-            return cmp(x[1].title,y[1].title)
+            return cmp(x[1].title.lower(),y[1].title.lower())
 
         def sortDate(x,y):
-            return cmp(x[1].getLastVersion().bobobase_modification_time,y[1].getLastVersion().bobobase_modification_time)
+            return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime())
 
         def sortAuthor(x,y):
             
@@ -106,12 +129,16 @@ class versionedFileFolder(Folder):
         if ext:
             return ext[0][1]()
         
-        pt=PageTemplateFile('Products/versionedFile/zpt/versionFileFolderMain').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionFileFolderMain')).__of__(self)
         return pt()
 
 
     def addFileForm(self):
         """add a file"""
+        ext=self.ZopeFind(self,obj_ids=["addFileForm.dtml"])
+        if ext:
+            return ext[0][1]('',globals(),version='1',AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER)
+        
         out=DTMLFile('dtml/newFileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version='1').__of__(self)
         return out()
 
@@ -125,6 +152,9 @@ class versionedFileFolder(Folder):
         
         vC=self.REQUEST.form['vC']
         manage_addVersionedFile(self,id,'','')
+        #if (getattr(self,'commentNonEmpty',0)==1) and vC.strip()=="":
+            
+            
         ob=self._getOb(id)
         ob.title=id
         file2=file
@@ -176,6 +206,21 @@ class versionedFileObject(File):
                                Kind='File',kind='file')
     manage_editForm._setName('manage_editForm')
 
+    def getTime(self):
+        """getTime"""
+        #return self.bobobase_modification_time().ISO()
+        if hasattr(self,'time'):
+            return time.strftime("%Y-%m-%d %H:%M:%S",self.time)
+	elif hasattr(self,'timefixed'):
+	    return self.timefixed
+        else:
+	    setattr(self,'timefixed',self.bobobase_modification_time().ISO())
+            return self.bobobase_modification_time().ISO()
+
+
+
+    
+
     def download(self):
         """download and lock"""
         
@@ -239,6 +284,8 @@ 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)
+    self._getOb(id).time=time.localtime()
+    
     setattr(self._getOb(id),'author',author)
     
     # Now we "upload" the data.  By doing this in two steps, we
@@ -263,9 +310,11 @@ class versionedFile(Folder):
         self.title=title
         self.lockedBy=lockedBy
         self.author=author
+      
         
     meta_type="versionedFile"
 
+  
     def getLastVersion(self):
         """Last Version"""
         tmp=0
@@ -284,7 +333,7 @@ class versionedFile(Folder):
         """main view"""
         lastVersion=self.getLastVersion()
         #return "File:"+self.title+"  Version:%i"%lastVersion.versionNumber," modified:",lastVersion.bobobase_modification_time()," size:",lastVersion.getSize(),"modified by:",lastVersion.lastEditor()
-        return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.bobobase_modification_time(),lastVersion.getSize(),lastVersion.lastEditor())
+        return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.getTime(),lastVersion.getSize(),lastVersion.lastEditor())
                                                                          
     def getVersion(self):
         tmp=0
@@ -306,7 +355,7 @@ class versionedFile(Folder):
         if ext:
             return getattr(self,ext[0][1].getId())()
         
-        pt=PageTemplateFile('Products/versionedFile/zpt/versionHistory').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionHistory')).__of__(self)
         return pt()
 
     def getVersions(self):
@@ -379,7 +428,7 @@ class versionedFile(Folder):
     
 def manage_addVersionedFileForm(self):
     """interface for adding the OSAS_root"""
-    pt=PageTemplateFile('Products/versionedFile/zpt/addVersionedFile.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addVersionedFile.zpt')).__of__(self)
     return pt()
 
 def manage_addVersionedFile(self,id,title,lockedBy, author=None, RESPONSE=None):