[svn-commits] twilson: trunk r224109 - /trunk/res/res_calendar_caldav.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Thu Oct 15 01:48:17 2009
New Revision: 224109

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224109
Log:
Properly handle PUT requests for CALENDAR_WRITE()

Modified:
    trunk/res/res_calendar_caldav.c

Modified: trunk/res/res_calendar_caldav.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_calendar_caldav.c?view=diff&rev=224109&r1=224108&r2=224109
==============================================================================
--- trunk/res/res_calendar_caldav.c (original)
+++ trunk/res/res_calendar_caldav.c Thu Oct 15 01:48:17 2009
@@ -155,7 +155,9 @@
 	ne_request_destroy(req);
 
 	if (ret != NE_OK || !ast_str_strlen(response)) {
-		ast_log(LOG_WARNING, "Unknown response to CalDAV calendar %s, request %s to %s: %s\n", pvt->owner->name, method, pvt->url, ne_get_error(pvt->session));
+		if (ret != NE_OK) {
+			ast_log(LOG_WARNING, "Unknown response to CalDAV calendar %s, request %s to %s: %s\n", pvt->owner->name, method, buf, ne_get_error(pvt->session));
+		}
 		ast_free(response);
 		return NULL;
 	}
@@ -165,6 +167,7 @@
 
 static int caldav_write_event(struct ast_calendar_event *event)
 {
+	struct caldav_pvt *pvt;
 	struct ast_str *body = NULL, *response = NULL, *subdir = NULL;
 	icalcomponent *calendar, *icalevent;
 	icaltimezone *utc = icaltimezone_get_utc_timezone();
@@ -185,6 +188,8 @@
 		ast_log(LOG_ERROR, "Could not allocate memory for request and response!\n");
 		goto write_cleanup;
 	}
+
+	pvt = event->owner->tech_pvt;
 
 	if (ast_strlen_zero(event->uid)) {
 		unsigned short val[8];
@@ -233,9 +238,9 @@
 	icalcomponent_add_component(calendar, icalevent);
 
 	ast_str_append(&body, 0, "%s", icalcomponent_as_ical_string(calendar));
-	ast_str_set(&subdir, 0, "%s%s.ics", ast_str_buffer(body)[ast_str_strlen(body)] == '/' ? "" : "/", event->uid);
-
-	response = caldav_request(event->owner->tech_pvt, "PUT", body, subdir, "text/calendar");
+	ast_str_set(&subdir, 0, "%s%s.ics", pvt->url[strlen(pvt->url) - 1] == '/' ? "" : "/", event->uid);
+
+	response = caldav_request(pvt, "PUT", body, subdir, "text/calendar");
 
 	ret = 0;