WARNING NOT Y10K COMPLIANT

[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..bd451e9e2d5e0821abe75ae54d81630d03f5d238 100644 (file)
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -259,19 +259,54 @@ 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 *cal_in, char *start_str, char *end_str) {
+
+       struct icaltimetype start = (
+               start_str
+               ? icaltime_from_string(start_str)
+               : icaltime_from_string("19010101T010101Z")
+       );
+
+       struct icaltimetype end = (
+               end_str
+               ? icaltime_from_string(end_str)
+               : icaltime_from_string("99991231T235959Z")              // ISO8601 is not Y10K compliant
+       );
+
+
+// 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.
+
 
 
-       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(cal_in);
+       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));
+
+       int result = ical_ctdl_is_overlap(dts, dte, start, end);        // We have a convenience function for this.
+
+       icalcomponent_free(cal);
+       return(result);
 }