mirror of
https://gitea.psi.ch/ELOG/elog.git
synced 2026-09-08 17:13:56 +00:00
Fixed bug with missing attributes in search all logbooks
SVN revision: 296
This commit is contained in:
parent
c1f1d6fc0a
commit
cfc315d59a
13
elogd.c
13
elogd.c
@ -6,6 +6,9 @@
|
|||||||
Contents: Web server program for Electronic Logbook ELOG
|
Contents: Web server program for Electronic Logbook ELOG
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 2.105 2002/11/28 08:20:32 midas
|
||||||
|
Fixed bug with missing attributes in search all logbooks
|
||||||
|
|
||||||
Revision 2.104 2002/11/28 07:47:34 midas
|
Revision 2.104 2002/11/28 07:47:34 midas
|
||||||
Do not expire entry form
|
Do not expire entry form
|
||||||
|
|
||||||
@ -6816,6 +6819,7 @@ time_t ltime, ltime_start, ltime_end, now;
|
|||||||
struct tm tms, *ptms;
|
struct tm tms, *ptms;
|
||||||
MSG_LIST *msg_list;
|
MSG_LIST *msg_list;
|
||||||
char slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH];
|
char slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH];
|
||||||
|
LOGBOOK *lbs_cur;
|
||||||
|
|
||||||
/* redirect if enpty parameters */
|
/* redirect if enpty parameters */
|
||||||
if (strstr(_cmdline, "=&"))
|
if (strstr(_cmdline, "=&"))
|
||||||
@ -7067,16 +7071,17 @@ char slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH];
|
|||||||
|
|
||||||
msg_list = malloc(sizeof(MSG_LIST)*n_msg);
|
msg_list = malloc(sizeof(MSG_LIST)*n_msg);
|
||||||
|
|
||||||
|
lbs_cur = lbs;
|
||||||
for (i=n=0 ; i<n_logbook ; i++)
|
for (i=n=0 ; i<n_logbook ; i++)
|
||||||
{
|
{
|
||||||
if (search_all)
|
if (search_all)
|
||||||
lbs = &lb_list[i];
|
lbs_cur = &lb_list[i];
|
||||||
|
|
||||||
for (j=0 ; j<*lbs->n_el_index ; j++)
|
for (j=0 ; j<*lbs_cur->n_el_index ; j++)
|
||||||
{
|
{
|
||||||
msg_list[n].lbs = lbs;
|
msg_list[n].lbs = lbs_cur;
|
||||||
msg_list[n].index = j;
|
msg_list[n].index = j;
|
||||||
sprintf(msg_list[n].string, "%010d", lbs->el_index[j].file_time);
|
sprintf(msg_list[n].string, "%010d", lbs_cur->el_index[j].file_time);
|
||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user