--- versionedFile/versionedFile.py 2005/11/21 20:05:29 1.53 +++ versionedFile/versionedFile.py 2006/10/11 10:00:27 1.69 @@ -7,8 +7,8 @@ from AccessControl import getSecurityMan from Products.PageTemplates.PageTemplate import PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo - - +from difflib import Differ +from pprint import pprint from Products.ZCatalog.CatalogPathAwareness import CatalogAware try: @@ -29,12 +29,13 @@ try: except: print "ECHO Elements not imported" class ECHO_basis: - """leer""" - manage_options=() + """leer""" + manage_options=() - + def sortv(x,y): return cmp(x[0],y[0]) + tdir = "/tmp/downloadVersionedFiles" class generateDownloadZip: @@ -50,7 +51,7 @@ class generateDownloadZip: def __call__(self): """call generate download zip""" storeTempDir=tempfile.tempdir - tempfile.tempdir=tdir + tempfile.tempdir=tdir tmpPath=tempfile.mktemp() tmpZip=tempfile.mktemp()+".gtz" @@ -60,9 +61,10 @@ class generateDownloadZip: os.mkdir(tempfile.tempdir) if not os.path.exists(tmpPath): - os.mkdir(tmpPath) - - self.response="
Create gtar
"
+ self.response+="
Create gtar
"
self.response+="
This can take a while....
\n"
fh=os.popen2("tar zcvf %s %s/*"%(tmpZip,tmpPath),1)[1]
@@ -83,8 +85,8 @@ class generateDownloadZip:
self.response+=c
if c==")":
self.response+="
\n"
-
-
+
+
shutil.rmtree(tmpPath)
@@ -96,7 +98,7 @@ class generateDownloadZip:
self.response+="""
The file you receive is a tar (gnutar) compressed file, after unpacking you will find a new folder
The file will be stored for a while, you can download it later, the URL is:
-%s?fn=%s\n"""%(tmpFn,downloadUrl,tmpFn) +
%s?fn=%s\n"""%(tmpFn,downloadUrl,tmpFn)
self.done=True
@@ -127,14 +129,15 @@ class versionedFileFolder(Folder,ECHO_ba
optTMP= Folder.manage_options
manage_options =optTMP+(
- {'label':'Generate Index.html','action':'generateIndexHTML'},
+ {'label':'Generate Index.html','action':'generateIndexHTML'},
{'label':'Generate Image Index.html','action':'generateIndexHTML_image'},
{'label':'Generate history_template.html','action':'generateHistoryHTML'},
- {'label':'Import Folder','action':'importFolderForm'},
+ {'label':'Import Folder','action':'impor