* availability.c: brought over ical_ctdl_is_overlap() from Citadel. Used

  it to complete the free/busy checking for attendee availability.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 0ff80972d9f3460433d28ee43beb7134a808ba44..99aef41ac6c71fb460585c1b5261988aa1c57623 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 410.40  2003/05/26 21:05:42  ajc
+* availability.c: brought over ical_ctdl_is_overlap() from Citadel.  Used
+  it to complete the free/busy checking for attendee availability.
+
 Revision 410.39  2003/05/26 05:44:45  ajc
 * event.c: fix compiler warning
 
@@ -1436,4 +1440,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/availability.c b/webcit/availability.c
index 8fa41bf7f3532160311856424df15a882cb0c432..3b89cc08f11778784007f0cb4303a137b75b8cdb 100644 (file)
--- a/webcit/availability.c
+++ b/webcit/availability.c
@@ -62,6 +62,70 @@ icalcomponent *get_freebusy_for_user(char *who) {
 
 
 
+
+
+
+
+/*
+ * Check to see if two events overlap.  Returns nonzero if they do.
+ * (This function is used in both Citadel and WebCit.  If you change it in
+ * one place, change it in the other.  Better yet, put it in a library.)
+ */
+int ical_ctdl_is_overlap(
+                       struct icaltimetype t1start,
+                       struct icaltimetype t1end,
+                       struct icaltimetype t2start,
+                       struct icaltimetype t2end
+) {
+
+       if (icaltime_is_null_time(t1start)) return(0);
+       if (icaltime_is_null_time(t2start)) return(0);
+
+       /* First, check for all-day events */
+       if (t1start.is_date) {
+               if (!icaltime_compare_date_only(t1start, t2start)) {
+                       return(1);
+               }
+               if (!icaltime_is_null_time(t2end)) {
+                       if (!icaltime_compare_date_only(t1start, t2end)) {
+                               return(1);
+                       }
+               }
+       }
+
+       if (t2start.is_date) {
+               if (!icaltime_compare_date_only(t2start, t1start)) {
+                       return(1);
+               }
+               if (!icaltime_is_null_time(t1end)) {
+                       if (!icaltime_compare_date_only(t2start, t1end)) {
+                               return(1);
+                       }
+               }
+       }
+
+       /* Now check for overlaps using date *and* time. */
+
+       /* First, bail out if either event 1 or event 2 is missing end time. */
+       if (icaltime_is_null_time(t1end)) return(0);
+       if (icaltime_is_null_time(t2end)) return(0);
+
+       /* If event 1 ends before event 2 starts, we're in the clear. */
+       if (icaltime_compare(t1end, t2start) <= 0) return(0);
+
+       /* If event 2 ends before event 1 starts, we're also ok. */
+       if (icaltime_compare(t2end, t1start) <= 0) return(0);
+
+       /* Otherwise, they overlap. */
+       return(1);
+}
+
+
+
+
+
+
+
 /*
  * Back end function for check_attendee_availability()
  * This one checks an individual attendee against a supplied
@@ -76,6 +140,7 @@ void check_individual_attendee(char *attendee_string,
        icalcomponent *fbc = NULL;
        icalcomponent *fb = NULL;
        icalproperty *thisfb = NULL;
+       struct icalperiodtype period;
 
        /* Set to 'unknown' right from the beginning.  Unless we learn
         * something else, that's what we'll go with.
@@ -105,8 +170,13 @@ void check_individual_attendee(char *attendee_string,
                for (thisfb = icalcomponent_get_first_property(fb, ICAL_FREEBUSY_PROPERTY);
                    thisfb != NULL;
                    thisfb = icalcomponent_get_next_property(fb, ICAL_FREEBUSY_PROPERTY) ) {
-       
-                       /* FIXME ... do the check */
+
+                       /* Do the check */
+                       period = icalproperty_get_freebusy(thisfb);
+                       if (ical_ctdl_is_overlap(period.start, period.end,
+                          event_start, event_end)) {
+                               strcpy(annotation, "BUSY");
+                       }
 
                }
        }
@@ -116,6 +186,7 @@ void check_individual_attendee(char *attendee_string,
 
 
 
+
 /*
  * Check the availability of all attendees for an event (when possible)
  * and annotate accordingly.
@@ -150,6 +221,8 @@ void check_attendee_availability(icalcomponent *vevent) {
                return;
        }
 
+       ical_dezonify(vevent);          /* Convert everything to UTC */
+
        /*
         * Learn the start and end times.
         */