Noodling on calendar query commands.

The server command 'ICAL report' is now 'ICAL query' with the intent that
it will handle CalDAV 'calendar-query' REPORTs, but not other REPORTs.

Likewise, functions with names including the string 'calendar_report' have
been changed to 'calendar_query'.

diff --git a/citadel/server/modules/calendar/calendar_report.c b/citadel/server/modules/calendar/calendar_report.c
index c9d7eb19967d29da9ae67eb7ee3b18f980585cbd..f547967dcc71c2afdccee905daa7088a7a7ec1c2 100644 (file)
--- a/citadel/server/modules/calendar/calendar_report.c
+++ b/citadel/server/modules/calendar/calendar_report.c
@@ -17,12 +17,12 @@
 #include "serv_calendar.h"
 
 
-// CtdlForEachMessage callback for calendar_report()
-void calendar_report_backend(long msgnum, void *data) {
+// CtdlForEachMessage callback for calendar_query()
+void calendar_query_backend(long msgnum, void *data) {
        struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
 
-       syslog(LOG_DEBUG, "calendar_report: calendar_report_backend(%ld)", msgnum);
+       syslog(LOG_DEBUG, "calendar_query: calendar_query_backend(%ld)", msgnum);
 
        // Look for the calendar event...
        msg = CtdlFetchMessage(msgnum, 1);
@@ -59,7 +59,7 @@ void calendar_report_backend(long msgnum, void *data) {
 
 // Go through a calendar room and output calendar objects after applying caller specified filters.
 // It is intended as a data source for WebCit (both the UI and CalDAV)
-void calendar_report(void) {
+void calendar_query(void) {
        void *filter_rules;     // Don't know yet what form this will take
 
        // Only allow this operation if we're in a room containing a calendar or tasks view
@@ -76,7 +76,7 @@ void calendar_report(void) {
        CtdlForEachMessage(MSGS_ALL, 0, NULL,
                NULL,
                NULL,
-               calendar_report_backend,
+               calendar_query_backend,
                (void *) filter_rules
        );
 

diff --git a/citadel/server/modules/calendar/serv_calendar.c b/citadel/server/modules/calendar/serv_calendar.c
index b8eaaa6ca06996c14b575be0e88a303dc019a02c..39b62880af38f638661d67363df9993ade4866b8 100644 (file)
--- a/citadel/server/modules/calendar/serv_calendar.c
+++ b/citadel/server/modules/calendar/serv_calendar.c
@@ -2347,8 +2347,8 @@ void cmd_ical(char *argbuf) {
        // All other commands require a user to be logged in.
        if (CtdlAccessCheck(ac_logged_in)) return;
 
-       if (!strcasecmp(subcmd, "report")) {
-               calendar_report();
+       if (!strcasecmp(subcmd, "query")) {
+               calendar_query();
                return;
        }
 

diff --git a/citadel/server/modules/calendar/serv_calendar.h b/citadel/server/modules/calendar/serv_calendar.h
index 784c10b7acce4595976fb2a18ad101263018d96b..7bb827c45fde51b02fd491fd0cbf949e470499ef 100644 (file)
--- a/citadel/server/modules/calendar/serv_calendar.h
+++ b/citadel/server/modules/calendar/serv_calendar.h
@@ -33,9 +33,9 @@ struct ical_respond_data {
 
 // Everything below was generated by `cproto *.c 2>/dev/null`
 
-// calendar_report.c
-void calendar_report_backend(long msgnum, void *data);
-void calendar_report(void);
+// calendar_query.c
+void calendar_query_backend(long msgnum, void *data);
+void calendar_query(void);
 
 // serv_calendar.c
 icalcomponent *icalcomponent_new_citadel_vcalendar(void);