Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added condition evaluation in list display

Browse Source 
SVN revision: 1441
This commit is contained in:
Stefan Ritt 2005-07-23 16:22:14 +00:00
parent fac85dd9e7
commit 1bdb311092
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.714 2005/07/23 16:22:14 ritt
Added condition evaluation in list display
Revision 1.713 2005/07/23 13:35:21 ritt Revision 1.713 2005/07/23 13:35:21 ritt
Replaced tcp_hostname by listen_interface Replaced tcp_hostname by listen_interface
@ -3524,6 +3527,7 @@ void evaluate_conditions(LOGBOOK *lbs, char attrib[MAX_N_ATTR][NAME_LENGTH])
int index, i; int index, i;
condition[0] = 0; condition[0] = 0;
set_condition("");
for (index = 0; index < lbs->n_attr; index++) { for (index = 0; index < lbs->n_attr; index++) {
for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; i++) { for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; i++) {
@ -9018,7 +9022,6 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
} }
/* evaluate conditional attributes */ /* evaluate conditional attributes */
evaluate_conditions(lbs, attrib); evaluate_conditions(lbs, attrib);
/* rescan attributes if condition set */ /* rescan attributes if condition set */
@ -15001,6 +15004,8 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
nowrap = printable ? "" : "nowrap"; nowrap = printable ? "" : "nowrap";
skip_comma = FALSE; skip_comma = FALSE;
evaluate_conditions(lbs, attrib);
if (strieq(mode, "Threaded") if (strieq(mode, "Threaded")
&& getcfg(lbs->name, "Thread display", display, sizeof(display))) { && getcfg(lbs->name, "Thread display", display, sizeof(display))) {
/* check if to use icon from attributes */ /* check if to use icon from attributes */