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

Fixed problem with multiple quick filters on attributes without option lists

Browse Source 
SVN revision: 862
This commit is contained in:
Stefan Ritt 2004-04-06 21:19:59 +00:00
parent e7eca2fccd
commit 4ac52b3471
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
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.317 2004/04/06 21:19:59 midas
Fixed problem with multiple quick filters on attributes without option lists
Revision 1.316 2004/03/27 14:33:59 midas Revision 1.316 2004/03/27 14:33:59 midas
Implemeted first version of favicon Implemeted first version of favicon
@ -12045,16 +12048,49 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf
/* redirect if enpty parameters */ /* redirect if enpty parameters */
if (strstr(_cmdline, "=&")) { if (strstr(_cmdline, "=&")) {
while ((pt1 = strstr(_cmdline, "=&")) != NULL) { while ((pt1 = strstr(_cmdline, "=&")) != NULL) {
pt2 = pt1 + 2; pt2 = pt1;
while (*pt1 != '&' && *pt1 != '?') while (*pt1 != '&' && *pt1 != '?')
pt1--; pt1--;
strcpy(pt1 + 1, pt2); pt1++;
strcpy(param, pt1);
param[(int)pt2-(int)pt1] = 0;
strcpy(pt1, pt2+2);
/* remove param from lastcmd if present */
if ((pt1 = strstr(_cmdline, "lastcmd=")) != NULL) {
sprintf(str, "%s%%3D", param);
if (pt1 = strstr(_cmdline, str)) {
pt2 = pt1+strlen(str);
while (*pt2 && *pt2 != '%')
pt2++;
if (*pt2 == '%')
pt2 += 3;
strcpy(pt1, pt2);
}
}
} }
if (_cmdline[strlen(_cmdline) - 1] == '=') { if (_cmdline[strlen(_cmdline) - 1] == '=') {
pt1 = _cmdline + strlen(_cmdline) - 1; pt1 = _cmdline + strlen(_cmdline) - 1;
while (*pt1 != '&' && *pt1 != '?') while (*pt1 != '&' && *pt1 != '?')
*pt1-- = 0; pt1--;
pt1++;
strcpy(param, pt1);
if (param[strlen(param)-1] == '=')
param[strlen(param)-1] = 0;
*pt1 = 0; *pt1 = 0;
/* remove param from lastcmd if present */
if ((pt1 = strstr(_cmdline, "lastcmd=")) != NULL) {
sprintf(str, "%s%%3D", param);
if (pt1 = strstr(_cmdline, str)) {
pt2 = pt1+strlen(str);
while (*pt2 && *pt2 != '%' && *pt2 != '&')
pt2++;
if (*pt2 == '%')
pt2 += 3;
strcpy(pt1, pt2);
}
}
} }
/* add reverse=0 if not present */ /* add reverse=0 if not present */
if (strstr(_cmdline, "reverse=") == NULL && getcfg(lbs->name, "Reverse sort", str) if (strstr(_cmdline, "reverse=") == NULL && getcfg(lbs->name, "Reverse sort", str)