--- versionedFile/versionedFile.py	2004/11/24 17:02:56	1.20
+++ versionedFile/versionedFile.py	2005/01/12 14:04:52	1.24
@@ -52,10 +52,8 @@ class versionedFileFolder(Folder,ECHO_ba
     def generateIndexHTML(self,RESPONSE=None):
         """lege standard index.html an"""
 
-        
 
-        
-        if not hasattr(self,'index.html'):
+        if not self.ZopeFind(self,obj_ids=['index.html']):
             zt=ZopePageTemplate('index.html')
             self._setObject('index.html',zt)
             default_content_fn = os.path.join(package_home(globals()),
@@ -75,8 +73,7 @@ class versionedFileFolder(Folder,ECHO_ba
 
         
 
-        
-        if not hasattr(self,'history_template.html'):
+        if not self.ZopeFind(self,obj_ids=['history_template.html']):
             zt=ZopePageTemplate('history_template.html')
             self._setObject('history_template.html',zt)
             default_content_fn = os.path.join(package_home(globals()),
@@ -135,6 +132,10 @@ class versionedFileFolder(Folder,ECHO_ba
 
     def addFileForm(self):
         """add a file"""
+        ext=self.ZopeFind(self,obj_ids=["addFileForm.dtml"])
+        if ext:
+            return ext[0][1]('',globals(),version='1',AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER)
+        
         out=DTMLFile('dtml/newFileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version='1').__of__(self)
         return out()
 
@@ -142,17 +143,30 @@ class versionedFileFolder(Folder,ECHO_ba
     def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None):
         """ add a new file"""
         if newName=='':
-            id=file.filename
+            filename=file.filename
+            id=filename[max(filename.rfind('/'),
+                                    filename.rfind('\\'),
+                                    filename.rfind(':'),
+                                    )+1:]
+v
         else:
             id=newName
         
         vC=self.REQUEST.form['vC']
         manage_addVersionedFile(self,id,'','')
+        #if (getattr(self,'commentNonEmpty',0)==1) and vC.strip()=="":
+            
+            
         ob=self._getOb(id)
         ob.title=id
         file2=file
-        ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type)
+        
+        obj=ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type)
 
+        if obj.getSize()==0:
+            pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self)
+            return pt()
+        
         RESPONSE.redirect(self.REQUEST['URL1'])
 
         
@@ -390,18 +404,33 @@ class versionedFile(Folder):
         author=self.REQUEST['author']
         
         if changeName=="yes":
-            self.title=file.filename[0:]
+            filename=file.filename
+            self.title=filename[max(filename.rfind('/'),
+                        filename.rfind('\\'),
+                        filename.rfind(':'),
+                        )+1:]
+
 
         if not newName=='':
             self.title=newName[0:]
 
         id="V%i"%self.getVersion()+"_"+self.title
+        
         manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type)
         objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion()))
 
+
         if RESPONSE:
-            RESPONSE.redirect(self.REQUEST['URL2'])
+            if self.ZopeFind(self,obj_ids=[id])[0][1].getSize()==0:
+                pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self)
+                return pt()
+
+            else:
+                RESPONSE.redirect(self.REQUEST['URL2'])
 
+        else:
+            return self.ZopeFind(self,obj_ids=[id])[0][1]
+        
     security.declareProtected('AUTHENTICATED_USER','downloadLocked')
 
     def download(self):