X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=3c543934546edd44b71707e8251c07aca667c816;hb=72015d547deb7e4632f70ad8dcae2d56ed8bfcca;hp=73fb0f37ccef7852ef1ca0f9d1fb53a462ca9bb2;hpb=172623f613d7a063ded70251cdb18b1e38030e10;p=citadel.git diff --git a/webcit/messages.c b/webcit/messages.c index 73fb0f37c..3c5439345 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -12,6 +12,7 @@ HashList *MsgHeaderHandler = NULL; HashList *MsgEvaluators = NULL; HashList *MimeRenderHandler = NULL; +HashList *ReadLoopHandler = NULL; int dbg_analyze_msg = 0; #define SUBJ_COL_WIDTH_PCT 50 /* Mailbox view column width */ @@ -569,41 +570,37 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu * load message pointers from the server for a "read messages" operation * * servcmd: the citadel command to send to the citserver - * with_headers: also include some of the headers with the message numbers (more expensive) */ -int load_msg_ptrs(const char *servcmd, int with_headers, long *lowest_found, long *highest_found) +int load_msg_ptrs(const char *servcmd, SharedMessageStatus *Stat) { StrBuf* FoundCharset = NULL; wcsession *WCC = WC; message_summary *Msg; StrBuf *Buf, *Buf2; - int nummsgs = 0; - int maxload = 0; long len; int n; int skipit; const char *Ptr = NULL; - if (lowest_found) *lowest_found = LONG_MAX; - if (highest_found) *highest_found = LONG_MIN; + Stat->lowest_found = LONG_MAX; + Stat->highest_found = LONG_MIN; if (WCC->summ != NULL) { DeleteHash(&WCC->summ); } WCC->summ = NewHash(1, Flathash); - maxload = 10000; Buf = NewStrBuf(); serv_puts(servcmd); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) != 1) { FreeStrBuf(&Buf); - return (nummsgs); + return (Stat->nummsgs); } Buf2 = NewStrBuf(); while (len = StrBuf_ServGetln(Buf), ((len != 3) || strcmp(ChrPtr(Buf), "000")!= 0)) { - if (nummsgs < maxload) { + if (Stat->nummsgs < Stat->maxload) { skipit = 0; Ptr = NULL; Msg = (message_summary*)malloc(sizeof(message_summary)); @@ -612,12 +609,12 @@ int load_msg_ptrs(const char *servcmd, int with_headers, long *lowest_found, lon Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|'); Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|'); - if (nummsgs == 0) { - if ((lowest_found) && (Msg->msgnum < *lowest_found)) { - *lowest_found = Msg->msgnum; + if (Stat->nummsgs == 0) { + if (Msg->msgnum < Stat->lowest_found) { + Stat->lowest_found = Msg->msgnum; } - if ((highest_found) && (Msg->msgnum > *highest_found)) { - *highest_found = Msg->msgnum; + if (Msg->msgnum > Stat->highest_found) { + Stat->highest_found = Msg->msgnum; } } @@ -631,7 +628,7 @@ int load_msg_ptrs(const char *servcmd, int with_headers, long *lowest_found, lon * nummsgs should be the same order as the message date. */ if (Msg->date == 0) { - Msg->date = nummsgs; + Msg->date = Stat->nummsgs; if (StrLength(Buf) < 32) skipit = 1; } @@ -680,11 +677,11 @@ int load_msg_ptrs(const char *servcmd, int with_headers, long *lowest_found, lon n = Msg->msgnum; Put(WCC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary); } - nummsgs++; + Stat->nummsgs++; } FreeStrBuf(&Buf2); FreeStrBuf(&Buf); - return (nummsgs); + return (Stat->nummsgs); } @@ -701,97 +698,6 @@ inline message_summary* GetMessagePtrAt(int n, HashList *Summ) } -/* startmsg is an index within the message list. - * starting_from is the Citadel message number to be supplied to a "MSGS GT" operation - */ -long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMessages, long starting_from) -{ - StrBuf *TmpBuf; - wcsession *WCC = WC; - void *vMsg; - int lo, hi; - long ret; - long hklen; - const char *key; - int done = 0; - int nItems; - HashPos *At; - long vector[16]; - WCTemplputParams SubTP; - - memset(&SubTP, 0, sizeof(WCTemplputParams)); - SubTP.Filter.ContextType = CTX_LONGVECTOR; - SubTP.Context = &vector; - TmpBuf = NewStrBufPlain(NULL, SIZ); - At = GetNewHashPos(WCC->summ, nMessages); - nItems = GetCount(WCC->summ); - ret = nMessages; - vector[0] = 7; - vector[2] = 1; - vector[1] = startmsg; - vector[3] = 0; - vector[7] = starting_from; - - while (!done) { - vector[3] = abs(nMessages); - lo = GetHashPosCounter(At); - if (nMessages > 0) { - if (lo + nMessages >= nItems) { - hi = nItems - 1; - vector[3] = nItems - lo; - if (startmsg == lo) - ret = vector[3]; - } - else { - hi = lo + nMessages - 1; - } - } else { - if (lo + nMessages < -1) { - hi = 0; - } - else { - if ((lo % abs(nMessages)) != 0) { - int offset = (lo % abs(nMessages) * - (nMessages / abs(nMessages))); - hi = lo + offset; - vector[3] = abs(offset); - if (startmsg == lo) - ret = offset; - } - else - hi = lo + nMessages; - } - } - done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg); - - /* - * Bump these because although we're thinking in zero base, the user - * is a drooling idiot and is thinking in one base. - */ - vector[4] = lo + 1; - vector[5] = hi + 1; - vector[6] = lo; - FlushStrBuf(TmpBuf); - dbg_print_longvector(vector); - DoTemplate(HKEY("select_messageindex"), TmpBuf, &SubTP); - StrBufAppendBuf(Selector, TmpBuf, 0); - } - vector[6] = 0; - FlushStrBuf(TmpBuf); - if (maxmsgs == 9999999) { - vector[1] = 1; - ret = maxmsgs; - } - else - vector[1] = 0; - vector[2] = 0; - dbg_print_longvector(vector); - DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &SubTP); - StrBufAppendBuf(Selector, TmpBuf, 0); - FreeStrBuf(&TmpBuf); - DeleteHashPos(&At); - return ret; -} void load_seen_flags(void) { @@ -830,6 +736,17 @@ void load_seen_flags(void) extern readloop_struct rlid[]; +typedef struct _RoomRenderer{ + int RoomType; + + GetParamsGetServerCall_func GetParamsGetServerCall; + PrintViewHeader_func PrintViewHeader; + LoadMsgFromServer_func LoadMsgFromServer; + RenderView_or_Tail_func RenderView_or_Tail; + View_Cleanup_func ViewCleanup; +} RoomRenderer; + + /* * command loop for reading messages * @@ -837,328 +754,124 @@ extern readloop_struct rlid[]; */ void readloop(long oper) { - StrBuf *MessageDropdown = NULL; - StrBuf *BBViewToolBar = NULL; + RoomRenderer *ViewMsg; + void *vViewMsg; void *vMsg; message_summary *Msg; char cmd[256] = ""; - char buf[SIZ]; - int a = 0; - int with_headers = 0; - int nummsgs; - long startmsg = 0; - int maxmsgs = 0; - long *displayed_msgs = NULL; - int num_displayed = 0; - int is_singlecard = 0; - struct calview calv; int i; - int lowest_displayed = (-1); - int highest_displayed = 0; - addrbookent *addrbook = NULL; - int num_ab = 0; - int bbs_reverse = 0; wcsession *WCC = WC; HashPos *at; const char *HashKey; long HKLen; - int care_for_empty_list = 0; - int load_seen = 0; - int sortit = 0; - int defaultsortorder = 0; WCTemplputParams SubTP; - char *ab_name; - const StrBuf *Mime; - long lowest_found = (-1); - long highest_found = (-1); + SharedMessageStatus Stat; + void *ViewSpecific; if (havebstr("is_summary") && (1 == (ibstr("is_summary")))) WCC->wc_view = VIEW_MAILBOX; + memset(&Stat, 0, sizeof(SharedMessageStatus)); + Stat.maxload = 10000; + Stat.lowest_found = (-1); + Stat.highest_found = (-1); + GetHash(ReadLoopHandler, IKEY(WCC->wc_view), &vViewMsg); + if (vViewMsg == NULL) { + WCC->wc_view = VIEW_BBS; + GetHash(ReadLoopHandler, IKEY(WCC->wc_view), &vViewMsg); + } + if (vViewMsg == NULL) + return;///TODO: print message + + ViewMsg = (RoomRenderer*) vViewMsg; if (!WCC->is_ajax) { output_headers(1, 1, 1, 0, 0, 0); } else if (WCC->wc_view == VIEW_MAILBOX) { jsonMessageListHdr(); } - switch (WCC->wc_view) { - case VIEW_WIKI: - sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname)); - http_redirect(buf); + switch(ViewMsg->GetParamsGetServerCall( + &Stat, + &ViewSpecific, + oper, + cmd, sizeof(cmd))) + { + case 400: + case 404: + return; - case VIEW_CALBRIEF: - case VIEW_CALENDAR: - load_seen = 1; - strcpy(cmd, "MSGS ALL"); - maxmsgs = 32767; - parse_calendar_view_request(&calv); - break; - case VIEW_TASKS: - strcpy(cmd, "MSGS ALL"); - maxmsgs = 32767; - break; - case VIEW_NOTES: - strcpy(cmd, "MSGS ALL"); - maxmsgs = 32767; - wprintf("
\n"); - break; - case VIEW_ADDRESSBOOK: - is_singlecard = ibstr("is_singlecard"); - if (is_singlecard != 1) { - if (oper == do_search) { - snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query")); - } - else { - strcpy(cmd, "MSGS ALL"); - } - maxmsgs = 9999999; - break; - } - break; - case VIEW_MAILBOX: - if (!WCC->is_ajax) { - new_summary_view(); - return; - } else { - defaultsortorder = 2; - sortit = 1; - load_seen = 1; - care_for_empty_list = 0; - with_headers = 1; - /* Generally using maxmsgs|startmsg is not required - in mailbox view, but we have a 'safemode' for clients - (*cough* Exploder) that simply can't handle too many */ - if (havebstr("maxmsgs")) maxmsgs = ibstr("maxmsgs"); - else maxmsgs = 9999999; - if (havebstr("startmsg")) startmsg = lbstr("startmsg"); - snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1", - (oper == do_search) ? "SEARCH" : "ALL", - (oper == do_search) ? bstr("query") : "" - ); - } - break; - case VIEW_BBS: + case 300: /* the callback hook should do the work for us here, since he knows what to do. */ + return; + case 200: default: - defaultsortorder = 1; - startmsg = -1; - sortit = 1; - care_for_empty_list = 1; - - rlid[oper].cmd(cmd, sizeof(cmd)); - - if (havebstr("maxmsgs")) - maxmsgs = ibstr("maxmsgs"); - if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS; - - if (havebstr("startmsg")) { - startmsg = lbstr("startmsg"); - } - - } - - nummsgs = load_msg_ptrs(cmd, with_headers, &lowest_found, &highest_found); - if (nummsgs == 0) { - if (care_for_empty_list) { - wprintf("