--- versionedFile/versionedFile.py 2005/08/15 08:31:52 1.41 +++ versionedFile/versionedFile.py 2005/10/19 11:47:47 1.47 @@ -1,3 +1,4 @@ + from OFS.Folder import Folder from OFS.Image import File from OFS.Image import cookId @@ -7,13 +8,16 @@ from AccessControl import getSecurityMan from Products.PageTemplates.PageTemplate import PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo -from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib +try: + from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib +except: + print "no images" from threading import Thread import shutil import tempfile import os.path - +import urllib import time try: @@ -459,7 +463,7 @@ class versionedFileObject(File): manage_editForm =DTMLFile('dtml/fileEdit',globals(), Kind='File',kind='file') manage_editForm._setName('manage_editForm') - + security= ClassSecurityInfo() def getVComment(self): """get the comment of this file""" @@ -495,7 +499,7 @@ class versionedFileObject(File): return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history") - + security.declarePublic('getTime') def getTime(self): """getTime""" #return self.bobobase_modification_time().ISO() @@ -515,12 +519,16 @@ class versionedFileObject(File): """download and lock""" self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getId()) - self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") self.content_type="application/octet-stream" #self.REQUEST.RESPONSE.redirect(self.absolute_url()) + #txt=urllib.urlopen(self.absolute_url()).read() + #self.REQUEST.RESPONSE.write(txt) self.REQUEST.RESPONSE.write(self.index_html()) - #self.REQUEST.RESPONSE.write("bl") + + + self.REQUEST.close() def downloadLocked(self): @@ -540,12 +548,18 @@ class versionedFileObject(File): """set version""" self.versionNumber=versionNumber + security.declarePublic('getVersionNumber') def getVersionNumber(self): """get version""" return self.versionNumber + security.declarePublic('getVersionComment') + def getVersionComment(self): + """get version""" + return self.versionComment + - + security.declarePublic('lastEditor') def lastEditor(self): """last Editor""" if hasattr(self,'author'): @@ -709,7 +723,8 @@ class versionedFile(Folder): 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.getTime(),lastVersion.getSize(),lastVersion.lastEditor()) - + security= ClassSecurityInfo() + security.declarePublic('getVersion') def getVersion(self): tmp=0 for version in self.ZopeFind(self): @@ -720,7 +735,7 @@ class versionedFile(Folder): tmp=int(version[1].versionNumber,) return tmp+1 - security= ClassSecurityInfo() + security.declareProtected('AUTHENTICATED_USER','unlock') def history(self): @@ -817,7 +832,7 @@ class versionedFile(Folder): """download and lock""" self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getLastVersion().getId()) - self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") self.content_type="application/octet-stream" #self.REQUEST.RESPONSE.write("bl")