From c36fcd2902391ab5090aa5cff39439bbd58ba92c Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 10 Jan 2017 10:17:16 -0500 Subject: [PATCH] Improve debugging output of recurrence calculator --- SOPE/NGCards/iCalDailyRecurrenceCalculator.m | 2 ++ SOPE/NGCards/iCalRecurrenceRule.m | 24 +++++++++++++++++++ SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m index c6ab5a6ff..6780661e2 100644 --- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m @@ -61,6 +61,8 @@ long i, count, repeatCount; unsigned interval; + //[self logWithFormat: @"Recurrence rule is %@", rrule]; + firStart = [firstRange startDate]; startDate = [_r startDate]; endDate = [_r endDate]; diff --git a/SOPE/NGCards/iCalRecurrenceRule.m b/SOPE/NGCards/iCalRecurrenceRule.m index c28167334..a5288e745 100644 --- a/SOPE/NGCards/iCalRecurrenceRule.m +++ b/SOPE/NGCards/iCalRecurrenceRule.m @@ -921,4 +921,28 @@ NSString *iCalWeekDayString[] = { @"SU", @"MO", @"TU", @"WE", @"TH", @"FR", return isEqual; } +- (NSString *) description +{ + NSMutableString *str; + + str = [NSMutableString stringWithString: [self flattenedValuesForKey: @"freq"]]; + + if ([self repeatInterval] > 1) + [str appendFormat: @" interval of %i", [self repeatInterval]]; + if ([self repeatCount]) + [str appendFormat: @" for %i times", [self repeatCount]]; + if ([self untilDate]) + [str appendFormat: @" until %@", [self untilDate]]; + if ([[self valuesAtIndex: 0 forKey: @"bymonthday"] count]) + [str appendFormat: @" BYMONTHDAY:%@", [self flattenedValuesForKey: @"bymonthday"]]; + if ([[self valuesAtIndex: 0 forKey: @"byday"] count]) + [str appendFormat: @" BYDAY:%@", [self flattenedValuesForKey: @"byday"]]; + if ([[self valuesAtIndex: 0 forKey: @"bymonth"] count]) + [str appendFormat: @" BYMONTH:%@", [self flattenedValuesForKey: @"bymonth"]]; + if ([[self valuesAtIndex: 0 forKey: @"bysetpos"] count]) + [str appendFormat: @" BYSETPOS:%@", [self flattenedValuesForKey: @"bysetpos"]]; + + return str; +} + @end /* iCalRecurrenceRule */ diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m index 9e792f8d4..0a5448b60 100644 --- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m @@ -70,7 +70,7 @@ iCalByDayMask *dayMask; BOOL hasRepeatCount; - [self logWithFormat: @"Weekly %@", rrule]; + //[self logWithFormat: @"Recurrence rule is %@", rrule]; firStart = [firstRange startDate]; startDate = [_r startDate];