From 9ef325e085d080679915960c2f7f554e23b7cfe9 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Wed, 18 Jan 2006 11:14:08 +0000 Subject: [PATCH] Fixed quick filters with MOptions SVN revision: 1613 --- src/elogd.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/elogd.c b/src/elogd.c index b7d6f11a..bdf55b26 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -16485,6 +16485,13 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa } } + /* search for parameter without '_' coming from quick filter */ + if (isparam(attr_list[i])) { + searched = TRUE; + if (strstr(attrib[i], getparam(attr_list[i]))) + found = TRUE; + } + if (searched && !found) break; @@ -16974,6 +16981,8 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa sprintf(str, "%s_%d", attr_list[i], j); if (isparam(str)) disp_filter = TRUE; + if (isparam(attr_list[i])) + disp_filter = TRUE; } } } @@ -17090,6 +17099,22 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa } } + if (isparam(attr_list[i])) { + comment[0] = 0; + if (attr_flags[i] & AF_ICON) { + sprintf(str, "Icon comment %s", getparam(attr_list[i])); + getcfg(lbs->name, str, comment, sizeof(comment)); + } + + if (line[0]) + strlcat(line, " | ", sizeof(line)); + + if (comment[0] == 0) + strlcat(line, getparam(attr_list[i]), sizeof(line)); + else + strlcat(line, comment, sizeof(line)); + } + if (line[0]) { rsprintf("%s:", attr_list[i]); rsprintf("");