Introduce new MSGS mode for threads to avoid breaking old webcit subject lines

diff --git a/citadel/modules/ctdlproto/serv_messages.c b/citadel/modules/ctdlproto/serv_messages.c
index dc221d66d61158b0afd7749615624937b9907bec..4be56cde67508f75b1b8225e25f692fd26872b09 100644 (file)
--- a/citadel/modules/ctdlproto/serv_messages.c
+++ b/citadel/modules/ctdlproto/serv_messages.c
@@ -40,6 +40,7 @@ void simple_listing(long msgnum, void *userdata)
 void headers_listing(long msgnum, void *userdata)
 {
        struct CtdlMessage *msg;
+       int output_mode =  *(int *)userdata;
 
        msg = CtdlFetchMessage(msgnum, 0, 1);
        if (msg == NULL) {
@@ -48,28 +49,37 @@ void headers_listing(long msgnum, void *userdata)
        }
 
        // output all fields except the references hash
-       cprintf("%ld|%s|%s|%s|%s|%s|%d|",
+       cprintf("%ld|%s|%s|%s|%s|%s",
                msgnum,
                (!CM_IsEmpty(msg, eTimestamp) ? msg->cm_fields[eTimestamp] : "0"),
                (!CM_IsEmpty(msg, eAuthor) ? msg->cm_fields[eAuthor] : ""),
                (!CM_IsEmpty(msg, eNodeName) ? msg->cm_fields[eNodeName] : ""),
                (!CM_IsEmpty(msg, erFc822Addr) ? msg->cm_fields[erFc822Addr] : ""),
-               (!CM_IsEmpty(msg, eMsgSubject) ? msg->cm_fields[eMsgSubject] : ""),
-               (!CM_IsEmpty(msg, emessageId) ? HashLittle(msg->cm_fields[emessageId],strlen(msg->cm_fields[emessageId])) : 0)
+               (!CM_IsEmpty(msg, eMsgSubject) ? msg->cm_fields[eMsgSubject] : "")
        );
 
-       // output the references hash (yes it's ok that we're trashing the source buffer by doing this)
-       if (!CM_IsEmpty(msg, eWeferences)) {
-               char *token;
-               char *rest = msg->cm_fields[eWeferences];
-               char *prev = rest;
-               while((token = strtok_r(rest, "|", &rest))) {
-                       cprintf("%d%s", HashLittle(token,rest-prev-(*rest==0?0:1)), (*rest==0?"":","));
-                       prev = rest;
+       if (output_mode == MSG_HDRS_THREADS) {
+
+               // output the references hash
+               cprintf ("|%d|", 
+                       (!CM_IsEmpty(msg, emessageId) ? HashLittle(msg->cm_fields[emessageId],strlen(msg->cm_fields[emessageId])) : 0)
+               );
+       
+               // output the references hash (yes it's ok that we're trashing the source buffer by doing this)
+               if (!CM_IsEmpty(msg, eWeferences)) {
+                       char *token;
+                       char *rest = msg->cm_fields[eWeferences];
+                       char *prev = rest;
+                       while((token = strtok_r(rest, "|", &rest))) {
+                               cprintf("%d%s", HashLittle(token,rest-prev-(*rest==0?0:1)), (*rest==0?"":","));
+                               prev = rest;
+                       }
                }
+       
+               cprintf("|");
        }
 
-       cprintf("|\n");
+       cprintf("\n");
        CM_Free(msg);
 }
 
@@ -157,22 +167,23 @@ void cmd_msgs(char *cmdbuf)
        cm_ref = extract_int(cmdbuf, 1);
        extract_token(search_string, cmdbuf, 1, '|', sizeof search_string);
        with_template = extract_int(cmdbuf, 2);
-       switch (extract_int(cmdbuf, 3))
-       {
-       default:
-       case MSG_HDRS_BRIEF:
-               CallBack = simple_listing;
-               break;
-       case MSG_HDRS_ALL:
-               CallBack = headers_listing;
-               break;
-       case MSG_HDRS_EUID:
-               CallBack = headers_euid;
-               break;
-       case MSG_HDRS_BRIEFFILTER:
-               with_template = 2;
-               CallBack = headers_brief_filter;
-               break;
+       int output_mode = extract_int(cmdbuf, 3);
+       switch (output_mode) {
+               default:
+               case MSG_HDRS_BRIEF:
+                       CallBack = simple_listing;
+                       break;
+               case MSG_HDRS_ALL:
+               case MSG_HDRS_THREADS:
+                       CallBack = headers_listing;
+                       break;
+               case MSG_HDRS_EUID:
+                       CallBack = headers_euid;
+                       break;
+               case MSG_HDRS_BRIEFFILTER:
+                       with_template = 2;
+                       CallBack = headers_brief_filter;
+                       break;
        }
 
        strcat(which, "   ");
@@ -255,7 +266,7 @@ void cmd_msgs(char *cmdbuf)
                                   NULL,
                                   template,
                                   CallBack,
-                                  NULL);
+                                  &output_mode);
                if (template != NULL) CM_Free(template);
        }
        else {

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index c19dbbe3d4ee00692e583da8c937179e7c7a0e25..90be427f87613dd7a2afb90ed28d22fabc194eaa 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -19,7 +19,8 @@ enum {
        MSG_HDRS_BRIEF = 0,
        MSG_HDRS_ALL = 1,
        MSG_HDRS_EUID = 4,
-       MSG_HDRS_BRIEFFILTER = 8
+       MSG_HDRS_BRIEFFILTER = 8,
+       MSG_HDRS_THREADS = 9
 };
 
 /*