From 74483acf8b45a026a817316a079860b4646c9955 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Tue, 10 May 2005 11:27:23 +0000
Subject: [PATCH] Supersede 'Display mode' by cookie

SVN revision: 1359
---
 src/elogd.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/elogd.c b/src/elogd.c
index c39dbcfb..8b727f51 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
 
    $Log$
+   Revision 1.654  2005/05/10 11:27:23  ritt
+   Supersede 'Display mode' by cookie
+
    Revision 1.653  2005/05/10 07:17:48  ritt
    Store list mode in cookie
 
@@ -15633,16 +15636,20 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf
    strcpy(mode, "Summary");
    show_attachments = FALSE;
 
-   /* superseede mode from cookie */
-   if (isparam("elmode"))
-      strcpy(mode, getparam("elmode"));
-
-   /* for page display, get mode from config file */
    if (past_n || last_n || page_n) {
+      /* for page display, get mode from config file */
       if (getcfg(lbs->name, "Display Mode", str, sizeof(str)))
          strcpy(mode, str);
-      if (*getparam("mode"))
+   
+      /* supersede mode from cookie */
+      if (isparam("elmode"))
+         strcpy(mode, getparam("elmode"));
+
+      /* supersede mode from direct parameter */
+      if (isparam("mode"))
          strcpy(mode, getparam("mode"));
+
+
    } else {
       /* for find result, get mode from find form */
       strcpy(mode, getparam("mode"));