From 19e3216c53390bce9662b3a07d761cd1e1b7c6f8 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 24 Jul 2009 20:51:52 +0000 Subject: [PATCH] * Added new readloop command 'readgt' which will produce messages with numbers greater than the value supplied in the 'gt' variable. This of course maps to the 'MSGS GT|xxx' server command. For my next trick, I will modify the msgomatic selector to use this command, but first, I must find a way to export to the templating engine the value of the first msgnum we retrieved during the *current* operation. --- webcit/messages.c | 5 ++-- webcit/messages.h | 3 ++- webcit/msg_renderers.c | 27 +++++--------------- webcit/static/t/select_messageindex.html | 2 +- webcit/static/t/select_messageindex_all.html | 2 +- webcit/webcit.h | 1 - 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/webcit/messages.c b/webcit/messages.c index 47f6f41c5..55cf61d40 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -817,7 +817,7 @@ extern readloop_struct rlid[]; /* * command loop for reading messages * - * Set oper to "readnew" or "readold" or "readfwd" or "headers" + * Set oper to "readnew" or "readold" or "readfwd" or "headers" or "readgt" */ void readloop(long oper) { @@ -927,7 +927,6 @@ void readloop(long oper) care_for_empty_list = 1; rlid[oper].cmd(cmd, sizeof(cmd)); - SetAccessCommand(oper); if (havebstr("maxmsgs")) maxmsgs = ibstr("maxmsgs"); @@ -1909,6 +1908,7 @@ void h_readold(void) { readloop(readold);} void h_readfwd(void) { readloop(readfwd);} void h_headers(void) { readloop(headers);} void h_do_search(void) { readloop(do_search);} +void h_readgt(void) { readloop(readgt);} void jsonMessageListHdr(void) { @@ -1967,6 +1967,7 @@ InitModule_MSG WebcitAddUrlHandler(HKEY("readold"), h_readold, NEED_URL); WebcitAddUrlHandler(HKEY("readfwd"), h_readfwd, NEED_URL); WebcitAddUrlHandler(HKEY("headers"), h_headers, NEED_URL); + WebcitAddUrlHandler(HKEY("readgt"), h_readgt, NEED_URL); WebcitAddUrlHandler(HKEY("do_search"), h_do_search, 0); WebcitAddUrlHandler(HKEY("display_enter"), display_enter, 0); WebcitAddUrlHandler(HKEY("post"), post_message, 0); diff --git a/webcit/messages.h b/webcit/messages.h index cd2e8ecfc..e004bd051 100644 --- a/webcit/messages.h +++ b/webcit/messages.h @@ -73,7 +73,8 @@ enum { headers, readfwd, readnew, - readold + readold, + readgt }; typedef void (*readloop_servcmd)(char *buf, long bufsize); diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c index 5b3a65886..f17ae5415 100644 --- a/webcit/msg_renderers.c +++ b/webcit/msg_renderers.c @@ -1090,6 +1090,11 @@ void servcmd_readfwd(char *buf, long bufsize) snprintf(buf, bufsize, "MSGS ALL"); } +void servcmd_readgt(char *buf, long bufsize) +{ + snprintf(buf, bufsize, "MSGS GT|%s", bstr("gt")); +} + void servcmd_readnew(char *buf, long bufsize) { snprintf(buf, bufsize, "MSGS NEW"); @@ -1106,30 +1111,12 @@ readloop_struct rlid[] = { { {HKEY("headers")}, servcmd_headers}, { {HKEY("readfwd")}, servcmd_readfwd}, { {HKEY("readnew")}, servcmd_readnew}, - { {HKEY("readold")}, servcmd_readold} + { {HKEY("readold")}, servcmd_readold}, + { {HKEY("readgt")}, servcmd_readgt} }; -void SetAccessCommand(long Oper) -{ -/* TODO: whats achieved by this? - 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); -*/ -} - - - - - void InitModule_MSGRENDERERS (void) diff --git a/webcit/static/t/select_messageindex.html b/webcit/static/t/select_messageindex.html index 5d054acde..558a302aa 100644 --- a/webcit/static/t/select_messageindex.html +++ b/webcit/static/t/select_messageindex.html @@ -1 +1 @@ - + diff --git a/webcit/static/t/select_messageindex_all.html b/webcit/static/t/select_messageindex_all.html index e32694878..e36f687d2 100644 --- a/webcit/static/t/select_messageindex_all.html +++ b/webcit/static/t/select_messageindex_all.html @@ -1 +1 @@ - + diff --git a/webcit/webcit.h b/webcit/webcit.h index 287d0558c..45330cfb8 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -715,7 +715,6 @@ void msgescputs1(char *strbuf); void dump_vars(void); void embed_main_menu(void); -void SetAccessCommand(long Oper); void do_addrbook_view(addrbookent *addrbook, int num_ab); void fetch_ab_name(message_summary *Msg, char **namebuf); void display_vcard(StrBuf *Target, StrBuf *vcard_source, char alpha, int full, char **storename, long msgnum); -- 2.30.2