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

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index 693040d8c5798ebccbf4d3120ea257929fb20088..e7422c26f9087105e1140129fb35d23153527866 100644 (file)
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-15    <helge@agenor.opengroupware.org>
+
+       * OCSFolder.m: added sanity check to store method (v0.9.2)
+
 2004-08-14  Helge Hess  <helge.hess@skyrix.com>
 
        * v0.9.1

diff --git a/OGoContentStore/OCSFolder.m b/OGoContentStore/OCSFolder.m
index 2df2098142928d92d39a29db6ceb273121dd9e29..68a85cd045ebc9cc1d41f3c7ee3d86153b65c041 100644 (file)
--- a/OGoContentStore/OCSFolder.m
+++ b/OGoContentStore/OCSFolder.m
@@ -319,6 +319,19 @@ static BOOL doLogStore = NO;
   NSNumber            *now;
   NSString            *qsql, *bsql;
 
+  /* check preconditions */
+  
+  if (_name == nil) {
+    return [NSException exceptionWithName:@"OCSStoreException"
+                       reason:@"no content filename was provided"
+                       userInfo:nil];
+  }
+  if (_content == nil) {
+    return [NSException exceptionWithName:@"OCSStoreException"
+                       reason:@"no content was provided"
+                       userInfo:nil];
+  }
+  
 #warning TODO: properly escape SQL specials!
 
   error   = nil;

diff --git a/OGoContentStore/Version b/OGoContentStore/Version
index 1bdbd8046608a1af56892cbd16ad7c8524d429c7..06aebcd36090bc2e090f58c0c6abb4524282610e 100644 (file)
--- a/OGoContentStore/Version
+++ b/OGoContentStore/Version
@@ -2,4 +2,4 @@
 
 MAJOR_VERSION=0
 MINOR_VERSION=9
-SUBMINOR_VERSION:=1
+SUBMINOR_VERSION:=2

diff --git a/SOGoLogic/SOGoAppointmentICalRenderer.m b/SOGoLogic/SOGoAppointmentICalRenderer.m
index c3b00f62e82e73c940e14dbd48f1941fdf91562a..079359bd00f6e957120a18b37f3c29c15ee56093 100644 (file)
--- a/SOGoLogic/SOGoAppointmentICalRenderer.m
+++ b/SOGoLogic/SOGoAppointmentICalRenderer.m
@@ -166,13 +166,20 @@ static SOGoAppointmentICalRenderer *renderer = nil;
 - (NSString *)stringForAppointment:(SOGoAppointment *)_apt {
   NSMutableString *s;
 
+  if (_apt == nil)
+    return nil;
+  
   if ([[_apt uid] length] == 0) {
-    [self logWithFormat:@"WARNING: got apt without uid, rejecting iCal gen."];
+    [self logWithFormat:
+           @"WARNING: got apt without uid, rejecting iCal generation: %@", 
+           _apt];
     return nil;
   }
   if ([[[_apt startDate] icalString] length] == 0) {
     [self logWithFormat:
-           @"WARNING: got apt without startdate, rejecting iCal gen."];
+           @"WARNING: got apt without start date, "
+           @"rejecting iCal generation: %@",
+           _apt];
     return nil;
   }