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 758a4a2f1295cdfb6211d086e78c0876aacad13c..3c7797eed7cc798815af1977ddea819eee83d742 100644 (file)
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -259,23 +259,36 @@ 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 = (
+               (!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.
+
 
-       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);
+       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_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));