--- versionedFile/versionedFile.py	2004/11/30 09:43:04	1.21
+++ versionedFile/versionedFile.py	2005/03/05 12:09:34	1.31
@@ -15,8 +15,8 @@ try:
 except:
     print "ECHO Elements not imported"
     class ECHO_basis:
-     """leer"""
-     manage_options=()
+	     """leer"""
+    	     manage_options=()
 
 	
 def sortv(x,y):
@@ -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()),
@@ -99,9 +96,20 @@ class versionedFileFolder(Folder,ECHO_ba
         def sortDate(x,y):
             return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime())
 
+        def sortComment(x,y):
+	 try:
+	    x=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower()
+	 except:
+	    x='zzzzzzzzzzzzzzzz'
+	 try:
+	    y=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower()
+         except:
+            y='zzzzzzzzzzzzzzzz'
+         return cmp(x,y)
+
         def sortAuthor(x,y):
             
-            return cmp(x[1].getLastVersion().lastEditor(),y[1].getLastVersion().lastEditor())
+            return cmp(x[1].getLastVersion().lastEditor().lower(),y[1].getLastVersion().lastEditor().lower())
         
 	versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile'])
 
@@ -111,6 +119,8 @@ class versionedFileFolder(Folder,ECHO_ba
             versionedFiles.sort(sortDate)
         elif sortField=='author':
             versionedFiles.sort(sortAuthor)
+        elif sortField=='comment':
+            versionedFiles.sort(sortComment)
 
         return versionedFiles
 
@@ -146,7 +156,12 @@ 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:]
+
         else:
             id=newName
         
@@ -158,10 +173,30 @@ class versionedFileFolder(Folder,ECHO_ba
         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)
+        self.REQUEST.SESSION['objID']=ob.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'])
 
+
+    def deleteEmptyObject(self,submit,RESPONSE=None):
+        """deleteemptyobject"""
+        if submit=="delete it":
+            if self.REQUEST.SESSION['objID_parent']:
+                obj=getattr(self,self.REQUEST.SESSION['objID_parent'])
+
+            else:
+                obj=self
+            obj.manage_delObjects([self.REQUEST.SESSION['objID']])
+
+        RESPONSE.redirect(self.REQUEST['URL1'])
+        
         
 manage_addVersionedFileFolderForm=DTMLFile('dtml/folderAdd', globals())
 
@@ -314,7 +349,24 @@ class versionedFile(Folder):
         
     meta_type="versionedFile"
 
-  
+    def manageCommentForm(self):
+        """add a comment"""
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addComment')).__of__(self)
+        return pt()
+
+    def manageComment(self,text,comment_author,submit,REQUEST=None):
+        """manage comments"""
+        if submit =='change':
+            if text=='':
+                self.comment=None
+            else:
+                self.comment=text
+                self.comment_author=comment_author
+
+                self.comment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime())
+
+        return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url())
+    
     def getLastVersion(self):
         """Last Version"""
         tmp=0
@@ -367,6 +419,11 @@ class versionedFile(Folder):
         ret.sort(sortv)
         return ret
 
+    security.declareProtected('AUTHENTICATED_USER','forceunlock')   
+    def forceunlock(self,RESPONSE):
+        """unlock"""
+        self.lockedBy=''
+
     security.declareProtected('AUTHENTICATED_USER','unlock')   
     def unlock(self,RESPONSE):
         """unlock"""
@@ -376,6 +433,7 @@ class versionedFile(Folder):
         else:
             return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER'])
         
+
     
     security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm')
 
@@ -397,18 +455,35 @@ 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()))
+        self.REQUEST.SESSION['objID_parent']=self.getId()
 
         if RESPONSE:
-            RESPONSE.redirect(self.REQUEST['URL2'])
+            obj=self.ZopeFind(self,obj_ids=[id])[0][1]
+            if obj.getSize()==0:
+                self.REQUEST.SESSION['objID']=obj.getId()
+                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):