--- versionedFile/versionedFile.py	2005/06/21 08:56:04	1.36
+++ versionedFile/versionedFile.py	2005/06/21 14:12:35	1.37
@@ -25,7 +25,7 @@ except:
 	
 def sortv(x,y):
     return cmp(x[0],y[0])
-tdir = "/tmp/testia"
+tdir = "/tmp/downloadVersionedFiles"
 
 class generateDownloadZip:
     """generateDownloadSet"""
@@ -52,7 +52,7 @@ class generateDownloadZip:
         if not os.path.exists(tmpPath):
 		    os.mkdir(tmpPath) 
 	    
-	self.response="<h3>1. step: gettung the files</h3>"
+	self.response="<h3>1. step: getting the files</h3>"
 
         for files in self.folder.ZopeFind(self.folder,obj_metatypes=['versionedFile']):
             lastV=files[1].getLastVersion()
@@ -156,48 +156,50 @@ class versionedFileFolder(Folder,ECHO_ba
         """exportiert alle akutellen files des folders"""
         threadName=repeat
         
-                       
-        if not threadName or threadName=="":
-            threadStart=generateDownloadZip(self,self.absolute_url())
-            thread=Thread(target=threadStart)
+        downloadZip=generateDownloadZip(self,self.absolute_url())
+        downloadZip()
+        return downloadZip.getResult()
+       ##  if not threadName or threadName=="":
+##             threadStart=generateDownloadZip(self,self.absolute_url())
+##             thread=Thread(target=threadStart)
             
-            thread.start()
+##             thread.start()
 
                     
-            self.zipThreads[thread.getName()[0:]]=threadStart
-            self.zipThreads2[thread.getName()[0:]]=thread
-            self.REQUEST.SESSION['threadName']=thread.getName()[0:]
-            wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['zip_wait_template'])
-            if wait_template:
-                return wait_template[0][1]()
-            pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait.zpt')).__of__(self)
-            return pt()
+##             self.zipThreads[thread.getName()[0:]]=threadStart
+##             self.zipThreads2[thread.getName()[0:]]=thread
+##             self.REQUEST.SESSION['threadName']=thread.getName()[0:]
+##             wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['zip_wait_template'])
+##             if wait_template:
+##                 return wait_template[0][1]()
+##             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait.zpt')).__of__(self)
+##             return pt()
                 
-        else:
-            self.REQUEST.SESSION['threadName']=threadName
+##         else:
+##             self.REQUEST.SESSION['threadName']=threadName
 
-            if (self.zipThreads[threadName].getResult()==None):
+##             if (self.zipThreads[threadName].getResult()==None):
 
-                wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
-                if wait_template:
-                    return wait_template[0][1]()
-
-                pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait.zpt')).__of__(self)
-                return pt()
-            else:
-                if self.zipThreads[threadName].isDone():
-                    self.REQUEST.SESSION['result']=self.zipThreads[threadName].getResult()
-                    self.zipThreads2[threadName].join()
-                    del(self.zipThreads2[threadName])
-                    del(self.zipThreads[threadName])
-                    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_result.zpt')).__of__(self)
-                    return pt()
-
-                else:
-                    self.REQUEST.SESSION['result']=self.zipThreads[threadName].getResult()
-                    self.REQUEST.SESSION['threadName']=threadName
-                    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait_result.zpt')).__of__(self)
-                    return pt()
+##                 wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
+##                 if wait_template:
+##                     return wait_template[0][1]()
+
+##                 pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait.zpt')).__of__(self)
+##                 return pt()
+##             else:
+##                 if self.zipThreads[threadName].isDone():
+##                     self.REQUEST.SESSION['result']=self.zipThreads[threadName].getResult()
+##                     self.zipThreads2[threadName].join()
+##                     del(self.zipThreads2[threadName])
+##                     del(self.zipThreads[threadName])
+##                     pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_result.zpt')).__of__(self)
+##                     return pt()
+
+##                 else:
+##                     self.REQUEST.SESSION['result']=self.zipThreads[threadName].getResult()
+##                     self.REQUEST.SESSION['threadName']=threadName
+##                     pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait_result.zpt')).__of__(self)
+##                     return pt()
 
     def downloadSet(self,fn):
 	    """download prepared set"""