ical_dezonify: rearranged code and added log output

[citadel.git] / citadel / ical_dezonify.c

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index f7ead4e3da53940210662f2876cd134cb8152fa9..318a2ef631d5c2d7d4356755e823e8c5be51da83 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -9,6 +9,7 @@
 
 
 #include "sysdep.h"
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <limits.h>
@@ -22,7 +23,7 @@
 #include "support.h"
 #include "config.h"
 
-#ifdef HAVE_ICAL_H
+#ifdef CITADEL_WITH_CALENDAR_SERVICE
 #include <ical.h>
 #include "ical_dezonify.h"
 
@@ -38,7 +39,7 @@ void ical_dezonify_backend(icalcomponent *cal,
                        icalcomponent *rcal,
                        icalproperty *prop) {
 
-       icaltimezone *t;
+       icaltimezone *t = NULL;
        icalparameter *param;
        const char *tzid;
        struct icaltimetype TheTime;
@@ -48,15 +49,17 @@ void ical_dezonify_backend(icalcomponent *cal,
 
        /* Hunt for a TZID parameter in this property. */
        param = icalproperty_get_first_parameter(prop, ICAL_TZID_PARAMETER);
-       if (param == NULL) return;
 
        /* Get the stringish name of this TZID. */
-       tzid = icalparameter_get_tzid(param);
-       if (tzid == NULL) return;
+       if (param != NULL) {
+               tzid = icalparameter_get_tzid(param);
 
-       /* Convert it to an icaltimezone type. */
-       t = icalcomponent_get_timezone(cal, tzid);
-       if (t == NULL) return;
+               /* Convert it to an icaltimezone type. */
+               if (tzid != NULL) {
+                       t = icalcomponent_get_timezone(cal, tzid);
+               }
+
+       }
 
        /* Now we know the timezone.  Convert to UTC. */
 
@@ -76,12 +79,23 @@ void ical_dezonify_backend(icalcomponent *cal,
                return;
        }
 
-       /* Do the conversion. */
-       icaltimezone_convert_time(&TheTime,
-                               t,
-                               icaltimezone_get_utc_timezone()
-       );
-       TheTime.is_utc = 1;
+       if (TheTime.is_utc) {
+               lprintf(CTDL_DEBUG, "                * This property is ALREADY UTC.\n");
+       }
+       else {
+               /* Do the conversion. */
+               if (t != NULL) {
+                       lprintf(CTDL_DEBUG, "                * Timezone prop found.  Converting to UTC.\n");
+                       icaltimezone_convert_time(&TheTime,
+                                               t,
+                                               icaltimezone_get_utc_timezone()
+                       );
+                       TheTime.is_utc = 1;
+               }
+               else {
+                       lprintf(CTDL_DEBUG, "                * Not UTC but no tzid found; WTF??\n");
+               }
+       }
        icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
 
        /* Now add the converted property back in. */
@@ -150,6 +164,8 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
        icalcomponent *vt = NULL;
 
+       lprintf(CTDL_DEBUG, "ical_dezonify() started\n");
+
        /* Convert all times to UTC */
        ical_dezonify_recur(cal, cal);
 
@@ -160,7 +176,8 @@ void ical_dezonify(icalcomponent *cal) {
                icalcomponent_free(vt);
        }
 
+       lprintf(CTDL_DEBUG, "ical_dezonify() completed\n");
 }
 
 
-#endif /* HAVE_ICAL_H */
+#endif /* CITADEL_WITH_CALENDAR_SERVICE */