Monotone-Parent: 3a06415372a1a1f51b286861a4ab3a51dd7df886

Monotone-Revision: dd40f80285290c9b934e5644f0e30ea7b3ef0577

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-19T15:17:12
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-06-19 15:17:12 +00:00
parent 980be2a0c6
commit 988779e098
1 changed files with 4 additions and 3 deletions

View File

@ -1469,7 +1469,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
NSString *currentKey, *keyField, *filterString;
static NSArray *fields = nil;
NSMutableArray *filters;
NSNumber *cycle, *cEndDate;
NSCalendarDate *cEndDate;
NSNumber *cycle;
#warning the list of fields should be taken from the .ocs description file
if (!fields)
@ -1503,11 +1504,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
if ([cycle intValue])
{
cEndDate = [filter objectForKey: @"cycleenddate"];
if ([cEndDate intValue])
if (cEndDate)
{
filterString = [NSString stringWithFormat:
@"(c_cycleenddate = NULL OR c_cycleenddate >= %@)",
cEndDate];
(int) [cEndDate timeIntervalSince1970]];
[filters addObject: filterString];
}
}