Changeset 7200 for trunk/MagicSoft/Mars/mfbase

Timestamp:

07/19/05 15:53:36 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfbase/MF.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -477 +477 @@
 Int_t MF::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    Bool_t rc = MFilter::ReadEnv(env, prefix, print);
-    if (rc==kERROR)
-        return kERROR;
-
-    if (!IsEnvDefined(env, prefix, "Condition", print))
-    {
-        if (rc)
+
+    /*
+     Bool_t rc = MFilter::ReadEnv(env, prefix, print);
+     if (rc==kERROR)
+     return kERROR;
+    */
+    if (IsEnvDefined(env, prefix, "Condition", print))
+    {
+        TString rule = GetEnvValue(env, prefix, "Condition", "");
+        rule.ReplaceAll(" ", "");
+
+        Int_t idx=0;
+        while (1)
+        {
+            TString cond;
+            if (IsEnvDefined(env, prefix, Form("%d", idx), print))
+            {
+                cond += "(";
+                cond += GetEnvValue(env, prefix, Form("%d", idx), "");
+                cond += ")";
+            }
+
+            if (cond.IsNull())
+                break;
+
+            rule.ReplaceAll(Form("{%d}", idx), cond);
+            idx++;
+        }
+
+        if (fF)
+        {
+            delete fF;
+            fF = 0;
+        }
+
+        if (rule.IsNull())
+        {
+            *fLog << warn << GetDescriptor() << " ::ReadEnv - WARNING: Empty condition found." << endl;
+            SetAllowEmpty();
+            return kTRUE;
+        }
+
+        SetAllowEmpty(kFALSE);
+
+        if (!(fF=ParseString(rule, 1)))
+        {
+            *fLog << err << "MF::ReadEnv - ERROR: Parsing '" << rule << "' failed." << endl;
+            return kERROR;
+        }
+
+        if (print)
+        {
+            *fLog << inf << "found: ";
+            fF->Print();
+            *fLog << endl;
+        }
+    }
+    else
+    {
+        if (!fF)
         {
             *fLog << warn << GetDescriptor() << " ::ReadEnv - WARNING: No condition found." << endl;
             SetAllowEmpty();
-        }
-        return rc;
-    }
-
-    TString rule = GetEnvValue(env, prefix, "Condition", "");
-    rule.ReplaceAll(" ", "");
-
-    Int_t idx=0;
-    while (1)
-    {
-        TString cond;
-        if (IsEnvDefined(env, prefix, Form("%d", idx), print))
-        {
-            cond += "(";
-            cond += GetEnvValue(env, prefix, Form("%d", idx), "");
-            cond += ")";
-        }
-
-        if (cond.IsNull())
-            break;
-
-        rule.ReplaceAll(Form("{%d}", idx), cond);
-        idx++;
-    }
-
-    if (fF)
-    {
-        delete fF;
-        fF = 0;
-    }
-
-    if (rule.IsNull())
-    {
-        *fLog << warn << GetDescriptor() << " ::ReadEnv - WARNING: Empty condition found." << endl;
-        SetAllowEmpty();
-        return kTRUE;
-    }
-
-    SetAllowEmpty(kFALSE);
-
-    if (!(fF=ParseString(rule, 1)))
-    {
-        *fLog << err << "MF::ReadEnv - ERROR: Parsing '" << rule << "' failed." << endl;
-        return kERROR;
-    }
-
-    if (print)
-    {
-        *fLog << inf << "found: ";
-        fF->Print();
-        *fLog << endl;
+            return kFALSE;
+        }
     }
 
@@ -546 +550 @@
     // might check for "Inverted" in this case both gets inverted
     // and double-inversion is no inversion
+    /*
     if (IsEnvDefined(env, prefix, "Inverted", print))
         if (GetEnvValue(env, prefix, "Inverted", kFALSE)==kTRUE)
-            SetInverted(kFALSE);
+            SetInverted(kFALSE);*/
 
     return kTRUE;