From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Sun, 4 Nov 2007 20:30:43 +0000 (+0000)
Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1231 d1b88da0-ebda-0310... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a18bad7e29b2b292e4ae84d1365c499b42a123c9;p=scalable-opengroupware.org

git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1231 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/ChangeLog b/ChangeLog
index e4391795..c1f79af1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder
+	-deleteEntriesWithIds:ids]): make sure the objects returned by
+	lookupName:... are not instances of NSException.
+
 2007-11-03  Ludovic Marcotte  <ludovic@inverse.ca>
 
 	* UI/Scheduler/UIxAppointmentEditor.m
diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog
index a1072b1a..a76a21ab 100644
--- a/SOPE/GDLContentStore/ChangeLog
+++ b/SOPE/GDLContentStore/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* GCSFolder.m ([GCSFolder -writeContent:toName:baseVersion:]): the
+	test for the improvement below was wrong, we want to test the
+	value of the column ('0' or null) instead of whether it is null or
+	filled.
+
 2007-10-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* GCSFolder.m ([GCSFolder -writeContent:toName:baseVersion:]):
diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m
index c423d5f4..ac0495fd 100644
--- a/SOPE/GDLContentStore/GCSFolder.m
+++ b/SOPE/GDLContentStore/GCSFolder.m
@@ -582,7 +582,7 @@ static GCSStringFormatter *stringFormatter = nil;
   isNewRecord = [storedVersion isNotNull] ? NO : YES;
   if (!isNewRecord)
     {
-      if ([[self deletionOfContentWithName:_name] isNotNull])
+      if ([[self deletionOfContentWithName:_name] intValue] > 0)
 	{
 	  [self _purgeRecordWithName: _name];
 	  isNewRecord = YES;
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 4ff6d1e2..3ff95dae 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -378,7 +378,8 @@ static NSString *defaultUserID = @"<default>";
       currentID = [ids objectAtIndex: count];
       deleteObject = [self lookupName: currentID
 			   inContext: context acquire: NO];
-      [deleteObject delete];
+      if (![deleteObject isKindOfClass: [NSException class]])
+	[deleteObject delete];
     }
 }