Monotone-Parent: e83f50e38737703b47fbfe973f685c195a25232d

Monotone-Revision: ff201d8484b08d9e29b03401dc626b86400b923a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-01-24T15:36:26
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-01-24 15:36:26 +00:00
parent 377c2f58f2
commit 7a7c75e240
2 changed files with 18 additions and 5 deletions
+4
View File
@@ -1,5 +1,9 @@
2008-01-24 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m: if c_cycleinfo
is an NSNull instance, we consider it to be empty and return
automatically with an error message in the log.
* OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor
-extractQuickFieldsFromTodo:_task]): handle recurrence info in
tasks.
+14 -5
View File
@@ -634,12 +634,21 @@ static NSNumber *sharedYes = nil;
NGCalendarDateRange *fir;
NSArray *rules, *exRules, *exDates, *ranges;
unsigned i, count;
NSString *content;
cycleinfo = [[_row objectForKey:@"c_cycleinfo"] propertyList];
if (cycleinfo == nil) {
[self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@", _row];
return;
}
content = [_row objectForKey: @"c_cycleinfo"];
if (![content isNotNull])
{
[self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@", _row];
return;
}
cycleinfo = [content propertyList];
if (!cycleinfo)
{
[self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@", _row];
return;
}
row = [self fixupRecord:_row fetchRange: _r];
[row removeObjectForKey: @"c_cycleinfo"];