// from having to convert everything to UTC before comparing. Nice!
//
int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char *end_str) {
- struct icaltimetype dtstart = icalcomponent_get_dtstart(cal);
- struct icaltimetype dtend = icalcomponent_get_dtend(cal);
-
- struct icaltimetype search_start = icaltime_from_string(start_str);
- syslog(LOG_DEBUG, " search start: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(search_start), icaltime_get_tzid(search_start));
+ struct icaltimetype search_start = icaltime_from_string(start_str); // time range being searched
struct icaltimetype search_end = icaltime_from_string(end_str);
- syslog(LOG_DEBUG, " search end: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(search_end), icaltime_get_tzid(search_end));
- // If it is a recurring event, RRULE is available at this level. We can handle it here.
+ struct icaltimetype dtstart = icalcomponent_get_dtstart(cal); // time of event
+ struct icaltimetype dtend = icalcomponent_get_dtend(cal);
+ if (icaltime_is_null_time(dtend)) {
+ dtend = dtstart;
+ }
- icalproperty *rrule;
- rrule = icalcomponent_get_first_property(cal, ICAL_RRULE_PROPERTY);
+ // If it is a recurring event, RRULE is available at this level. We can handle it here.
+ icalproperty *rrule = icalcomponent_get_first_property(cal, ICAL_RRULE_PROPERTY);
if (rrule) {
- if (icaltime_is_null_time(dtend)) {
- dtend = dtstart;
- }
struct icaldurationtype dur = icaltime_subtract(dtend, dtstart); // recurrences need duration to find dtend
struct icalrecurrencetype recur = icalproperty_get_rrule(rrule);
-
icalrecur_iterator *ritr = icalrecur_iterator_new(recur, dtstart); // iterate through recurrences
- int rcount = 0;
- syslog(LOG_DEBUG, "\033[7m RECURRENCE: \033[0m");
while (dtstart = icalrecur_iterator_next(ritr), !icaltime_is_null_time(dtstart)) {
dtend = icaltime_add(dtstart, dur);
- syslog(LOG_DEBUG, "recurrence %3d start: \033[36m%-16s\033[0m (%s)", rcount, icaltime_as_ical_string_r(dtstart), icaltime_get_tzid(dtstart));
- syslog(LOG_DEBUG, "recurrence %3d end: \033[36m%-16s\033[0m (%s)", rcount, icaltime_as_ical_string_r(dtend), icaltime_get_tzid(dtend));
- // Does THIS recurrence match the query?
+ // Does THIS recurrence match the query? If so, free the memory we used and stop iterating.
if (ical_ctdl_is_overlap(dtstart, dtend, search_start, search_end)) {
icalrecur_iterator_free(ritr);
return(1);
}
-
- ++rcount;
}
icalrecur_iterator_free(ritr);
}
// For non recurring events, do a simple time range compare.
- syslog(LOG_DEBUG, "event start: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(dtstart), icaltime_get_tzid(dtstart));
- syslog(LOG_DEBUG, "event end: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(dtend), icaltime_get_tzid(dtend));
return(ical_ctdl_is_overlap(dtstart, dtend, search_start, search_end)); // We have a convenience function for this.
}
}
else if (!strcasecmp(t[1], "time-range")) { // RFC4791 9.9
- syslog(LOG_DEBUG, "time range filter at level %d FIXME add recurrence", this_rule_level);
+ syslog(LOG_DEBUG, "time range filter at level %d", this_rule_level);
+ char *tr_start = (char *)the_beginning_of_time; // default if not specified
+ char *tr_end = (char *)the_end_of_time; // default if not specified
for (int i=2; (i+1)<num_tokens; i+=2) {
- char *tr_start = (char *)the_beginning_of_time; // default if not specified
- char *tr_end = (char *)the_end_of_time; // default if not specified
if (!strcasecmp(t[i], "start")) {
tr_start = t[i+1];
}
else if (!strcasecmp(t[i], "end")) {
tr_end = t[i+1];
}
- if (caldav_time_range_filter_matches(cal, tr_start, tr_end)) {
- syslog(LOG_DEBUG, "time range matches");
- }
- else {
- syslog(LOG_DEBUG, "time range does not match -- rejecting");
- qual = 0;
- }
+ }
+ if (caldav_time_range_filter_matches(cal, tr_start, tr_end)) {
+ syslog(LOG_DEBUG, "time range matches");
+ }
+ else {
+ syslog(LOG_DEBUG, "time range does not match -- rejecting");
+ qual = 0;
}
}
// Does this calendar item qualify for output? Run this calendar item through the filters.
syslog(LOG_DEBUG, "Evaluating message \033[33m%ld\033[0m...", m);
if (caldav_apply_filters(cal, crp.filters, 0)) {
- syslog(LOG_DEBUG, "Message %ld \033[32mQUALIFIES\033[0m");
+ syslog(LOG_DEBUG, "Message %ld \033[32mQUALIFIES\033[0m", m);
// FIXME need to populate the Href instead of NULL
cal_multiget_out(m, NULL, one_item, ReportOut);
}
else {
- syslog(LOG_DEBUG, "Message %ld \033[31mDOES NOT QUALIFY\033[0m");
+ syslog(LOG_DEBUG, "Message %ld \033[31mDOES NOT QUALIFY\033[0m", m);
}
syslog(LOG_DEBUG, "");