git-svn-id: http://svn.opengroupware.org/SOGo/trunk@236 d1b88da0-ebda-0310-925b-ed51d...

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index cc0d66ea3d484d153f2b8b226a473650d6dd3baf..e6d25a5558d524df4b05beb0768e3813b5cc28f3 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-15  Helge Hess  <helge.hess@skyrix.com>
 
+       * SOGoContentObject.m: implement first version of -delete (v0.9.9)
+
        * SOGoObject.[hm], SOGoUserFolder.[hm]: implemented SOPE 
          -ownerInContext: (v0.9.8)
 

diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.h b/SOGo/SoObjects/SOGo/SOGoContentObject.h
index 1bb949c07c5c0b441534b34820870f0ca6b3cb04..afa6e6be9ef9856c63b7e8f0fe87b8d0da088247 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoContentObject.h
+++ b/SOGo/SoObjects/SOGo/SOGoContentObject.h
@@ -47,6 +47,7 @@
 
 - (NSString *)contentAsString;
 - (NSException *)saveContentString:(NSString *)_str;
+- (NSException *)delete;
 
 @end
 

diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.m b/SOGo/SoObjects/SOGo/SOGoContentObject.m
index 4713650f61d5e49c1892fb2c3824e75f71327065..69fb7b3434f0cb0c166fbcbf66600ec20c6bbbd0 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoContentObject.m
+++ b/SOGo/SoObjects/SOGo/SOGoContentObject.m
@@ -95,6 +95,8 @@
 - (NSException *)saveContentString:(NSString *)_str {
   OCSFolder   *folder;
   NSException *ex;
+
+#warning TODO: implement proper "multi-saves"
   
   if ((folder = [self ocsFolder]) == nil) {
     [self logWithFormat:@"did not find folder of appointment."];
@@ -109,6 +111,25 @@
   return nil;
 }
 
+- (NSException *)delete {
+  OCSFolder   *folder;
+  NSException *ex;
+
+#warning TODO: implement proper "multi-saves"
+  
+  if ((folder = [self ocsFolder]) == nil) {
+    [self logWithFormat:@"did not find folder of appointment."];
+    return nil;
+  }
+  
+  if ((ex = [folder deleteContentWithName:[self nameInContainer]])) {
+    [self logWithFormat:@"delete failed: %@", ex];
+    return ex;
+  }
+  
+  return nil;
+}
+
 /* description */
 
 - (void)appendAttributesToDescription:(NSMutableString *)_ms {

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index 702b267482bc56b02dc3612d0fdd7da6c6e8ae86..f77de926a0dbf088a9ecc8229e89d22b86de7e3e 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,3 +1,3 @@
 # $Id: Version 170 2004-08-11 10:45:40Z helge $
 
-SUBMINOR_VERSION:=8
+SUBMINOR_VERSION:=9