Changed the way we log errors if serv_vcard cannot create a netconfig file.

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 49f634595e8f4259a18034e36247632aa6a7a064..93c673faa3c1a245962136cd48c36ebdcdb5757d 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -45,7 +45,7 @@ int MessageDebugEnabled = 0;
  * These are the four-character field headers we use when outputting
  * messages in Citadel format (as opposed to RFC822 format).
  */
-char *msgkeys[] = {
+char *msgkeys[91] = {
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
@@ -55,33 +55,58 @@ char *msgkeys[] = {
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
        NULL, 
-       "from", /* A */
-       NULL,   /* B */
-       NULL,   /* C */
-       NULL,   /* D */
-       "exti", /* E */
-       "rfca", /* F */
+       "from", /* A -> eAuthor       */
+       NULL,   /* B -> eBig_message  */
+       NULL,   /* C -> eRemoteRoom   */
+       NULL,   /* D -> eDestination  */
+       "exti", /* E -> eXclusivID    */
+       "rfca", /* F -> erFc822Addr   */
        NULL,   /* G */
-       "hnod", /* H */
-       "msgn", /* I */
-       "jrnl", /* J */
-       "rep2", /* K */
-       "list", /* L */
-       "text", /* M */
-       "node", /* N */
-       "room", /* O */
-       "path", /* P */
+       "hnod", /* H -> eHumanNode    */
+       "msgn", /* I -> emessageId    */
+       "jrnl", /* J -> eJournal      */
+       "rep2", /* K -> eReplyTo      */
+       "list", /* L -> eListID       */
+       "text", /* M -> eMesageText   */
+       "node", /* N -> eNodeName     */
+       "room", /* O -> eOriginalRoom */
+       "path", /* P -> eMessagePath  */
        NULL,   /* Q */
-       "rcpt", /* R */
-       "spec", /* S */
-       "time", /* T */
-       "subj", /* U */
-       "nvto", /* V */
-       "wefw", /* W */
+       "rcpt", /* R -> eRecipient    */
+       "spec", /* S -> eSpecialField */
+       "time", /* T -> eTimestamp    */
+       "subj", /* U -> eMsgSubject   */
+       "nvto", /* V -> eenVelopeTo   */
+       "wefw", /* W -> eWeferences   */
        NULL,   /* X */
-       "cccc", /* Y */
-       NULL    /* Z */
+       "cccc", /* Y -> eCarbonCopY   */
+       NULL   /* Z */
+
 };
+HashList *msgKeyLookup = NULL;
+
+int GetFieldFromMnemonic(eMsgField *f, const char* c)
+{
+       void *v = NULL;
+       if (GetHash(msgKeyLookup, c, 4, &v)) {
+               *f = (eMsgField) v;
+               return 1;
+       }
+       return 0;
+}
+
+void FillMsgKeyLookupTable(void)
+{
+       long i;
+
+       msgKeyLookup = NewHash (1, FourHash);
+
+       for (i=0; i < 91; i++) {
+               if (msgkeys[i] != NULL) {
+                       Put(msgKeyLookup, msgkeys[i], 4, (void*)i, reference_free_handler);
+               }
+       }
+}
 
 eMsgField FieldOrder[]  = {
 /* Important fields */
@@ -4120,6 +4145,7 @@ void SetMessageDebugEnabled(const int n)
 CTDL_MODULE_INIT(msgbase)
 {
        if (!threading) {
+               FillMsgKeyLookupTable();
                CtdlRegisterDebugFlagHook(HKEY("messages"), SetMessageDebugEnabled, &MessageDebugEnabled);
        }