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

diff --git a/ChangeLog b/ChangeLog
index e43917953087e09f0f38e668599d2b279297fdcb..c1f79af17c16a33e672c121379862cfd1ee0f8fe 100644 (file)
--- 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 a1072b1a9f8b8e0e45ba1bf43d3c271140cf0181..a76a21ab2a723a59cc2784105df751d0b63e5c0a 100644 (file)
--- 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 c423d5f4896709189647c40b3d7d9535acfa9055..ac0495fd0a500752b7781342ae3c685b8b7c70d3 100644 (file)
--- 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 4ff6d1e2352c683a3f90d44991b0831ebc8f0d3c..3ff95dae3de885f2a8dee65d38b8a492256ede21 100644 (file)
--- 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];
     }
 }