--- versionedFile/versionedFile.py	2006/10/11 10:00:27	1.69
+++ versionedFile/versionedFile.py	2010/02/15 19:09:38	1.73
@@ -1,6 +1,7 @@
 from OFS.Folder import Folder
 from OFS.Image import File
 from OFS.Image import cookId
+from OFS.DTMLDocument import DTMLDocument
 from Globals import DTMLFile, InitializeClass,package_home
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from AccessControl import getSecurityManager
@@ -22,7 +23,7 @@ import shutil
 import tempfile
 import os.path
 import urllib
-
+import logging
 import time
 try:
     from Products.ECHO_content.ECHO_collection import ECHO_basis
@@ -72,7 +73,16 @@ class generateDownloadZip:
 
             savePath=os.path.join(tmpPath,lastV.title)
             fh=file(savePath,"w")
-            fh.write(lastV.data)
+            logging.debug("writing file %1 data in %s"%(lastV.title,savePath))
+            # loop to get OFS.Image.File data
+            data=lastV.data
+            if isinstance(data, str):
+                fh.write(data)
+            else:
+                while data is not None:
+                    fh.write(data.data)
+                    data=data.next
+
             fh.close()
 
         self.response+="<h3>2. step: creating the downloadable file</h3>"
@@ -132,7 +142,8 @@ class versionedFileFolder(Folder,ECHO_ba
                 {'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':'impor<olderForm'},
+                {'label':'Generate addFileForm','action':'generateAddFileForm'},
+                {'label':'Import Folder','action':'importFolderForm'},
                 {'label':'Export Folder','action':'exportFolder'},
                 {'label':'Position of version number','action':'changeHistoryFileNamesForm'},
                 )
@@ -306,11 +317,11 @@ class versionedFileFolder(Folder,ECHO_ba
         """lege standard addfileform an"""
         #TODO: write generateaddfileform only a dummy at them moment
 
-        if not self.ZopeFind(self,obj_ids=['addFileForm.dtml']):
-            zt=ZopePageTemplate('index.html')
-            self._setObject('index.html',zt)
+        if not self.ZopeFind(self,obj_ids=['addFileForm.html']):
+            zt=ZopePageTemplate('addFileForm.html')
+            self._setObject('addFileForm.html',zt)
             default_content_fn = os.path.join(package_home(globals()),
-                                               'zpt/versionFileFolderMain.zpt')
+                                               'zpt/fileAdd_template.zpt')
             text = open(default_content_fn).read()
             zt.pt_edit(text, 'text/html')
 
@@ -422,7 +433,7 @@ class versionedFileFolder(Folder,ECHO_ba
 
 
     def header_html(self):
-        """zusätzlicher header"""
+        """zusaetzlicher header"""
         ext=self.ZopeFind(self,obj_ids=["header.html"])
         if ext:
             return ext[0][1]()
@@ -444,11 +455,13 @@ class versionedFileFolder(Folder,ECHO_ba
 
     def addFileForm(self):
         """add a file"""
-        ext=self.ZopeFind(self,obj_ids=["addFileForm.dtml"])
+        ext=getattr(self,'addFileForm.html',None)
+        logging.error("Found %s"%ext)
         if ext:
-            return ext[0][1]('',globals(),version='1',AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER)
+            out=ext
+        else:
         
-        out=DTMLFile('dtml/newFileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version='1').__of__(self)
+            out=DTMLFile('dtml/newFileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version='1').__of__(self)
         return out()
 
 
@@ -584,7 +597,7 @@ class versionedFileObject(File):
             return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer'])
         return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history")
     
-
+    
     security.declarePublic('getVersionComment')
     def getVersionComment(self):
         """getversioncomment"""
@@ -652,10 +665,6 @@ class versionedFileObject(File):
         """get version"""
         return self.versionNumber
 
-    security.declarePublic('getVersionComment')                                              
-    def getVersionComment(self):
-        """get version"""
-        return self.versionComment
 
    
 
@@ -858,7 +867,20 @@ class versionedFile(CatalogAware,Folder)
                 lastVersion.versionNumber=1
         return lastVersion
     
-    
+    def getVersionNr(self,nr):
+        """Last Version"""
+        tmp=0
+        lastVersion=None
+        
+        
+        for version in self.ZopeFind(self):
+            
+            if hasattr(version[1],'versionNumber'):
+                
+                if int(version[1].versionNumber) ==nr :
+                    return version[1]
+           
+        return None
     def diff(self,data):
         """differenz between lastversion and data"""
         d=Differ()