Monotone-Parent: db9ec5b861b659354c77dd7978e1c7f78f92de3e
Monotone-Revision: 3e7ab09417e0eb7a43c8f716a4a51471466afee8 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-04-20T20:29:59 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
c9cebfec36
commit
bd948aa0e0
|
@ -61,16 +61,16 @@
|
||||||
+ (id) byDayMaskWithWeekDays
|
+ (id) byDayMaskWithWeekDays
|
||||||
{
|
{
|
||||||
id o;
|
id o;
|
||||||
|
iCalWeekOccurrences d;
|
||||||
|
|
||||||
iCalWeekOccurrences days;
|
d[iCalWeekDaySunday] = 0;
|
||||||
days[iCalWeekDaySunday] = 0;
|
d[iCalWeekDayMonday] = iCalWeekOccurrenceAll;
|
||||||
days[iCalWeekDayMonday] = iCalWeekOccurrenceAll;
|
d[iCalWeekDayTuesday] = iCalWeekOccurrenceAll;
|
||||||
days[iCalWeekDayTuesday] = iCalWeekOccurrenceAll;
|
d[iCalWeekDayWednesday] = iCalWeekOccurrenceAll;
|
||||||
days[iCalWeekDayWednesday] = iCalWeekOccurrenceAll;
|
d[iCalWeekDayThursday] = iCalWeekOccurrenceAll;
|
||||||
days[iCalWeekDayThursday] = iCalWeekOccurrenceAll;
|
d[iCalWeekDayFriday] = iCalWeekOccurrenceAll;
|
||||||
days[iCalWeekDayFriday] = iCalWeekOccurrenceAll;
|
d[iCalWeekDaySaturday] = 0;
|
||||||
days[iCalWeekDaySaturday] = 0;
|
o = [[self alloc] initWithDays: d];
|
||||||
o = [[self alloc] initWithDays: days];
|
|
||||||
AUTORELEASE(o);
|
AUTORELEASE(o);
|
||||||
|
|
||||||
return o;
|
return o;
|
||||||
|
@ -296,6 +296,8 @@
|
||||||
break;
|
break;
|
||||||
case iCalWeekOccurrenceFifthLast: i = -5;
|
case iCalWeekOccurrenceFifthLast: i = -5;
|
||||||
break;
|
break;
|
||||||
|
case iCalWeekOccurrenceAll: i = 0;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
|
|
|
@ -189,10 +189,10 @@
|
||||||
lastInstanceStartDate = nil;
|
lastInstanceStartDate = nil;
|
||||||
if ([rrule repeatCount] > 0)
|
if ([rrule repeatCount] > 0)
|
||||||
{
|
{
|
||||||
|
firStart = [firstRange startDate];
|
||||||
if ([rrule hasByMask])
|
if ([rrule hasByMask])
|
||||||
{
|
{
|
||||||
// Must perform the complete calculation
|
// Must perform the complete calculation
|
||||||
firStart = [firstRange startDate];
|
|
||||||
r = [NGCalendarDateRange calendarDateRangeWithStartDate: firStart
|
r = [NGCalendarDateRange calendarDateRangeWithStartDate: firStart
|
||||||
endDate: [NSCalendarDate distantFuture]];
|
endDate: [NSCalendarDate distantFuture]];
|
||||||
instances = [self recurrenceRangesWithinCalendarDateRange: r];
|
instances = [self recurrenceRangesWithinCalendarDateRange: r];
|
||||||
|
|
|
@ -441,10 +441,10 @@ static inline unsigned iCalDoWForNSDoW (int dow)
|
||||||
lastInstanceStartDate = nil;
|
lastInstanceStartDate = nil;
|
||||||
if ([rrule repeatCount] > 0)
|
if ([rrule repeatCount] > 0)
|
||||||
{
|
{
|
||||||
|
firStart = [firstRange startDate];
|
||||||
if ([rrule hasByMask])
|
if ([rrule hasByMask])
|
||||||
{
|
{
|
||||||
// Must perform the complete calculation
|
// Must perform the complete calculation
|
||||||
firStart = [firstRange startDate];
|
|
||||||
r = [NGCalendarDateRange calendarDateRangeWithStartDate: firStart
|
r = [NGCalendarDateRange calendarDateRangeWithStartDate: firStart
|
||||||
endDate: [NSCalendarDate distantFuture]];
|
endDate: [NSCalendarDate distantFuture]];
|
||||||
instances = [self recurrenceRangesWithinCalendarDateRange: r];
|
instances = [self recurrenceRangesWithinCalendarDateRange: r];
|
||||||
|
|
|
@ -241,10 +241,10 @@
|
||||||
lastInstanceStartDate = nil;
|
lastInstanceStartDate = nil;
|
||||||
if ([rrule repeatCount] > 0)
|
if ([rrule repeatCount] > 0)
|
||||||
{
|
{
|
||||||
|
firStart = [firstRange startDate];
|
||||||
if ([rrule hasByMask])
|
if ([rrule hasByMask])
|
||||||
{
|
{
|
||||||
// Must perform the complete calculation
|
// Must perform the complete calculation
|
||||||
firStart = [firstRange startDate];
|
|
||||||
r = [NGCalendarDateRange calendarDateRangeWithStartDate: firStart
|
r = [NGCalendarDateRange calendarDateRangeWithStartDate: firStart
|
||||||
endDate: [NSCalendarDate distantFuture]];
|
endDate: [NSCalendarDate distantFuture]];
|
||||||
instances = [self recurrenceRangesWithinCalendarDateRange: r];
|
instances = [self recurrenceRangesWithinCalendarDateRange: r];
|
||||||
|
|
Loading…
Reference in New Issue