--- versionedFile/versionedFile.py 2005/08/15 09:48:35 1.42 +++ versionedFile/versionedFile.py 2005/10/19 11:47:47 1.47 @@ -8,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: @@ -516,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): @@ -825,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")