Compare after convert works. Saving.

[citadel.git] / webcit-ng / server / caldav_reports.c

diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c
index 08972cb860b71cec655b5bd58da33c98fcc194e0..3c7797eed7cc798815af1977ddea819eee83d742 100644 (file)
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -257,6 +257,52 @@ void caldav_report_one_item(struct http_transaction *h, struct ctdlsession *c, S
 }
 
 
+// Compare function for "time-range" tests (RFC4791 section 9.9)
+// Returns nonzero if the supplied icalcomponent occurs within the specified time range
+int caldav_time_range_filter_matches(icalcomponent *cal_in, char *start_str, char *end_str) {
+
+       struct icaltimetype start = (
+               (!IsEmptyStr(start_str))
+               ? icaltime_from_string(start_str)
+               : icaltime_from_string("19010101T010101Z")
+       );
+       syslog(LOG_DEBUG, "   search start: %16s --> \033[36m%s\033[0m", start_str, icaltime_as_ical_string_r(start));
+
+       struct icaltimetype end = (
+               (!IsEmptyStr(end_str))
+               ? icaltime_from_string(end_str)
+               : icaltime_from_string("99991231T235959Z")              // ISO8601 is not Y10K compliant
+       );
+       syslog(LOG_DEBUG, "   search   end: %16s --> \033[36m%s\033[0m", end_str, icaltime_as_ical_string_r(end));
+
+
+// NOTE TO ME: The header file says
+// "This converts both times to the UTC timezone and compares them."
+//     LIBICAL_ICAL_EXPORT int icaltime_compare(const struct icaltimetype a, const struct icaltimetype b);
+// How does it do that without knowing the time zone?  Does it use a private method to look up into the
+// parent component to find a VTIMEZONE component?  Find out.  If it can do that, we don't have to dezonify.
+
+
+
+       // make a local copy of the component because we are going to modify it by converting times to UTC
+       icalcomponent *cal = icalcomponent_new_clone(cal_in);
+       ical_dezonify(cal);
+
+
+
+       icaltimetype dts = icalcomponent_get_dtstart(cal);
+       syslog(LOG_DEBUG, "component start: \033[36m%s\033[0m", icaltime_as_ical_string_r(dts));
+
+       icaltimetype dte = icalcomponent_get_dtend(cal);
+       syslog(LOG_DEBUG, "component   end: \033[36m%s\033[0m", icaltime_as_ical_string_r(dte));
+
+       int result = ical_ctdl_is_overlap(dts, dte, start, end);        // We have a convenience function for this.
+
+       icalcomponent_free(cal);
+       return(result);
+}
+
+
 // Recursive function to apply CalDAV FILTERS to a calendar item.
 // Returns zero if the calendar item was disqualified by a filter, nonzero if the calendar item still qualifies.
 int caldav_apply_filters(void *cal, Array *filters, int apply_at_level) {
@@ -371,10 +417,24 @@ int caldav_apply_filters(void *cal, Array *filters, int apply_at_level) {
                        syslog(LOG_DEBUG, "text match filter at level %d FIXME not implemented yet", this_rule_level);
                }
 
-               else if (!strcasecmp(t[1], "time-range")) {
+               else if (!strcasecmp(t[1], "time-range")) {                     // RFC4791 9.9
                        syslog(LOG_DEBUG, "time range filter at level %d FIXME not implemented yet", this_rule_level);
-                       for (int i=0; i<num_tokens; ++i) {
-                               syslog(LOG_DEBUG, "token %2d : <%s>", i, t[i]);
+                       for (int i=2; (i+1)<num_tokens; i+=2) {
+                               char *tr_start = NULL;
+                               char *tr_end = NULL;
+                               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;
+                               }
                        }
                }