missed a few

[citadel.git] / webcit / messages.h

diff --git a/webcit/messages.h b/webcit/messages.h
index 7dd909c33668784a34af6e0cc2c2bb192f85a328..32a172a7bfa97a17669c3dbd8d7860faae16fb67 100644 (file)
--- a/webcit/messages.h
+++ b/webcit/messages.h
@@ -14,7 +14,6 @@
 
 extern CtxType CTX_MAILSUM;
 extern CtxType CTX_MIME_ATACH;
-extern HashList *MsgHeaderHandler;
 extern HashList *MimeRenderHandler;
 extern HashList *ReadLoopHandler;
 typedef struct wc_mime_attachment wc_mime_attachment;
@@ -59,28 +58,59 @@ typedef struct _message_summary {
        long    reply_references_hash;
        StrBuf *ReplyTo;
        StrBuf *cccc;
-       StrBuf *hnod;
        StrBuf *AllRcpt;
        StrBuf *Room;
        StrBuf *Rfca;
        StrBuf *EnvTo;
-       StrBuf *OtherNode;
        const StrBuf *PartNum;
-
        HashList *Attachments;  /* list of attachments */
        HashList *Submessages;
        HashList *AttachLinks;
-
        HashList *AllAttach;
-
        int hasattachments;
 
-
        /* The mime part of the message */
        wc_mime_attachment *MsgBody;
 } message_summary;
 void DestroyMessageSummary(void *vMsg);
 
+/* Maps to msgkeys[] in msgbase.c: */
+
+typedef enum _eMessageField {
+       eAuthor,
+       eXclusivID,
+       erFc822Addr,
+       eHumanNode,
+       emessageId,
+       eJournal,
+       eReplyTo,
+       eListID,
+       eMesageText,
+       eNodeName,
+       eOriginalRoom,
+       eMessagePath,
+       eRecipient,
+       eSpecialField,
+       eTimestamp,
+       eMsgSubject,
+       eenVelopeTo,
+       eWeferences,
+       eCarbonCopY,
+       eHeaderOnly,
+       eFormatType,
+       eMessagePart,
+       ePevious,
+       eSubFolder,
+       eLastHeader
+}eMessageField;
+
+extern const char* fieldMnemonics[];
+
+int GetFieldFromMnemonic(eMessageField *f, const char* c);
+
+int EvaluateMsgHdr(const char *HeaderName, long HdrNLen, message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset);
+int EvaluateMsgHdrEnum(eMessageField f, message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset);
+
 
 
 static inline message_summary* GetMessagePtrAt(int n, HashList *Summ)
@@ -120,12 +150,14 @@ enum {
  * @param Line the raw line with your message data
  * @param Msg put your parser results here...
  * @param ConversionBuffer if you need some workbuffer, don't free me!
+ * @param ViewSpecific your view specific context data
  * @returns 0: failure, trash this message. 1: all right, store it
  */
 typedef int (*load_msg_ptrs_detailheaders) (StrBuf *Line, 
                                            const char **pos, 
                                            message_summary *Msg, 
-                                           StrBuf *ConversionBuffer);
+                                           StrBuf *ConversionBuffer,
+                                           void **ViewSpecific);
 
 typedef void (*readloop_servcmd)(char *buf, long bufsize);
 
@@ -170,8 +202,13 @@ typedef struct _SharedMessageStatus {
 
 int load_msg_ptrs(const char *servcmd,
                  const char *filter,
-                 SharedMessageStatus *Stat, 
-                 load_msg_ptrs_detailheaders LH);
+                 StrBuf *FoundCharset,
+                 SharedMessageStatus *Stat,
+                 void **ViewSpecific,
+                 load_msg_ptrs_detailheaders LH,
+                 StrBuf *FetchMessageList,
+                 eMessageField *MessageFieldList,
+                 long HeaderCount);
 
 typedef int (*GetParamsGetServerCall_func)(SharedMessageStatus *Stat, 
                                           void **ViewSpecific, 
@@ -256,7 +293,12 @@ void RegisterReadLoopHandlerset(
         * VALgrindHALLA.
         * it also should release the content for delivery via end_burst() or wDumpContent(1);
         */
-       View_Cleanup_func ViewCleanup
+       View_Cleanup_func ViewCleanup,
+       /**
+        * brofwseListFields schould be a NULL-terminated list of message field mnemonics
+        * that will be the browse vector for the message header list.
+        */
+       const char **browseListFields
        );
 /*
 GetParamsGetServerCall
@@ -272,9 +314,8 @@ RenderView_or_Tail
 int ParseMessageListHeaders_Detail(StrBuf *Line, 
                                   const char **pos, 
                                   message_summary *Msg, 
-                                  StrBuf *ConversionBuffer);
-
-
+                                  StrBuf *ConversionBuffer,
+                                  void **ViewSpecific);
 
 /**
  * @brief function to register the availability to render a specific message
@@ -297,5 +338,4 @@ void RegisterMimeRenderer(const char *HeaderName, long HdrNLen,
  */
 int ReadOneMessageSummary(message_summary *Msg, StrBuf *FoundCharset, StrBuf *Buf);
 
-
 #endif