--- versionedFile/versionedFile.py	2004/10/19 14:35:07	1.15
+++ versionedFile/versionedFile.py	2004/12/01 09:16:29	1.22
@@ -8,12 +8,21 @@ from Products.PageTemplates.PageTemplate
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 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"""
 
     
@@ -21,25 +30,30 @@ class versionedFileFolder(Folder):
 
     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('Products/versionedFile/zpt/helpDownload').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','helpDownload')).__of__(self)
         return pt()
     
     def generateIndexHTML(self,RESPONSE=None):
         """lege standard index.html an"""
 
-        
 
-        
-        if not hasattr(self,'index.html'):
+        if not self.ZopeFind(self,obj_ids=['index.html']):
             zt=ZopePageTemplate('index.html')
             self._setObject('index.html',zt)
             default_content_fn = os.path.join(package_home(globals()),
@@ -59,8 +73,7 @@ class versionedFileFolder(Folder):
 
         
 
-        
-        if not hasattr(self,'history_template.html'):
+        if not self.ZopeFind(self,obj_ids=['history_template.html']):
             zt=ZopePageTemplate('history_template.html')
             self._setObject('history_template.html',zt)
             default_content_fn = os.path.join(package_home(globals()),
@@ -78,10 +91,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().getTime(),y[1].getLastVersion().getTime)
+            return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime())
 
         def sortAuthor(x,y):
             
@@ -113,12 +126,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()
 
@@ -132,6 +149,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
@@ -188,7 +208,10 @@ class versionedFileObject(File):
         #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()
 
 
@@ -329,7 +352,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):
@@ -402,7 +425,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):