* add first draft of group-change detection

[citadel.git] / webcit / msg_renderers.c

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 97e0b66f9f4fe566baa83a53b430dbcf729feb2a..6ac25d56af629fd33fd4155bf74e1c6fec5b0da7 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -63,7 +63,11 @@ void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc e
 
 void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc MimeRenderer)
 {
-       Put(MimeRenderHandler, HeaderName, HdrNLen, MimeRenderer, reference_free_handler);
+       RenderMimeFuncStruct *f;
+
+       f = (RenderMimeFuncStruct*) malloc(sizeof(RenderMimeFuncStruct));
+       f->f = MimeRenderer;
+       Put(MimeRenderHandler, HeaderName, HdrNLen, f, NULL);
        
 }
 
@@ -120,6 +124,17 @@ int summcmp_rsubj(const void *s1, const void *s2) {
        summ2 = (message_summary *)GetSearchPayload(s2);
        return strcasecmp(ChrPtr(summ2->subj), ChrPtr(summ1->subj));
 }
+/*
+ * comparator for message summary structs by descending subject.
+ */
+int groupchange_subj(const void *s1, const void *s2) {
+       message_summary *summ1;
+       message_summary *summ2;
+       
+       summ1 = (message_summary *)s1;
+       summ2 = (message_summary *)s2;
+       return ChrPtr(summ2->subj)[0] != ChrPtr(summ1->subj)[0];
+}
 
 /*
  * comparator for message summary structs by ascending sender.
@@ -144,6 +159,18 @@ int summcmp_rsender(const void *s1, const void *s2) {
        summ2 = (message_summary *)GetSearchPayload(s2);
        return strcasecmp(ChrPtr(summ2->from), ChrPtr(summ1->from));
 }
+/*
+ * comparator for message summary structs by descending sender.
+ */
+int groupchange_sender(const void *s1, const void *s2) {
+       message_summary *summ1;
+       message_summary *summ2;
+       
+       summ1 = (message_summary *)s1;
+       summ2 = (message_summary *)s2;
+       return strcasecmp(ChrPtr(summ2->from), ChrPtr(summ1->from)) != 0;
+
+}
 
 /*
  * comparator for message summary structs by ascending date.
@@ -175,6 +202,21 @@ int summcmp_rdate(const void *s1, const void *s2) {
        else return 0;
 }
 
+/*
+ * comparator for message summary structs by descending date.
+ */
+const long DAYSECONDS = 24 * 60 * 60;
+int groupchange_date(const void *s1, const void *s2) {
+       message_summary *summ1;
+       message_summary *summ2;
+       
+       summ1 = (message_summary *)s1;
+       summ2 = (message_summary *)s2;
+
+       return (summ1->date % DAYSECONDS) != (summ2->date %DAYSECONDS);
+}
+
+
 /*----------------------------------------------------------------------------*/
 /* Don't wanna know... or? */
 void examine_pref(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {return;}
@@ -182,7 +224,7 @@ void examine_suff(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {
 void examine_path(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {return;}
 void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
-////TODO: do we care?
+/* TODO: do we care? */
 }
 
 void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
@@ -225,7 +267,8 @@ void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
        StrBuf_RFC822_to_Utf8(Msg->subj, HdrLine, WC->DefaultCharset, FoundCharset);
 }
 void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{/////TODO: Fwd: and RE: filter!!
+{/*////TODO: Fwd: and RE: filter!!*/
+
        message_summary *Msg = (message_summary*) Context;
        StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->subj, 0);
 }
@@ -498,7 +541,7 @@ void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime)
            GetHash(MimeRenderHandler, SKEY(Mime->ContentType), &vMimeRenderer) &&
            vMimeRenderer != NULL)
        {
-               Mime->Renderer = (RenderMimeFunc) vMimeRenderer;
+               Mime->Renderer = (RenderMimeFuncStruct*) vMimeRenderer;
                if (Msg->Submessages == NULL)
                        Msg->Submessages = NewHash(1,NULL);
                Put(Msg->Submessages, SKEY(Mime->PartNum), Mime, reference_free_handler);
@@ -664,7 +707,7 @@ void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, int nArgs, WCTemplateToken *Tokens
        long MsgNum;
        StrBuf *Buf;
 
-       MsgNum = LBstr(Tokens->Params[0]->Start, Tokens->Params[0]->len);
+       MsgNum = LBstr(TKEY(0));
        Buf = NewStrBuf();
        read_message(Buf, HKEY("view_message_replyquote"), MsgNum, 0, NULL);
        StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Buf, 1);
