From be3a29a644ced26657ef31b914302fe807b7f824 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Sat, 23 Jul 2005 16:30:42 +0000
Subject: [PATCH] Fixed {n} display with ROptions

SVN revision: 1442
---
 src/elogd.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/elogd.c b/src/elogd.c
index 21b8e535..2d2a160a 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
 
    $Log$
+   Revision 1.715  2005/07/23 16:30:42  ritt
+   Fixed {n} display with ROptions
+
    Revision 1.714  2005/07/23 16:22:14  ritt
    Added condition evaluation in list display
 
@@ -9791,17 +9794,21 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
                   rsprintf("<table cellpadding=0 cellspacing=0><tr>\n");
 
                   for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; i++) {
-                     if (strstr(attrib[index], attr_options[index][i]))
+                     strlcpy(str, attr_options[index][i], sizeof(str));
+                     if (strchr(str, '{'))
+                        *strchr(str, '{') = 0;
+
+                     if (strstr(attrib[index], attr_options[index][i])
+                        || strieq(str, attrib[index]))
                         rsprintf
                             ("<td nowrap><input type=radio id=\"%s\" name=\"%s\" value=\"%s\" checked onChange=\"mod();\">\n",
-                             attr_options[index][i], ua, attr_options[index][i]);
+                             str, ua, str);
                      else
                         rsprintf
                             ("<td nowrap><input type=radio id=\"%s\" name=\"%s\" value=\"%s\" onChange=\"mod();\">\n",
-                             attr_options[index][i], ua, attr_options[index][i]);
+                             str, ua, str);
 
-                     rsprintf("<label for=\"%s\">%s</label>\n",
-                              attr_options[index][i], attr_options[index][i]);
+                     rsprintf("<label for=\"%s\">%s</label>\n", str, str);
 
                      rsprintf("</td>\n");
                      if (format_flags[index] & AFF_MULTI_LINE)