When finding a non-UTC timestamp with no time

[citadel.git] / citadel / ical_dezonify.c

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index 6a49cad4cc7cf39641d01580d28e1e7c266e6749..06fdb19a14918c97f94065cccf6371268bd217c5 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -2,13 +2,14 @@
  * $Id$ 
  *
  * Function to go through an ical component set and convert all non-UTC
- * DTSTART and DTEND properties to UTC.  It also strips out any VTIMEZONE
+ * date/time properties to UTC.  It also strips out any VTIMEZONE
  * subcomponents afterwards, because they're irrelevant.
  *
  */
 
 
 #include "sysdep.h"
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <limits.h>
@@ -22,18 +23,38 @@
 #include "support.h"
 #include "config.h"
 
-#ifdef HAVE_ICAL_H
+#ifdef CITADEL_WITH_CALENDAR_SERVICE
 #include <ical.h>
 #include "ical_dezonify.h"
 
+icaltimezone *get_default_icaltimezone(void) {
+
+        char *location = NULL;
+        icaltimezone *zone = NULL;
+
+        location = "America/New_York";
+        if (location) {
+                zone = icaltimezone_get_builtin_timezone (location);
+        }
+        if (!zone)
+                zone = icaltimezone_get_utc_timezone ();
+
+        return zone;
+}
+
+
 /*
  * Back end function for ical_dezonify()
  *
- * We supply this with the master component and the property (which will
- * be a DTSTART or DTEND) which we want to convert to UTC.
+ * We supply this with the master component, the relevant component,
+ * and the property (which will be a DTSTART, DTEND, etc.)
+ * which we want to convert to UTC.
  */
-void ical_dezonify_backend(icalcomponent *cal, icalproperty *prop) {
-       icaltimezone *t;
+void ical_dezonify_backend(icalcomponent *cal,
+                       icalcomponent *rcal,
+                       icalproperty *prop) {
+
+       icaltimezone *t = NULL;
        icalparameter *param;
        const char *tzid;
        struct icaltimetype TheTime;
@@ -43,15 +64,17 @@ void ical_dezonify_backend(icalcomponent *cal, icalproperty *prop) {
 
        /* 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. */
 
@@ -61,24 +84,52 @@ void ical_dezonify_backend(icalcomponent *cal, icalproperty *prop) {
        else if (icalproperty_isa(prop) == ICAL_DTEND_PROPERTY) {
                TheTime = icalproperty_get_dtend(prop);
        }
+       else if (icalproperty_isa(prop) == ICAL_DUE_PROPERTY) {
+               TheTime = icalproperty_get_due(prop);
+       }
+       else if (icalproperty_isa(prop) == ICAL_EXDATE_PROPERTY) {
+               TheTime = icalproperty_get_exdate(prop);
+       }
+       else {
+               return;
+       }
 
-       /* Do the conversion.
-        */
-       icaltimezone_convert_time(&TheTime,
-                               t,
-                               icaltimezone_get_utc_timezone()
-       );
-
-       /* Now strip the TZID parameter, because it's incorrect now. */
-       icalproperty_remove_parameter(prop, ICAL_TZID_PARAMETER);
+       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()
+                       );
+               }
+               else {
+                       lprintf(CTDL_DEBUG, "                * Converting default timezone to UTC.\n");
+                       icaltimezone_convert_time(&TheTime,
+                                               get_default_icaltimezone(),
+                                               icaltimezone_get_utc_timezone()
+                       );
+               }
+               TheTime.is_utc = 1;
+       }
+       icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
 
+       /* Now add the converted property back in. */
        if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
                icalproperty_set_dtstart(prop, TheTime);
        }
        else if (icalproperty_isa(prop) == ICAL_DTEND_PROPERTY) {
                icalproperty_set_dtend(prop, TheTime);
        }
-
+       else if (icalproperty_isa(prop) == ICAL_DUE_PROPERTY) {
+               icalproperty_set_due(prop, TheTime);
+       }
+       else if (icalproperty_isa(prop) == ICAL_EXDATE_PROPERTY) {
+               icalproperty_set_exdate(prop, TheTime);
+       }
 }
 
 
@@ -115,8 +166,10 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) {
                if (
                        (icalproperty_isa(p) == ICAL_DTSTART_PROPERTY)
                        || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY)
+                       || (icalproperty_isa(p) == ICAL_DUE_PROPERTY)
+                       || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY)
                   ) {
-                       ical_dezonify_backend(cal, p);
+                       ical_dezonify_backend(cal, rcal, p);
                }
        }
 }
@@ -130,6 +183,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);
 
@@ -139,6 +194,9 @@ void ical_dezonify(icalcomponent *cal) {
                icalcomponent_remove_component(cal, vt);
                icalcomponent_free(vt);
        }
+
+       lprintf(CTDL_DEBUG, "ical_dezonify() completed\n");
 }
 
-#endif /* HAVE_ICAL_H */
+
+#endif /* CITADEL_WITH_CALENDAR_SERVICE */