@@ -902,9 +945,9 @@ void tmplput_MIME_Data(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void
 {
        wc_mime_attachment *mime = (wc_mime_attachment*) Context;
        if (mime->Renderer != NULL)
-               mime->Renderer(mime, NULL, NULL);
+               mime->Renderer->f(mime, NULL, NULL);
        StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Data, 0);
- /// TODO: check whether we need to load it now?
+       /* TODO: check whether we need to load it now? */
 }
 
 void tmplput_MIME_LoadData(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
@@ -982,7 +1025,18 @@ readloop_struct rlid[] = {
 
 
 
+void SetAccessCommand(long Oper)
+{
+       wcsession *WCC = WC;    
 
+       if (WCC->UrlFragment1 != NULL ) {
+               FlushStrBuf(WCC->UrlFragment1);
+               StrBufAppendBufPlain(WCC->UrlFragment1, 
+                                    rlid[Oper].name.Key, rlid[Oper].name.len, 0);
+       }
+       else 
+               WCC->UrlFragment1 = NewStrBufPlain(rlid[Oper].name.Key, rlid[Oper].name.len);
+}
                
 
 
@@ -996,21 +1050,24 @@ InitModule_MSGRENDERERS
                         NULL, 0,
                         summcmp_date,
                         summcmp_rdate,
+                        groupchange_date,
                         CTX_MAILSUM);
        RegisterSortFunc(HKEY("subject"), 
                         NULL, 0,
                         summcmp_subj,
                         summcmp_rsubj,
+                        groupchange_subj,
                         CTX_MAILSUM);
        RegisterSortFunc(HKEY("sender"),
                         NULL, 0,
                         summcmp_sender,
                         summcmp_rsender,
+                        groupchange_sender,
                         CTX_MAILSUM);
 
        /* iterate over all known mails in WC->summ */
        RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All,
-                        NULL,NULL, CTX_MAILSUM, CTX_NONE);
+                        NULL,NULL, CTX_MAILSUM, CTX_NONE, IT_NOFLAG);
 
        /* render parts of the message struct */
        RegisterNamespace("MAIL:SUMM:DATESTR", 0, 0, tmplput_MAIL_SUMM_DATE_STR, CTX_MAILSUM);
@@ -1044,13 +1101,13 @@ InitModule_MSGRENDERERS
        RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH:LINKS"), 0, Conditional_MAIL_MIME_ATTACHLINKS, CTX_MAILSUM);
        RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH:ATT"), 0, Conditional_MAIL_MIME_ATTACH, CTX_MAILSUM);
        RegisterIterator("MAIL:MIME:ATTACH", 0, NULL, iterate_get_mime_All, 
-                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
+                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
        RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, 
-                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
+                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
        RegisterIterator("MAIL:MIME:ATTACH:LINKS", 0, NULL, iterate_get_mime_AttachLinks, 
-                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
+                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
        RegisterIterator("MAIL:MIME:ATTACH:ATT", 0, NULL, iterate_get_mime_Attachments, 
-                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
+                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
 
        /* Parts of a mime attachent */
        RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, CTX_MIME_ATACH);
@@ -1067,7 +1124,7 @@ InitModule_MSGRENDERERS
 
        /* iterate the WC->attachments; use the above tokens for their contents */
        RegisterIterator("MSG:ATTACHNAMES", 0, NULL, iterate_get_registered_Attachments, 
-                        NULL, NULL, CTX_MIME_ATACH, CTX_NONE);
+                        NULL, NULL, CTX_MIME_ATACH, CTX_NONE, IT_NOFLAG);
 
        /* mime renderers translate an attachment into webcit viewable html text */
        RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL);