* More vCard-related debugging

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index ca2d130f4e50bacd770247508643034700d9c9dc..796c725e7424a5fcc522a7471a16391ed5ccabc4 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -746,6 +746,9 @@ void output_message(char *msgid, int mode, int headers_only)
                if (TheMessage->cm_fields['U']) {
                        cprintf("subj=%s\n", TheMessage->cm_fields['U']);
                }
+               if (TheMessage->cm_fields['Z']) {
+                       cprintf("zaps=%s\n", TheMessage->cm_fields['Z']);
+               }
        }
 
        /* begin header processing loop for RFC822 transfer format */
@@ -1078,8 +1081,8 @@ void serialize_message(struct ser_ret *ret,               /* return values */
        ret->ser[1] = msg->cm_anon_type;
        ret->ser[2] = msg->cm_format_type;
        wlen = 3;
-       lprintf(9, "stuff\n");
 
+       lprintf(9, "stuff\n");
        for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) {
                ret->ser[wlen++] = (char)forder[i];
                strcpy(&ret->ser[wlen], msg->cm_fields[(int)forder[i]]);
@@ -1087,6 +1090,7 @@ void serialize_message(struct ser_ret *ret,               /* return values */
        }
        if (ret->len != wlen) lprintf(3, "ERROR: len=%d wlen=%d\n",
                ret->len, wlen);
+       lprintf(9, "done serializing\n");
 
        return;
 }
@@ -1918,7 +1922,8 @@ void CtdlWriteObject(char *req_room,              /* Room to stuff it in */
                        char *tempfilename,     /* Where to fetch it from */
                        struct usersupp *is_mailbox,    /* Mailbox room? */
                        int is_binary,          /* Is encoding necessary? */
-                       int is_unique           /* Del others of this type? */
+                       int is_unique,          /* Del others of this type? */
+                       unsigned int flags      /* Internal save flags */
                        )
 {
 
@@ -1935,7 +1940,7 @@ void CtdlWriteObject(char *req_room,              /* Room to stuff it in */
                MailboxName(roomname, is_mailbox, req_room);
        else
                safestrncpy(roomname, req_room, sizeof(roomname));
-       lprintf(9, "CtdlWriteObject() to <%s>\n", roomname);
+       lprintf(9, "CtdlWriteObject() to <%s> (flags=%d)\n", roomname, flags);
 
        strcpy(filename, tmpnam(NULL));
        fp = fopen(filename, "w");
@@ -1975,9 +1980,10 @@ void CtdlWriteObject(char *req_room,             /* Room to stuff it in */
        msg->cm_anon_type = MES_NORMAL;
        msg->cm_format_type = 4;
        msg->cm_fields['A'] = strdoop(CC->usersupp.fullname);
-       msg->cm_fields['O'] = strdoop(roomname);
+       msg->cm_fields['O'] = strdoop(req_room);
        msg->cm_fields['N'] = strdoop(config.c_nodename);
        msg->cm_fields['H'] = strdoop(config.c_humannode);
+       msg->cm_flags = flags;
        
        lprintf(9, "Loading\n");
        fp = fopen(filename, "rb");