Bring ical_dezonify() into caldav_reports.c

[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..22c90fea62ba981fffdc9b4e54b077e952db0e74 100644 (file)
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -257,6 +257,37 @@ 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 *supplied_cal, char *start_str, char *end_str) {
+
+       struct icaltimetype start = (start_str ? icaltime_from_string(start_str) : icaltime_null_time());
+       struct icaltimetype end = (end_str ? icaltime_from_string(end_str) : icaltime_null_time());
+
+       // make a local copy of the component because we are going to modify it by converting times to UTC
+       icalcomponent *cal = icalcomponent_new_clone(supplied_cal);
+       ical_dezonify(cal);
+
+       syslog(LOG_DEBUG, "\033[7mcaldav_time_range_filter_matches()\033[0m : Does this %s fall between %s and %s ?",
+               icalcomponent_kind_to_string(icalcomponent_isa(cal)),
+               start_str,
+               end_str
+       );
+
+       syslog(LOG_DEBUG, "Well, here it is:");
+       syslog(LOG_DEBUG, "\033[35m%s\033[0m", icalcomponent_as_ical_string_r(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));
+
+       icalcomponent_free(cal);
+       return(0);                                              // FIXME reject everything for now
+}
+
+
 // 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 +402,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;
+                               }
                        }
                }