Attachment 109307 Details for Bug 86102 – Patch to handle WeekOfMonth

[patch] Patch to handle WeekOfMonth

0002-_eas2ical_process_recurrence-handle-WeekOfMonth-from.patch (text/plain), 4.97 KB, created by Graham Cobb on 2014-11-11 20:59:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Graham Cobb

Created: 2014-11-11 20:59:11 UTC

Size: 4.97 KB

patch

obsolete

>From 3d65caf68dee3d435bb05caa0e5726b71b1f3b61 Mon Sep 17 00:00:00 2001
>From: "Graham R. Cobb" <g+syncevolution@cobb.uk.net>
>Date: Tue, 11 Nov 2014 20:47:17 +0000
>Subject: [PATCH 2/2] _eas2ical_process_recurrence: handle WeekOfMonth from EAS
>
>Add handling for recurrences including the <WeekOfMonth> tag. This required
>that DayOfMonth processing be moved to the end of the function so it happens
>after all the fields have been seen.
>
>Note: at this time, syncevolution does not handle the week -- see bug #70693
>---
> eas-daemon/libeas/eas-cal-info-translator.c | 78 +++++++++++++++++------------
> 1 file changed, 46 insertions(+), 32 deletions(-)
>
>diff --git a/eas-daemon/libeas/eas-cal-info-translator.c b/eas-daemon/libeas/eas-cal-info-translator.c
>index d25317f..69a82c0 100644
>--- a/eas-daemon/libeas/eas-cal-info-translator.c
>+++ b/eas-daemon/libeas/eas-cal-info-translator.c
>@@ -895,6 +895,8 @@ static void _eas2ical_process_recurrence (xmlNodePtr n, icalcomponent* vevent)
> 	icalproperty*  prop     = NULL;
> 	xmlNode*       subNode  = NULL;
> 	struct icalrecurrencetype recur;
>+	int dayOfWeek = 0;
>+	int weekOfMonth = 0;
> 
> 	// Ensure the icalrecurrencetype is null
> 	icalrecurrencetype_clear (&recur);
>@@ -953,42 +955,18 @@ static void _eas2ical_process_recurrence (xmlNodePtr n, icalcomponent* vevent)
> 
> 		// WeekOfMonth
> 		else if (g_strcmp0 (elemName, EAS_ELEMENT_WEEKOFMONTH) == 0) {
>-			g_warning ("DATA LOSS: Cannot handle <Calendar><Recurrence><WeekOfMonth> element (value=%d)", atoi (value));
>+			// Remember week of month, for processing the day of week later
>+
>+			weekOfMonth = atoi (value);
>+
>+			// EAS uses week 5 to indicate the last week of the month, ical uses -1
>+			if (weekOfMonth == 5) weekOfMonth = -1;
> 		}
> 
> 		// DayOfWeek
> 		else if (g_strcmp0 (elemName, EAS_ELEMENT_DAYOFWEEK) == 0) {
>-			// A recurrence rule can target any combination of the 7 week days.
>-			// EAS encodes these as a bit set in a single int value.
>-			// libical encodes them as an array (max size 7) of icalrecurrencetype_weekday
>-			// enum values.
>-			// This block of code converts the former into the latter.
>-
>-			int dayOfWeek = atoi (value);
>-			int index = 0;
>-
>-			// Note: must use IF for subsequent blocks, not ELSE IF
>-			if (dayOfWeek & DAY_OF_WEEK_MONDAY) {
>-				recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_MONDAY_WEEKDAY, 0);
>-			}
>-			if (dayOfWeek & DAY_OF_WEEK_TUESDAY) {
>-				recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_TUESDAY_WEEKDAY, 0);
>-			}
>-			if (dayOfWeek & DAY_OF_WEEK_WEDNESDAY) {
>-				recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_WEDNESDAY_WEEKDAY, 0);
>-			}
>-			if (dayOfWeek & DAY_OF_WEEK_THURSDAY) {
>-				recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_THURSDAY_WEEKDAY, 0);
>-			}
>-			if (dayOfWeek & DAY_OF_WEEK_FRIDAY) {
>-				recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_FRIDAY_WEEKDAY, 0);
>-			}
>-			if (dayOfWeek & DAY_OF_WEEK_SATURDAY) {
>-				recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_SATURDAY_WEEKDAY, 0);
>-			}
>-			if (dayOfWeek & DAY_OF_WEEK_SUNDAY) {
>-				recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_SUNDAY_WEEKDAY, 0);
>-			}
>+			// Remember day of week, for processing later
>+			dayOfWeek = atoi (value);
> 		}
> 
> 		// MonthOfYear
>@@ -1052,6 +1030,42 @@ static void _eas2ical_process_recurrence (xmlNodePtr n, icalcomponent* vevent)
> 		xmlFree (value);
> 	}
> 
>+	// Handle day of week
>+	// Note: this has to be done here as we need values of both the DayOfWeek and WeekOfMonth fields
>+	if (dayOfWeek) {
>+		// A recurrence rule can target any combination of the 7 week days.
>+		// EAS encodes these as a bit set in a single int value.
>+		// libical encodes them as an array (max size 7) of icalrecurrencetype_weekday
>+		// enum values.
>+		// This block of code converts the former into the latter.
>+
>+		int index = 0;
>+
>+		// Note: must use IF for subsequent blocks, not ELSE IF
>+		if (dayOfWeek & DAY_OF_WEEK_MONDAY) {
>+			recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_MONDAY_WEEKDAY, weekOfMonth);
>+		}
>+		if (dayOfWeek & DAY_OF_WEEK_TUESDAY) {
>+			recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_TUESDAY_WEEKDAY, weekOfMonth);
>+		}
>+		if (dayOfWeek & DAY_OF_WEEK_WEDNESDAY) {
>+			recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_WEDNESDAY_WEEKDAY, weekOfMonth);
>+		}
>+		if (dayOfWeek & DAY_OF_WEEK_THURSDAY) {
>+			recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_THURSDAY_WEEKDAY, weekOfMonth);
>+		}
>+		if (dayOfWeek & DAY_OF_WEEK_FRIDAY) {
>+			recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_FRIDAY_WEEKDAY, weekOfMonth);
>+		}
>+		if (dayOfWeek & DAY_OF_WEEK_SATURDAY) {
>+			recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_SATURDAY_WEEKDAY, weekOfMonth);
>+		}
>+		if (dayOfWeek & DAY_OF_WEEK_SUNDAY) {
>+			recur.by_day[index++] = _eas2ical_make_rrule_by_day_value (ICAL_SUNDAY_WEEKDAY, weekOfMonth);
>+		}
>+	}
>+
>+
> 	prop = icalproperty_new_rrule (recur);
> 	icalcomponent_add_property (vevent, prop);
> }
>-- 
>2.1.1
>

Actions: View | Splinter Review

Attachments on bug 86102: 109307

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.