--- versionedFile/versionedFile.py	2006/10/04 07:35:27	1.68
+++ versionedFile/versionedFile.py	2006/10/11 10:00:27	1.69
@@ -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="<h3>1. step: getting the files</h3>"
+                    os.mkdir(tmpPath) 
+            
+        tempfile.tempdir=storeTempDir
+        self.response="<h3>1. step: getting the files</h3>"
 
         for files in self.folder.ZopeFind(self.folder,obj_metatypes=['versionedFile']):
             lastV=files[1].getLastVersion()
@@ -74,7 +76,7 @@ class generateDownloadZip:
             fh.close()
 
         self.response+="<h3>2. step: creating the downloadable file</h3>"
-	self.response+="<p>Create gtar<br>"
+        self.response+="<p>Create gtar<br>"
         self.response+="<p>This can take a while....<br>\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+="<br>\n"
-		    
-			    
+                    
+                            
 
         
         shutil.rmtree(tmpPath)
@@ -96,7 +98,7 @@ class generateDownloadZip:
         self.response+="""<h1><a href="downloadSet?fn=%s">Click here for download ( %i Byte)</a></h1>\n"""%(tmpFn,len)
         self.response+="""<p>The file you receive is a tar (gnutar) compressed file, after unpacking you will find a new folder <emph>tmp</emph> where the files are stored in.</p>"""
         self.response+="""<p>The file will be stored for a while, you can download it later, the URL is:</p>
-		    <p><a href="downloadSet?fn=%s">%s?fn=%s</a></h1>\n"""%(tmpFn,downloadUrl,tmpFn)
+                    <p><a href="downloadSet?fn=%s">%s?fn=%s</a></h1>\n"""%(tmpFn,downloadUrl,tmpFn)
 
         self.done=True
 
@@ -127,10 +129,10 @@ 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<olderForm'},
                 {'label':'Export Folder','action':'exportFolder'},
                 {'label':'Position of version number','action':'changeHistoryFileNamesForm'},
                 )
@@ -261,19 +263,19 @@ class versionedFileFolder(Folder,ECHO_ba
 ##                     return pt()
 
     def downloadSet(self,fn):
-	    """download prepared set"""
-	    filename=os.path.join(tdir,fn)
+            """download prepared set"""
+            filename=os.path.join(tdir,fn)
 
-	    
-	    self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"downloadFileFolder.tgz")
-	    self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
-	    len=os.stat(filename)[6]
-	    self.REQUEST.RESPONSE.setHeader("Content-Length",len)
-	    images=file(filename).read()
-	    self.REQUEST.RESPONSE.write(images)
-	    self.REQUEST.RESPONSE.close()
+            
+            self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"downloadFileFolder.tgz")
+            self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
+            len=os.stat(filename)[6]
+            self.REQUEST.RESPONSE.setHeader("Content-Length",len)
+            images=file(filename).read()
+            self.REQUEST.RESPONSE.write(images)
+            self.REQUEST.RESPONSE.close()
 
-	
+        
 
     def helpDownload(self):
         """download help"""
@@ -374,12 +376,12 @@ class versionedFileFolder(Folder,ECHO_ba
 
         
             
-	 try:
-	    xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower()
-	 except:
-	    xc='ZZZZZZZZZZZZZ'.lower()
-	 try:
-	    yc=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower()
+         try:
+            xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower()
+         except:
+            xc='ZZZZZZZZZZZZZ'.lower()
+         try:
+            yc=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower()
          except:
             yc='ZZZZZZZZZZZZZ'.lower()
 
@@ -596,7 +598,7 @@ class versionedFileObject(File):
         if hasattr(self,'time'):
             return time.strftime("%Y-%m-%d %H:%M:%S",self.time)
         elif hasattr(self,'timefixed'):
-	        return self.timefixed
+                return self.timefixed
         else:
             setattr(self,'timefixed',self.bobobase_modification_time().ISO())
             return self.bobobase_modification_time().ISO()
@@ -610,18 +612,18 @@ class versionedFileObject(File):
         
         self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getId())
         self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
-	#try:
-	#	txt=self.index_html()
-	#except:
-	#	txt=self.index_html(REQUEST,RESPONSE)
-	#
-	#self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)")
-      	
+        #try:
+        #       txt=self.index_html()
+        #except:
+        #       txt=self.index_html(REQUEST,RESPONSE)
+        #
+        #self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)")
+        
         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.close()
     
@@ -657,7 +659,7 @@ class versionedFileObject(File):
 
    
 
-    security.declarePublic('lastEditor')                                              	
+    security.declarePublic('lastEditor')                                                
 
     def lastEditor(self):
         """last Editor"""
@@ -861,19 +863,19 @@ class versionedFile(CatalogAware,Folder)
         """differenz between lastversion and data"""
         d=Differ()
         data=data.rstrip()
-	try:
-	    tmp=self.getLastVersion().data.rstrip()
-	except:
-	    tmp=str(self.getLastVersion().data).rstrip()
+        try:
+            tmp=self.getLastVersion().data.rstrip()
+        except:
+            tmp=str(self.getLastVersion().data).rstrip()
         #print "XX",data,tmp
 
-	try:
-	        l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
+        try:
+                l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
         except:
-		try:
-			l=list(d.compare(repr(data).splitlines(1),tmp.splitlines(1)))
-		except:
-			return 9999,[]
+                try:
+                        l=list(d.compare(repr(data).splitlines(1),tmp.splitlines(1)))
+                except:
+                        return 9999,[]
 
         plus=0
         minus=0
@@ -1032,13 +1034,13 @@ class versionedFile(CatalogAware,Folder)
         self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getLastVersion().getId())
         self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
       
-	#try:	
-	#	txt=self.getLastVersion.index_html()
-	#except:
-	#	txt=self.getLastVersion.index_html(REQUEST,RESPONSE)
+        #try:   
+        #       txt=self.getLastVersion.index_html()
+        #except:
+        #       txt=self.getLastVersion.index_html(REQUEST,RESPONSE)
 
-	#self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)")
-      	
+        #self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)")
+        
         self.content_type="application/octet-stream"
         #self.REQUEST.RESPONSE.write("bl")
         #self.REQUEST.RESPONSE.write(txt)
@@ -1074,4 +1076,4 @@ def manage_addVersionedFile(self,id,titl
 
 
 InitializeClass(versionedFile)
-InitializeClass(versionedFileFolder)
\ No newline at end of file
+InitializeClass(versionedFileFolder)