--- ImageArchive/ImageArchive.py 2005/04/29 09:45:57 1.55 +++ ImageArchive/ImageArchive.py 2005/04/29 15:14:31 1.56 @@ -55,7 +55,7 @@ class generateSet: """generateSetThread""" - def __init__(self,filenames,filenamesIds,ImageViewerPath,ids,url,local=None,version="full"): + def __init__(self,filenames,filenamesIds,ImageViewerPath,ids,url,local=None,version="working"): """init generateSet""" self.filenames=filenames self.filenamesIds=filenamesIds @@ -74,7 +74,7 @@ class generateSet: tempfile.tempdir=tdir tmpPath=tempfile.mktemp() - tmpZip=tempfile.mktemp()+".zip" + tmpZip=tempfile.mktemp()+".gtz" tmpFn=os.path.split(tmpZip)[1] if not os.path.exists(tempfile.tempdir): @@ -98,7 +98,9 @@ class generateSet: self.response+=str("

Get File: %s
\n"%filename) if self.local: + if self.version=="working": + sourcePath="/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg" else: sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0] @@ -128,7 +130,7 @@ class generateSet: try: nr=self.ids.index(id[0]) except: - self.reponse+=str("

Error in File: %s (possible missing)
\n"%id[0]) + self.response+=str("

Error in File: %s (possible missing)
\n"%id[0]) nr=0 @@ -162,10 +164,10 @@ class generateSet: fh.close() self.response+="

2. step: creating the downloadable file

" - self.response+="

Create Zip
" + self.response+="

Create gtar
" self.response+="

This can take a while....
\n" - fh=os.popen2("zip -u %s %s/*"%(tmpZip,tmpPath),1)[1] + fh=os.popen2("gnutar zcvf %s %s/*"%(tmpZip,tmpPath),1)[1] self.response+="
" for c in fh.read(): self.response+=c @@ -599,7 +601,7 @@ class ImageCollection(Folder, Persistent filename=os.path.join(tdir,fn) - self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"image.zip") + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"image.tgz") self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") len=os.stat(filename)[6] self.REQUEST.RESPONSE.setHeader("Content-Length",len)