From: Art Cancro <ajc@citadel.org>
Date: Fri, 14 Mar 2003 04:09:30 +0000 (+0000)
Subject: * test
X-Git-Tag: v7.86~5974
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=a7d8243bc65f21e913176f1b6ababb076ff8184e

* test
---

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index 546badb3e..74e19970d 100644
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -236,14 +236,23 @@ void partstat_as_string(char *buf, icalproperty *attendee) {
 icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
 	icalcomponent *encaps;
 
+	lprintf(9, "ical_encapsulate_subcomponent() called\n");
+
+	if (subcomp == NULL) {
+		lprintf(3, "ERROR: called with NULL argument!\n");
+		return NULL;
+	}
+
 	/* If we're already looking at a full VCALENDAR component,
 	 * don't bother ... just return itself.
 	 */
 	if (icalcomponent_isa(subcomp) == ICAL_VCALENDAR_COMPONENT) {
+		lprintf(9, "Already encapsulated.  Returning itself.\n");
 		return subcomp;
 	}
 
 	/* Encapsulate the VEVENT component into a complete VCALENDAR */
+	lprintf(9, "Creating new calendar component\n");
 	encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
 	if (encaps == NULL) {
 		lprintf(3, "Error at %s:%d - could not allocate component!\n",
@@ -258,14 +267,25 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
 	icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
 
 	/* Encapsulate the subcomponent inside */
+	lprintf(9, "Doing the encapsulation\n");
+
+	lprintf(9, "Here's what we've got so far:\n-----%s\n-----\n",
+		icalcomponent_as_ical_string(encaps)
+	);
+	lprintf(9, "Here's what we want to insert:\n-----%s\n-----\n",
+		icalcomponent_as_ical_string(subcomp)
+	);
+
 	icalcomponent_add_component(encaps, subcomp);
 
 	/* Convert all timestamps to UTC so we don't have to deal with
 	 * stupid VTIMEZONE crap.
 	 */
+	lprintf(9, "Dezonifying it all\n");
 	ical_dezonify(encaps);
 
 	/* Return the object we just created. */
+	lprintf(9, "...done!\n");
 	return(encaps);
 }
 
diff --git a/webcit/event.c b/webcit/event.c
index 324879de6..ef21f0fe9 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -546,11 +546,13 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
 				icalproperty_free(prop);
 			}
 
-			lprintf(9, "adding new property\n");
+			lprintf(9, "adding new property...\n");
 			icalcomponent_add_property(vevent, icalproperty_new_transp(formtransp));
+			lprintf(9, "...added it.\n");
 		}
 
 		/* Give this event a UID if it doesn't have one. */
+		lprintf(9, "Give this event a UID if it doesn't have one.\n");
 		if (icalcomponent_get_first_property(vevent,
 		   ICAL_UID_PROPERTY) == NULL) {
 			generate_new_uid(buf);
@@ -560,14 +562,17 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
 		}
 
 		/* Increment the sequence ID */
+		lprintf(9, "Increment the sequence ID\n");
 		while (prop = icalcomponent_get_first_property(vevent,
 		      ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
 			i = icalproperty_get_sequence(prop);
+			lprintf(9, "Sequence was %d\n", i);
 			if (i > sequence) sequence = i;
 			icalcomponent_remove_property(vevent, prop);
 			icalproperty_free(prop);
 		}
 		++sequence;
+		lprintf(9, "New sequence is %d.  Adding...\n", sequence);
 		icalcomponent_add_property(vevent,
 			icalproperty_new_sequence(sequence)
 		);
@@ -575,6 +580,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
 		/* Set the organizer, only if one does not already exist *and*
 		 * the form is supplying one
 		 */
+		lprintf(9, "Setting the organizer...\n");
 		strcpy(buf, bstr("organizer"));
 		if ( (icalcomponent_get_first_property(vevent,
 		   ICAL_ORGANIZER_PROPERTY) == NULL) 
@@ -591,6 +597,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
 		/*
 		 * Add any new attendees listed in the web form
 		 */
+		lprintf(9, "Add any new attendees\n");
 
 		/* First, strip out the parenthesized partstats.  */
 		strcpy(form_attendees, bstr("attendees"));
@@ -623,7 +630,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
 		/*
 		 * Remove any attendees *not* listed in the web form
 		 */
-STARTOVER:
+STARTOVER:	lprintf(9, "Remove unlisted attendees\n");
 		for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
 			strcpy(attendee_string, icalproperty_get_attendee(attendee));
 			if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
@@ -646,7 +653,9 @@ STARTOVER:
 		/*
 		 * Serialize it and save it to the message base
 		 */
+		lprintf(9, "Encapsulating into full VCALENDAR component\n");
 		encaps = ical_encapsulate_subcomponent(vevent);
+		lprintf(9, "Serializing it for saving\n");
 		if (encaps != NULL) {
 			serv_puts("ENT0 1|||4");
 			serv_gets(buf);
@@ -666,6 +675,7 @@ STARTOVER:
 	/*
 	 * If the user clicked 'Delete' then delete it.
 	 */
+	lprintf(9, "Checking to see if we have to delete an old event\n");
 	if ( (!strcasecmp(bstr("sc"), "Delete")) && (msgnum > 0L) ) {
 		serv_printf("DELE %ld", atol(bstr("msgnum")));
 		serv_gets(buf);