Compare after convert works. Saving.

diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c
index bd451e9e2d5e0821abe75ae54d81630d03f5d238..3c7797eed7cc798815af1977ddea819eee83d742 100644 (file)
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -262,16 +262,18 @@ void caldav_report_one_item(struct http_transaction *h, struct ctdlsession *c, S
 int caldav_time_range_filter_matches(icalcomponent *cal_in, char *start_str, char *end_str) {
 
        struct icaltimetype start = (
-               start_str
+               (!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 = (
-               end_str
+               (!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
@@ -282,20 +284,11 @@ int caldav_time_range_filter_matches(icalcomponent *cal_in, char *start_str, cha
 
 
 
-
-
        // 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_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));