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

Implemented proper sorting of numeric attributes

Browse Source 
SVN revision: 1778
This commit is contained in:
Stefan Ritt 2006-12-13 16:16:51 +00:00
parent c1befde0c5
commit a1571ffad9
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/elogd.c
View File

@ -15763,6 +15763,16 @@ int msg_compare_reverse(const void *m1, const void *m2)
return strcoll(((MSG_LIST *) m2)->string, ((MSG_LIST *) m1)->string); return strcoll(((MSG_LIST *) m2)->string, ((MSG_LIST *) m1)->string);
} }
int msg_compare_numeric(const void *m1, const void *m2)
{
return atoi(((MSG_LIST *) m1)->string) - atoi(((MSG_LIST *) m2)->string);
}
int msg_compare_reverse_numeric(const void *m1, const void *m2)
{
return atoi(((MSG_LIST *) m2)->string) - atoi(((MSG_LIST *) m1)->string);
}
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
char *param_in_str(char *str, char *param) char *param_in_str(char *str, char *param)
@ -16901,8 +16911,8 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
{ {
int i, j, n, index, size, status, d1, m1, y1, d2, m2, y2, n_line, flags, int i, j, n, index, size, status, d1, m1, y1, d2, m2, y2, n_line, flags,
current_year, current_month, current_day, printable, n_logbook, current_year, current_month, current_day, printable, n_logbook,
n_display, reverse, n_attr_disp, total_n_msg, n_msg, search_all, message_id, n_display, reverse, numeric, n_attr_disp, total_n_msg, n_msg, search_all,
n_page, i_start, i_stop, in_reply_to_id, page_mid, page_mid_head; message_id, n_page, i_start, i_stop, in_reply_to_id, page_mid, page_mid_head;
char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], disp_attr[MAX_N_ATTR + 4][NAME_LENGTH], char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], disp_attr[MAX_N_ATTR + 4][NAME_LENGTH],
*list, *text, *text1, in_reply_to[80], reply_to[MAX_REPLY_TO * 10], *list, *text, *text1, in_reply_to[80], reply_to[MAX_REPLY_TO * 10],
attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256],
@ -17407,6 +17417,8 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
} }
} }
numeric = FALSE;
/* do filtering */ /* do 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)
@ -17633,6 +17645,8 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
if ((isparam("sort") && strieq(getparam("sort"), attr_list[i])) if ((isparam("sort") && strieq(getparam("sort"), attr_list[i]))
|| (isparam("rsort") && strieq(getparam("rsort"), attr_list[i]))) { || (isparam("rsort") && strieq(getparam("rsort"), attr_list[i]))) {
strlcpy(msg_list[index].string, attrib[i], 256); strlcpy(msg_list[index].string, attrib[i], 256);
if (attr_flags[i] | AF_NUMERIC)
numeric = TRUE;
} }
if ((isparam("sort") && strieq(getparam("sort"), loc("ID"))) if ((isparam("sort") && strieq(getparam("sort"), loc("ID")))
@ -17673,7 +17687,10 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
/*---- sort messasges ----*/ /*---- sort messasges ----*/
qsort(msg_list, n_msg, sizeof(MSG_LIST), reverse ? msg_compare_reverse : msg_compare); if (numeric)
qsort(msg_list, n_msg, sizeof(MSG_LIST), reverse ? msg_compare_reverse_numeric : msg_compare_numeric);
else
qsort(msg_list, n_msg, sizeof(MSG_LIST), reverse ? msg_compare_reverse : msg_compare);
/*---- search page for specific message ----*/ /*---- search page for specific message ----*/