--- versionedFile/versionedFile.py	2006/06/15 22:01:59	1.61
+++ versionedFile/versionedFile.py	2006/10/03 14:40:26	1.67
@@ -539,6 +539,8 @@ class versionedFileObject(File):
     manage_editForm._setName('manage_editForm')
 
 
+    
+ 
     security.declarePublic('getTitle')
 
     def getTitle(self):
@@ -665,7 +667,7 @@ class versionedFileObject(File):
             except:#old version of versionded file sometimes stored the user object and not only the name the following corrects this
                 ret=str(self.author).replace("-","\n")
             ret=ret.replace("\r","\n")
-            return ret
+            return ret.lstrip().rstrip()
 
         else:
             jar=self._p_jar
@@ -831,7 +833,9 @@ class versionedFile(CatalogAware,Folder)
         le=lv.lastEditor()
         return le
     
-    
+    def getLockedBy(self):
+        """get locked by"""
+        return str(self.lockedBy)
         
     security.declarePublic('getLastVersion')
     def getLastVersion(self):
@@ -856,12 +860,24 @@ class versionedFile(CatalogAware,Folder)
     def diff(self,data):
         """differenz between lastversion and data"""
         d=Differ()
-        tmp=self.getLastVersion().data
+        data=data.rstrip()
+	try:
+	    tmp=self.getLastVersion().data.rstrip()
+	except:
+	    tmp=str(self.getLastVersion().data).rstrip()
         #print "XX",data,tmp
-        l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
-        
+
+	try:
+	        l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
+        except:
+		try:
+			l=list(d.compare(repr(data).splitlines(1),tmp.splitlines(1)))
+		except:
+			return 9999,[]
+
         plus=0
         minus=0
+
         for a in l:
             if a[0]=='+':
                 plus+=1
@@ -913,9 +929,15 @@ class versionedFile(CatalogAware,Folder)
         return ret
 
     security.declareProtected('AUTHENTICATED_USER','forceunlock')   
-    def forceunlock(self,RESPONSE):
+    def forceunlock(self,RESPONSE=None):
         """unlock"""
+        #safe who had the lock
+        if self.lockedBy:
+            self.brokenLock=str(self.lockedBy)
+        else:
+            self.brokenLock=""
         self.lockedBy=''
+        return self.brokenLock
 
     security.declareProtected('AUTHENTICATED_USER','unlock')   
     def unlock(self,RESPONSE):