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 c47164fa7023e5abd379ada739da4f24eb72fe36..22c90fea62ba981fffdc9b4e54b077e952db0e74 100644 (file)
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -259,19 +259,32 @@ 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, char *start_str, char *end_str) {
-
+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,
-               end
+               start_str,
+               end_str
        );
 
-       return(0);              // reject everything for now
+       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
 }