* Detect when a meeting invitation is actually an update for an existing UID

  and tell the user so.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 3758f0a85b6722a5456fe3a3acdaf4c9e4c37fb3..f2e1d440f12491a8a96543db0c545e677b164cb2 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 400.45  2002/10/23 04:11:38  ajc
+* Detect when a meeting invitation is actually an update for an existing UID
+  and tell the user so.
+
 Revision 400.44  2002/10/21 20:16:38  ajc
 * Display conflicts nicely
 
@@ -1090,3 +1094,4 @@ 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/calendar.c b/webcit/calendar.c
index e86e3067ea14957a1f8103ade7c6531cfad16a53..90c3586a3f45bf4905855e59edf114628d49526e 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -84,6 +84,7 @@ void cal_process_object(icalcomponent *cal,
        time_t tt;
        char buf[SIZ];
        char conflict_name[SIZ];
+       int is_update = 0;
 
        /* Leading HTML for the display of this object */
        if (recursion_level == 0) {
@@ -190,10 +191,22 @@ void cal_process_object(icalcomponent *cal,
                if (buf[0] == '1') {
                        while (serv_gets(buf), strcmp(buf, "000")) {
                                extract(conflict_name, buf, 3);
-                               wprintf("<TR><TD><B><I>CONFLICT:</I></B></TD>"
+                               is_update = extract_int(buf, 4);
+                               wprintf("<TR><TD><B><I>%s</I></B></TD>"
                                        "<TD>"
-                                       "This event would conflict with "
-                                       "<I>&quot;"
+                                       "%s "
+                                       "<I>&quot;",
+
+                                       (is_update ?
+                                               "Update:" :
+                                               "CONFLICT:"
+                                       ),
+
+                                       (is_update ?
+                                               "This is an update of" :
+                                               "This event would conflict with"
+                                       )
+               
                                );
                                escputs(conflict_name);
                                wprintf("&quot;</I> "