Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-14 20:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display logbook in 'search all' even if 'list display' is present

Browse Source 
SVN revision: 745
This commit is contained in:
Stefan Ritt 2004-02-04 11:55:21 +00:00
parent 1a4256d55b
commit 8b52516e2a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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.236 2004/02/04 11:55:21 midas
Display logbook in 'search all' even if 'list display' is present
Revision 1.235 2004/02/04 10:39:22 midas Revision 1.235 2004/02/04 10:39:22 midas
Added 'js=xxx.js' support Added 'js=xxx.js' support
@ -11716,14 +11719,20 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
if (!getcfg(lbs->name, "List display", list)) /* new 2.3.10 format */ if (!getcfg(lbs->name, "List display", list)) /* new 2.3.10 format */
getcfg(lbs->name, "Display search", list); /* old 2.3.9 format */ getcfg(lbs->name, "Display search", list); /* old 2.3.9 format */
if (list[0]) if (list[0]) {
n_attr_disp = strbreak(list, disp_attr, MAX_N_ATTR); n_attr_disp = strbreak(list, disp_attr, MAX_N_ATTR);
else { if (search_all) {
for (i = n_attr_disp - 1; i > 0; i--)
strcpy(disp_attr[i + 1], disp_attr[i]);
strcpy(disp_attr[0], loc("Logbook"));
n_attr_disp++;
}
} else {
if (search_all) { if (search_all) {
n_attr_disp = lbs->n_attr + 3; n_attr_disp = lbs->n_attr + 3;
strcpy(disp_attr[0], loc("ID")); strcpy(disp_attr[0], loc("Logbook"));
strcpy(disp_attr[1], loc("Logbook")); strcpy(disp_attr[1], loc("ID"));
strcpy(disp_attr[2], loc("Date")); strcpy(disp_attr[2], loc("Date"));
memcpy(disp_attr + 3, attr_list, sizeof(attr_list)); memcpy(disp_attr + 3, attr_list, sizeof(attr_list));
} else { } else {