WebDAV GET/PUT of an entire calendar as one item

now uses OGo-compatible URL's.  Any of three formats are possible:
* http://foo.example.com/groupdav/Calendar
* http://foo.example.com/groupdav/ics
* http://foo.example.com/groupdav/calendar.ics

diff --git a/webcit/groupdav_get.c b/webcit/groupdav_get.c
index 04afa2c153c8907435b1fc31d9883a85d1192ebf..e42a26778b0910bd4590b6bff320f4251c43a5dc 100644 (file)
--- a/webcit/groupdav_get.c
+++ b/webcit/groupdav_get.c
@@ -68,6 +68,9 @@ void groupdav_get(char *dav_pathname) {
 
        extract_token(dav_roomname, dav_pathname, 2, '/', sizeof dav_roomname);
        extract_token(dav_uid, dav_pathname, 3, '/', sizeof dav_uid);
+       if ((!strcasecmp(dav_uid, "ics")) || (!strcasecmp(dav_uid, "calendar.ics"))) {
+               strcpy(dav_uid, "");
+       }
 
        /* Go to the correct room. */
        if (strcasecmp(WC->wc_roomname, dav_roomname)) {

diff --git a/webcit/groupdav_put.c b/webcit/groupdav_put.c
index fd4f5e899898f4b0f8f882e5468a2064908032a2..21eaefbb858271711a7373f08fd70877c3cbbe4b 100644 (file)
--- a/webcit/groupdav_put.c
+++ b/webcit/groupdav_put.c
@@ -72,6 +72,9 @@ void groupdav_put(char *dav_pathname, char *dav_ifmatch,
 
        extract_token(dav_roomname, dav_pathname, 2, '/', sizeof dav_roomname);
        extract_token(dav_uid, dav_pathname, 3, '/', sizeof dav_uid);
+       if ((!strcasecmp(dav_uid, "ics")) || (!strcasecmp(dav_uid, "calendar.ics"))) {
+               strcpy(dav_uid, "");
+       }
 
        /* Go to the correct room. */
        if (strcasecmp(WC->wc_roomname, dav_roomname)) {