From 104de1991ba8a9534377eb71fb14813c64a3231b Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Mon, 15 Jun 2009 14:43:16 +0000
Subject: [PATCH] Fixed required attributes under a condition

SVN revision: 2213
---
 src/elogd.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/elogd.c b/src/elogd.c
index df97f241..2659ece2 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -21744,6 +21744,15 @@ void submit_elog(LOGBOOK * lbs)
    bmultiedit = isparam("nsel");
    bedit = isparam("edit_id");
 
+   /* check for condition */
+   if (isparam("condition")) {
+      set_condition(getparam("condition"));
+
+      /* rescan attributes */
+      n_attr = scan_attributes(lbs->name);
+   } else
+      n_attr = lbs->n_attr;
+
    /* check for required attributs */
    missing = 0;
    for (i = 0; i < lbs->n_attr; i++) {
@@ -21833,15 +21842,6 @@ void submit_elog(LOGBOOK * lbs)
          }
       }
 
-   /* check for extended attributs */
-   if (isparam("condition")) {
-      set_condition(getparam("condition"));
-
-      /* rescan attributes */
-      n_attr = scan_attributes(lbs->name);
-   } else
-      n_attr = lbs->n_attr;
-
    for (i = 0; i < n_attr; i++) {
       strcpy(ua, attr_list[i]);
       stou(ua);