X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit-ng%2Fserver%2Fcaldav_reports.c;h=188f4bd196c196215f1d2a6b85714543b5958d57;hp=758a4a2f1295cdfb6211d086e78c0876aacad13c;hb=fc3a564c7bba86a29503b39bdd8512801116e70e;hpb=3292f7f60e2f42173b0b233e019ddc0df72d38fa diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c index 758a4a2f1..188f4bd19 100644 --- a/webcit-ng/server/caldav_reports.c +++ b/webcit-ng/server/caldav_reports.c @@ -259,13 +259,27 @@ 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) { +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_null_time()); struct icaltimetype end = (end_str ? icaltime_from_string(end_str) : icaltime_null_time()); + + + + +// 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(supplied_cal); + 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 ?",