Sorting now also works for logbooks

SVN revision: 749
This commit is contained in:
Stefan Ritt 2004-02-06 14:34:11 +00:00
parent debf10d7ff
commit 9283ad5e3d

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.240 2004/02/06 14:34:11 midas
Sorting now also works for logbooks
Revision 1.239 2004/02/05 07:58:38 midas Revision 1.239 2004/02/05 07:58:38 midas
Use send_tcp for large buffers Use send_tcp for large buffers
@ -8530,7 +8533,7 @@ int retrieve_remote_md5(LOGBOOK * lbs, char *host, MD5_INDEX ** md5_index,
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
INT send_tcp(int sock, char *buffer, DWORD buffer_size, INT flags) INT send_tcp(int sock, char *buffer, unsigned int buffer_size, INT flags)
/********************************************************************\ /********************************************************************\
Send network data over TCP port. Break buffer in smaller Send network data over TCP port. Break buffer in smaller
@ -8542,8 +8545,8 @@ INT send_tcp(int sock, char *buffer, DWORD buffer_size, INT flags)
#define NET_TCP_SIZE 65536 #define NET_TCP_SIZE 65536
#endif #endif
DWORD count; unsigned int count;
INT status; int status;
/* transfer fragments until complete buffer is transferred */ /* transfer fragments until complete buffer is transferred */
@ -10290,12 +10293,12 @@ void display_reply(LOGBOOK * lbs, int message_id, int printable,
int msg_compare(const void *m1, const void *m2) int msg_compare(const void *m1, const void *m2)
{ {
return stricmp(((MSG_LIST *) m1)->string, ((MSG_LIST *) m2)->string); return strcoll(((MSG_LIST *) m1)->string, ((MSG_LIST *) m2)->string);
} }
int msg_compare_reverse(const void *m1, const void *m2) int msg_compare_reverse(const void *m1, const void *m2)
{ {
return stricmp(((MSG_LIST *) m2)->string, ((MSG_LIST *) m1)->string); return strcoll(((MSG_LIST *) m2)->string, ((MSG_LIST *) m1)->string);
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
@ -11434,6 +11437,11 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
|| equal_ustring(getparam("rsort"), loc("ID"))) { || equal_ustring(getparam("rsort"), loc("ID"))) {
sprintf(msg_list[index].string, "%08d", message_id); sprintf(msg_list[index].string, "%08d", message_id);
} }
if (equal_ustring(getparam("sort"), loc("Logbook"))
|| equal_ustring(getparam("rsort"), loc("Logbook"))) {
strlcpy(msg_list[index].string, msg_list[index].lbs->name, 256);
}
} }
if (isparam("rsort")) if (isparam("rsort"))