Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-10 18:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do no thread evaluation when doing filtering

Browse Source 
SVN revision: 2282
This commit is contained in:
Stefan Ritt 2010-01-12 08:07:02 +00:00
parent 3bec9d865b
commit 1b7ea304ec
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/elogd.c
View File

@ -19765,7 +19765,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
/*---- in threaded mode, set date of latest entry of thread ----*/ /*---- in threaded mode, set date of latest entry of thread ----*/
if (threaded) { if (threaded && !filtering) {
for (index = 0; index < n_msg; index++) { for (index = 0; index < n_msg; index++) {
if (!msg_list[index].lbs) if (!msg_list[index].lbs)
continue; continue;
@ -20729,17 +20729,19 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
expand = atoi(getparam("expand")); expand = atoi(getparam("expand"));
} }
level = 0; if (!filtering) {
if (expand == 0 && (!getcfg(lbs->name, "Collapse to last", str, sizeof(str)) || atoi(str) == 1)) { level = 0;
/* search last entry in this thread */ if (expand == 0 && (!getcfg(lbs->name, "Collapse to last", str, sizeof(str)) || atoi(str) == 1)) {
if (reply_to[0]) { /* search last entry in this thread */
search_last_reply(msg_list[index].lbs, &message_id); if (reply_to[0]) {
size = TEXT_SIZE; search_last_reply(msg_list[index].lbs, &message_id);
status = size = TEXT_SIZE;
el_retrieve(msg_list[index].lbs, message_id, date, attr_list, attrib, lbs->n_attr, text, status =
&size, in_reply_to, reply_to, attachment, encoding, locked_by); el_retrieve(msg_list[index].lbs, message_id, date, attr_list, attrib, lbs->n_attr, text,
if (status == SUCCESS) &size, in_reply_to, reply_to, attachment, encoding, locked_by);
level = 1; if (status == SUCCESS)
level = 1;
}
} }
} }
@ -20749,7 +20751,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
isparam("select") ? atoi(getparam("select")) : 0, &n_display, locked_by, 0, re_buf, isparam("select") ? atoi(getparam("select")) : 0, &n_display, locked_by, 0, re_buf,
page_mid, FALSE); page_mid, FALSE);
if (threaded) { if (threaded && !filtering) {
if (reply_to[0] && expand > 0) { if (reply_to[0] && expand > 0) {
p = reply_to; p = reply_to;
do { do {