--- versionedFile/extVersionedFile.py	2007/09/10 16:34:16	1.7
+++ versionedFile/extVersionedFile.py	2007/09/10 19:27:55	1.9
@@ -29,6 +29,7 @@ import os.path
 import urllib
 import time
 import logging
+import types
 
 try:
     from Products.ECHO_content.ECHO_collection import ECHO_basis
@@ -186,18 +187,13 @@ class extVersionedFileFolder(Folder,ECHO
         return pt()
     
     def importFolder(self,path,comment="",author=None,lockedBy=None,RESPONSE=None):
-        """importiere inhalt eines folders"""
-
+        """import contents of a folder on the server"""
         for fileName in os.listdir(path):
-            if os.path.isfile(os.path.join(path,fileName)):
-                manage_addextVersionedFile(self,fileName,'','')
-                id=fileName
-                ob=self._getOb(fileName)
-                ob.title=id
-                file2=file(os.path.join(path,fileName))
+            fn = os.path.join(path,fileName)
+            if os.path.isfile(fn):
+                f = file(fn)
+                self.addFile(vC=comment, file=f, author=author)
         
-                obj=ob.manage_addextVersionedFileObject(id,comment,author,file2,content_type='')
-
         if RESPONSE:
             RESPONSE.redirect(self.REQUEST['URL1'])
 
@@ -216,6 +212,7 @@ class extVersionedFileFolder(Folder,ECHO
         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)
@@ -435,10 +432,18 @@ class extVersionedFileFolder(Folder,ECHO
         return out()
 
 
-    def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None):
+    def addFile(self,vC,file,author='',newName='',content_type='',RESPONSE=None):
         """ add a new file"""
+        # is file is a real file or a zope download object?
+        isRealFile = type(file) is types.FileType
+
         if newName=='':
-            filename=file.filename
+            logging.debug("fileobject: %s real:%s"%(repr(file),repr(isRealFile)))
+            if isRealFile:
+                filename = file.name
+            else:
+                filename=file.filename
+
             id=filename[max(filename.rfind('/'),
                             filename.rfind('\\'),
                             filename.rfind(':'),
@@ -447,24 +452,32 @@ class extVersionedFileFolder(Folder,ECHO
         else:
             id=newName
         
-        vC=self.REQUEST.form['vC']
-        manage_addextVersionedFile(self,id,'','')
+        if not vC:
+            vC=self.REQUEST.form['vC']
+        
+        # get new extVersionedFile
+        vf = self._newVersionedFile(id,title=id)
         #if (getattr(self,'commentNonEmpty',0)==1) and vC.strip()=="":
+        # add file to this folder
+        self._setObject(id,vf)
+        # add its content
+        logging.info("ADD: %s"%repr(vf))
+        obj=vf.addContentObject(id,vC,author=author,file=file,content_type=content_type,from_tmp=isRealFile)
         
-        ob=self._getOb(id)
-        ob.title=id
-        file2=file
-        
-        logging.info("ADD: %s"%repr(ob))
-        obj=ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type)
-        self.REQUEST.SESSION['objID']=ob.getId()
+        self.REQUEST.SESSION['objID']=vf.getId()
         self.REQUEST.SESSION['objID_parent']=None
 
         if obj.getSize()==0:
             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self)
             return pt()
         
-        RESPONSE.redirect(self.REQUEST['URL1'])
+        if RESPONSE is not None:
+            RESPONSE.redirect(self.REQUEST['URL1'])
+
+
+    def _newVersionedFile(self, id, title='', lockedBy=None, author=None):
+        """factory for versioned files. to be overridden in derived classes."""
+        return extVersionedFile(id, title, lockedBy=lockedBy, author=author)
 
 
     def deleteEmptyObject(self,submit,RESPONSE=None):
@@ -486,6 +499,7 @@ class extVersionedFileFolder(Folder,ECHO
         for (id,vf) in self.getVersionedFiles():
             vf.fixVersionNumbers()
         
+
 manage_addextVersionedFileFolderForm=DTMLFile('dtml/extfolderAdd', globals())
 
 
@@ -998,10 +1012,10 @@ class extVersionedFile(CatalogAware,Fold
         self.lastVersionNumber = versNum
         self.lastVersionId = id
         
-        logging.debug("addcontentobject: lastversion=%s"%self.getData())
+        #logging.debug("addcontentobject: lastversion=%s"%self.getData())
         logging.debug("reindex1: %s in %s"%(repr(self),repr(self.default_catalog)))
         self.reindex_object()
-        logging.debug("addcontentobject: fob_data=%s"%fob.getData())
+        #logging.debug("addcontentobject: fob_data=%s"%fob.getData())
         
         return fob