--- versionedFile/versionedFile.py 2004/07/27 07:56:21 1.14 +++ versionedFile/versionedFile.py 2004/10/19 14:35:07 1.15 @@ -8,7 +8,7 @@ from Products.PageTemplates.PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo import os.path - +import time def sortv(x,y): return cmp(x[0],y[0]) @@ -81,7 +81,7 @@ class versionedFileFolder(Folder): 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) + return cmp(x[1].getLastVersion().getTime(),y[1].getLastVersion().getTime) def sortAuthor(x,y): @@ -183,6 +183,16 @@ 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) + else: + return self.bobobase_modification_time().ISO() + + + def download(self): @@ -248,6 +258,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 @@ -272,9 +284,11 @@ class versionedFile(Folder): self.title=title self.lockedBy=lockedBy self.author=author + meta_type="versionedFile" + def getLastVersion(self): """Last Version""" tmp=0 @@ -293,7 +307,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