X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit-ng%2Fserver%2Fcaldav_reports.c;fp=webcit-ng%2Fserver%2Fcaldav_reports.c;h=646b40893660f4fbc2a0ba12d4441ca4be9ed514;hp=906d96fcff39a57d5aca6991a7184a889ec0f00b;hb=473c0f696929fd377c125443fd92b1df65ddbc61;hpb=b0ea3f3bd48ceacbd2cd254c84b4173dea2b6bfc

diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c
index 906d96fcf..646b40893 100644
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -401,7 +401,7 @@ int caldav_apply_filters(void *cal, Array *filters, int apply_at_level) {
 		}
 
 		else if (!strcasecmp(t[1], "time-range")) {			// RFC4791 9.9
-			syslog(LOG_DEBUG, "time range filter at level %d FIXME add recur", this_rule_level);
+			syslog(LOG_DEBUG, "time range filter at level %d FIXME add recurrence", this_rule_level);
 			for (int i=2; (i+1)<num_tokens; i+=2) {
 				char *tr_start	= (char *)the_beginning_of_time;	// default if not specified
 				char *tr_end	= (char *)the_end_of_time;		// default if not specified
@@ -486,20 +486,17 @@ void caldav_report(struct http_transaction *h, struct ctdlsession *c) {
 				StrBuf *one_item = fetch_ical(c, m);
 				icalcomponent *cal = icalcomponent_new_from_string(ChrPtr(one_item));
 
-				// Does this calendar item qualify for output?
-				int qualify = 1;
-
-				// If there was a filter stanza, run this calendar item through the filters.
+				// 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);
-				qualify = caldav_apply_filters(cal, crp.filters, 0);
-				syslog(LOG_DEBUG, "Message %ld %s\033[0m qualify", m, (qualify ? "\033[32mDOES" : "\033[31mDOES NOT"));
-				syslog(LOG_DEBUG, "");
-
-				// Did this calendar item match the query?  If so, output it.
-				if (qualify) {
+				if (caldav_apply_filters(cal, crp.filters, 0)) {
+					syslog(LOG_DEBUG, "Message %ld \033[32mQUALIFIES\033[0m");
 					// 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, "");
 
 				icalcomponent_free(cal);
 				FreeStrBuf(&one_item);