projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5aeb0a3
)
* Cleaned up some overly verbose log messages
author
Art Cancro
<ajc@citadel.org>
Fri, 2 Jan 2009 17:43:32 +0000
(17:43 +0000)
committer
Art Cancro
<ajc@citadel.org>
Fri, 2 Jan 2009 17:43:32 +0000
(17:43 +0000)
citadel/modules/calendar/serv_calendar.c
patch
|
blob
|
history
diff --git
a/citadel/modules/calendar/serv_calendar.c
b/citadel/modules/calendar/serv_calendar.c
index 8f49b4e85c94fe83f30ea32f94b07bee7efd474b..66a4c7c93e2fb10b50fbe8bc8d7b96662d5062e9 100644
(file)
--- a/
citadel/modules/calendar/serv_calendar.c
+++ b/
citadel/modules/calendar/serv_calendar.c
@@
-1346,6
+1346,8
@@
void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) {
dtstart = icalrecur_iterator_next(ritr);
if (!icaltime_is_null_time(dtend)) {
dtend = icaltime_add(dtstart, dur);
dtstart = icalrecur_iterator_next(ritr);
if (!icaltime_is_null_time(dtend)) {
dtend = icaltime_add(dtstart, dur);
+ dtend.zone = dtstart.zone;
+ dtend.is_utc = dtstart.is_utc;
}
++num_recur;
}
}
++num_recur;
}
@@
-1648,7
+1650,7
@@
void ical_getics(void)
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
- CtdlLogPrintf(CTDL_
DEBUG
, "ERROR: could not allocate component!\n");
+ CtdlLogPrintf(CTDL_
ALERT
, "ERROR: could not allocate component!\n");
cprintf("%d Could not allocate memory\n", ERROR+INTERNAL_ERROR);
return;
}
cprintf("%d Could not allocate memory\n", ERROR+INTERNAL_ERROR);
return;
}
@@
-2047,7
+2049,7
@@
void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
/* Encapsulate the VEVENT component into a complete VCALENDAR */
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
/* Encapsulate the VEVENT component into a complete VCALENDAR */
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
- CtdlLogPrintf(CTDL_
DEBUG
, "ERROR: could not allocate component!\n");
+ CtdlLogPrintf(CTDL_
ALERT
, "ERROR: could not allocate component!\n");
icalcomponent_free(the_request);
return;
}
icalcomponent_free(the_request);
return;
}
@@
-2081,9
+2083,6
@@
void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
|| (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY)
) {
t = icalproperty_get_dtstart(p); // it's safe to use dtstart for all of them
|| (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY)
) {
t = icalproperty_get_dtstart(p); // it's safe to use dtstart for all of them
- CtdlLogPrintf(CTDL_DEBUG, "Found an icaltimetype: %s\n",
- icaltime_as_ical_string(t)
- );
/* First see if there's a timezone attached to the data structure itself */
if (icaltime_is_utc(t)) {
/* First see if there's a timezone attached to the data structure itself */
if (icaltime_is_utc(t)) {
@@
-2092,7
+2091,6
@@
void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
else {
z = icaltime_get_timezone(t);
}
else {
z = icaltime_get_timezone(t);
}
- if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone is present in data structure\n");
/* If not, try to determine the tzid from the parameter using attached zones */
if (!z) {
/* If not, try to determine the tzid from the parameter using attached zones */
if (!z) {
@@
-2101,7
+2099,6
@@
void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER)
)
);
icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER)
)
);
- if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone was found in attached zones\n");
}
/* Still no good? Try our internal database */
}
/* Still no good? Try our internal database */
@@
-2111,21
+2108,20
@@
void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER)
)
);
icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER)
)
);
- if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone was found in internal db\n");
}
if (z) {
}
if (z) {
- CtdlLogPrintf(CTDL_DEBUG, "Have valid timezone, need to attach it.\n");
+ /* We have a valid timezone. Good. Now we need to attach it. */
zone_already_attached = 0;
for (i=0; i<5; ++i) {
if (z == attached_zones[i]) {
zone_already_attached = 0;
for (i=0; i<5; ++i) {
if (z == attached_zones[i]) {
+ /* We've already got this one, no need to attach another. */
++zone_already_attached;
++zone_already_attached;
- CtdlLogPrintf(CTDL_DEBUG, "zone already attached!!\n");
}
}
if ((!zone_already_attached) && (num_zones_attached < 5)) {
}
}
if ((!zone_already_attached) && (num_zones_attached < 5)) {
- CtdlLogPrintf(CTDL_DEBUG, "attach zone %d\n", num_zones_attached);
+ /* This is a new one, so attach it. */
attached_zones[num_zones_attached++] = z;
}
attached_zones[num_zones_attached++] = z;
}
@@
-2154,8
+2150,6
@@
void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
icalcomponent_free(encaps); /* Don't need this anymore. */
if (serialized_request == NULL) return;
icalcomponent_free(encaps); /* Don't need this anymore. */
if (serialized_request == NULL) return;
- CtdlLogPrintf(CTDL_DEBUG, "SENDING INVITATIONS:\n%s\n", serialized_request);
-
reqsize = strlen(serialized_request) + SIZ;
request_message_text = malloc(reqsize);
if (request_message_text != NULL) {
reqsize = strlen(serialized_request) + SIZ;
request_message_text = malloc(reqsize);
if (request_message_text != NULL) {