* Renamed the "Extended message ID" field to "Exclusive message ID"

  (nothing changes except documentation and internal variable names)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 1e10495959c49c0de35baa0ef63198b5cb0ab33e..13b0d9df450fd7415e812affb8263fcb15cd9b00 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 630.8  2005/01/27 22:05:21  ajc
+ * Renamed the "Extended message ID" field to "Exclusive message ID"
+   (nothing changes except documentation and internal variable names)
+
  Revision 630.7  2005/01/27 21:59:22  ajc
  * serv_vcard.c: changed the logic a bit.  When saving a vCard to a user's
    "My Citadel Config" room, force-feed the vCard a site-compliant UID and
@@ -6326,3 +6330,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 2c34eaa76956a535e5e32c6745919dd467d3060f..98dbafc2714bd5275acc4754d20c546036254e6d 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1874,7 +1874,7 @@ void check_repl(long msgnum, void *userdata) {
 
 
 /*
- * Check to see if any messages already exist which carry the same Extended ID
+ * Check to see if any messages already exist which carry the same Exclusive ID
  * as this one.  
  *
  * If any are found:
@@ -1886,13 +1886,13 @@ int ReplicationChecks(struct CtdlMessage *msg) {
        int abort_this = 0;
 
        lprintf(CTDL_DEBUG, "ReplicationChecks() started\n");
-       /* No extended id?  Don't do anything. */
+       /* No exclusive id?  Don't do anything. */
        if (msg->cm_fields['E'] == NULL) return 0;
        if (strlen(msg->cm_fields['E']) == 0) return 0;
-       lprintf(CTDL_DEBUG, "Extended ID: <%s>\n", msg->cm_fields['E']);
+       lprintf(CTDL_DEBUG, "Exclusive ID: <%s>\n", msg->cm_fields['E']);
 
        CtdlAllocUserData(SYM_REPL, sizeof(struct repl));
-       strcpy(msg_repl->extended_id, msg->cm_fields['E']);
+       strcpy(msg_repl->exclusive_id, msg->cm_fields['E']);
        msg_repl->highest = atol(msg->cm_fields['T']);
 
        template = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
@@ -1901,7 +1901,7 @@ int ReplicationChecks(struct CtdlMessage *msg) {
 
        CtdlForEachMessage(MSGS_ALL, 0L, NULL, template, check_repl, NULL);
 
-       /* If a newer message exists with the same Extended ID, abort
+       /* If a newer message exists with the same Exclusive ID, abort
         * this save.
         */
        if (msg_repl->highest > atol(msg->cm_fields['T']) ) {
@@ -2052,7 +2052,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        lprintf(CTDL_DEBUG, "Performing before-save hooks\n");
        if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-1);
 
-       /* If this message has an Extended ID, perform replication checks */
+       /* If this message has an Exclusive ID, perform replication checks */
        lprintf(CTDL_DEBUG, "Performing replication checks\n");
        if (ReplicationChecks(msg) > 0) return(-1);
 

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index e201ac01366bb884d9af49bc657eda65421b5eb4..876b6e46d4b3e6c9368e9b2b38f2106e7d35cd5a 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -46,7 +46,7 @@ struct ma_info {
 
 
 struct repl {                  /* Info for replication checking */
-       char extended_id[SIZ];
+       char exclusive_id[SIZ];
        time_t highest;
 };
 

diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index eaac72b17c051f952eba6a569d3b615322b875fc..08e090a9bb8079665e279c79e4ef61386f66f161 100644 (file)
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -1663,7 +1663,7 @@ void ical_saving_vevent(icalcomponent *cal) {
  * the summary of the event (becomes message subject),
  * and the start time (becomes message date/time).
  */
-void ical_ctdl_set_extended_msgid(char *name, char *filename, char *partnum,
+void ical_ctdl_set_exclusive_msgid(char *name, char *filename, char *partnum,
                char *disp, void *content, char *cbtype, size_t length,
                char *encoding, void *cbuserdata)
 {
@@ -1676,7 +1676,7 @@ void ical_ctdl_set_extended_msgid(char *name, char *filename, char *partnum,
 
        /* If this is a text/calendar object, hunt for the UID and drop it in
         * the "user data" pointer for the MIME parser.  When
-        * ical_obj_beforesave() sees it there, it'll set the Extended msgid
+        * ical_obj_beforesave() sees it there, it'll set the Exclusive msgid
         * to that string.
         */
        if (!strcasecmp(cbtype, "text/calendar")) {
@@ -1723,7 +1723,7 @@ void ical_ctdl_set_extended_msgid(char *name, char *filename, char *partnum,
 /*
  * See if we need to prevent the object from being saved (we don't allow
  * MIME types other than text/calendar in "calendar" or "tasks"  rooms).  Also,
- * when saving an event to the calendar, set the message's Citadel extended
+ * when saving an event to the calendar, set the message's Citadel exclusive
  * message ID to the UID of the object.  This causes our replication checker to
  * automatically delete any existing instances of the same object.  (Isn't
  * that cool?)
@@ -1758,7 +1758,7 @@ int ical_obj_beforesave(struct CtdlMessage *msg)
                                memset(&imm, 0, sizeof(struct icalmessagemod));
                                mime_parser(msg->cm_fields['M'],
                                        NULL,
-                                       *ical_ctdl_set_extended_msgid,
+                                       *ical_ctdl_set_exclusive_msgid,
                                        NULL, NULL,
                                        (void *)&imm,
                                        0
@@ -1808,7 +1808,7 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
 
        /* If this is a text/calendar object, hunt for the UID and drop it in
         * the "user data" pointer for the MIME parser.  When
-        * ical_obj_beforesave() sees it there, it'll set the Extended msgid
+        * ical_obj_beforesave() sees it there, it'll set the Exclusive msgid
         * to that string.
         */
        if (!strcasecmp(cbtype, "text/calendar")) {

diff --git a/citadel/serv_notes.c b/citadel/serv_notes.c
index 322550df5be6aa076eee6b9245f74fda63563323..15c694874e43cfba62cb38f49237e757e88a33b9 100644 (file)
--- a/citadel/serv_notes.c
+++ b/citadel/serv_notes.c
@@ -47,7 +47,7 @@
 /*
  * If we are in a "notes" view room, and the client has sent an RFC822
  * message containing an X-KOrg-Note-Id: field (Aethera does this, as
- * do some Kolab clients) then set both the Subject and the Extended ID
+ * do some Kolab clients) then set both the Subject and the Exclusive ID
  * of the message to that.  It's going to be a UUID so we want to replace
  * any existing message containing that UUID.
  */

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index b82ffbf9432c1dc15056d1b675833436535fa1f3..49cae5ea888bf379342c3f0d2483d70c38d8ed52 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -15,7 +15,7 @@
 #define ADDRESS_BOOK_ROOM      "Global Address Book"
 
 /*
- * Format of the "Extended ID" field of the message containing a user's
+ * Format of the "Exclusive ID" field of the message containing a user's
  * vCard.  Doesn't matter what it really looks like as long as it's both
  * unique and consistent (because we use it for replication checking to
  * delete the old vCard network-wide when the user enters a new one).
@@ -776,7 +776,7 @@ void vcard_newuser(struct ctdluser *usbuf) {
 /*
  * When a user is being deleted, we have to remove his/her vCard.
  * This is accomplished by issuing a message with 'CANCEL' in the S (special)
- * field, and the same Extended ID as the existing card.
+ * field, and the same Exclusive ID as the existing card.
  */
 void vcard_purge(struct ctdluser *usbuf) {
        struct CtdlMessage *msg;

diff --git a/citadel/techdoc/delivery-list.txt b/citadel/techdoc/delivery-list.txt
index 11c7552fdf10839656d7a859451ff19b77c9b5d1..9395c9442ee43198516bee85e925b2eca98b4f8a 100644 (file)
--- a/citadel/techdoc/delivery-list.txt
+++ b/citadel/techdoc/delivery-list.txt
@@ -10,7 +10,7 @@ hidden room, it does not appear in the known rooms list on subsequent visits).
 message in the queue to be delivered to one or more recipients, there will be
 *two* messages in the room: one containing the actual message, and the other
 containing delivery instructions.  It is expected that the instructions
-message may be replaced at any time (using an Extended ID field) if delivery
+message may be replaced at any time (using an Exclusive ID field) if delivery
 to only some of the recipients has been accomplished.
  
  Citadel keeps reference counts of each message on disk.  Therefore if a

diff --git a/citadel/techdoc/hack.txt b/citadel/techdoc/hack.txt
index bbcb0acd7bfa6f14dcf47c62bb101185959ca98a..252b6313cc39fd386b0227f636eeccf56e2c0da7 100644 (file)
--- a/citadel/techdoc/hack.txt
+++ b/citadel/techdoc/hack.txt
@@ -245,12 +245,12 @@ B Big message     This is a flag which indicates that the message is
                         internal API handles it.
 D      Destination     Contains name of the system this message should
                        be sent to, for mail routing (private mail only).
-E      Extended ID     A persistent alphanumeric Message ID used for
+E      Exclusive ID    A persistent alphanumeric Message ID used for
                        network replication.  When a message arrives that
-                       contains an Extended ID, any existing messages which
-                       contain the same Extended ID and are *older* than this
+                       contains an Exclusive ID, any existing messages which
+                       contain the same Exclusive ID and are *older* than this
                        message should be deleted.  If there exist any messages
-                       with the same Extended ID that are *newer*, then this
+                       with the same Exclusive ID that are *newer*, then this
                        message should be dropped.
 F      rFc822 address  For Internet mail, this is the delivery address of the
                        message author.