make it pretty

diff --git a/webcit-ng/Makefile b/webcit-ng/Makefile
index 291a9a888ccd43db01693337241b92cc72bb2266..15812fefd855fa96a1ea9f51e88bea47792abadb 100644 (file)
--- a/webcit-ng/Makefile
+++ b/webcit-ng/Makefile
@@ -1,7 +1,5 @@
-# Copyright (c) 1996-2023 by the citadel.org team
-#
-# This program is open source software.  Use, duplication, or
-# disclosure are subject to the GNU General Public License v3.
+# Copyright (c) 1996-2024 by the citadel.org team
+# This program is open source software.  Use, duplication, or disclosure is subject to the GNU General Public License v3.
 
 CFLAGS := $(CFLAGS) -ggdb -Wno-format-truncation
 LDFLAGS := $(LDFLAGS)

diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c
index 8930bfb328b325d626323b586498c67aef3eeab1..485b2a3eb0647ff368976f53d53803a07cb2fa52 100644 (file)
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -269,41 +269,30 @@ void caldav_report_one_item(struct http_transaction *h, struct ctdlsession *c, S
 // from having to convert everything to UTC before comparing.  Nice!
 //
 int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char *end_str) {
-       struct icaltimetype dtstart = icalcomponent_get_dtstart(cal);
-       struct icaltimetype dtend = icalcomponent_get_dtend(cal);
-
-       struct icaltimetype search_start = icaltime_from_string(start_str);
-       syslog(LOG_DEBUG, "   search start: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(search_start), icaltime_get_tzid(search_start));
 
+       struct icaltimetype search_start = icaltime_from_string(start_str);             // time range being searched
        struct icaltimetype search_end = icaltime_from_string(end_str);
-       syslog(LOG_DEBUG, "   search   end: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(search_end), icaltime_get_tzid(search_end));
 
-       // If it is a recurring event, RRULE is available at this level.  We can handle it here.
+       struct icaltimetype dtstart = icalcomponent_get_dtstart(cal);                   // time of event
+       struct icaltimetype dtend = icalcomponent_get_dtend(cal);
+       if (icaltime_is_null_time(dtend)) {
+               dtend = dtstart;
+       }
 
-       icalproperty *rrule;                                                                                                          
-       rrule = icalcomponent_get_first_property(cal, ICAL_RRULE_PROPERTY);
+       // If it is a recurring event, RRULE is available at this level.  We can handle it here.
+       icalproperty *rrule = icalcomponent_get_first_property(cal, ICAL_RRULE_PROPERTY);
        if (rrule) {
-               if (icaltime_is_null_time(dtend)) {
-                       dtend = dtstart;
-               }
                struct icaldurationtype dur = icaltime_subtract(dtend, dtstart);        // recurrences need duration to find dtend
                struct icalrecurrencetype recur = icalproperty_get_rrule(rrule);
-
                icalrecur_iterator *ritr = icalrecur_iterator_new(recur, dtstart);      // iterate through recurrences
-               int rcount = 0;
-               syslog(LOG_DEBUG, "\033[7m RECURRENCE: \033[0m");
                while (dtstart = icalrecur_iterator_next(ritr), !icaltime_is_null_time(dtstart)) {
                        dtend = icaltime_add(dtstart, dur);
-                       syslog(LOG_DEBUG, "recurrence %3d start: \033[36m%-16s\033[0m (%s)", rcount, icaltime_as_ical_string_r(dtstart), icaltime_get_tzid(dtstart));
-                       syslog(LOG_DEBUG, "recurrence %3d   end: \033[36m%-16s\033[0m (%s)", rcount, icaltime_as_ical_string_r(dtend), icaltime_get_tzid(dtend));
 
-                       // Does THIS recurrence match the query?
+                       // Does THIS recurrence match the query?  If so, free the memory we used and stop iterating.
                        if (ical_ctdl_is_overlap(dtstart, dtend, search_start, search_end)) {
                                icalrecur_iterator_free(ritr);
                                return(1);
                        }
-
-                       ++rcount;
                }
 
                icalrecur_iterator_free(ritr);
@@ -311,8 +300,6 @@ int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char *
        }
 
        // For non recurring events, do a simple time range compare.
-       syslog(LOG_DEBUG, "event start: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(dtstart), icaltime_get_tzid(dtstart));
-       syslog(LOG_DEBUG, "event   end: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(dtend), icaltime_get_tzid(dtend));
        return(ical_ctdl_is_overlap(dtstart, dtend, search_start, search_end)); // We have a convenience function for this.
 }
 
@@ -520,12 +507,12 @@ void caldav_report(struct http_transaction *h, struct ctdlsession *c) {
                                // Does this calendar item qualify for output?  Run this calendar item through the filters.
                                syslog(LOG_DEBUG, "Evaluating message \033[33m%ld\033[0m...", m);
                                if (caldav_apply_filters(cal, crp.filters, 0)) {
-                                       syslog(LOG_DEBUG, "Message %ld \033[32mQUALIFIES\033[0m");
+                                       syslog(LOG_DEBUG, "Message %ld \033[32mQUALIFIES\033[0m", m);
                                        // FIXME need to populate the Href instead of NULL
                                        cal_multiget_out(m, NULL, one_item, ReportOut);
                                }
                                else {
-                                       syslog(LOG_DEBUG, "Message %ld \033[31mDOES NOT QUALIFY\033[0m");
+                                       syslog(LOG_DEBUG, "Message %ld \033[31mDOES NOT QUALIFY\033[0m", m);
                                }
                                syslog(LOG_DEBUG, "");