Changeset 1902 for trunk/MagicSoft/Mars/mbase/MParList.cc

Timestamp:

04/03/03 15:37:41 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MParList.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -792 +792 @@
 Bool_t MParList::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
+    if (print)
+        *fLog << all << "MParList::ReadEnv: " << prefix << " (" << (int)print << ")" << endl;
+
     MParContainer *cont = NULL;
 
     TIter Next(fContainer);
     while ((cont=(MParContainer*)Next()))
-        if (cont->ReadEnv(env, print)==kERROR)
+    {
+        if (cont->InheritsFrom("MTaskList"))
+        {
+            if (cont->ReadEnv(env, prefix, print)==kERROR)
+                return kERROR;
+            continue;
+        }
+
+        // Check For: Job4.ContainerName.Varname
+        if (print)
+            *fLog << all << "Testing: " << prefix+cont->GetName() << endl;
+        Bool_t rc = cont->ReadEnv(env, prefix+cont->GetName(), print);
+        if (rc==kERROR)
             return kERROR;
-
-    Next.Reset();
-    while ((cont=(MParContainer*)Next()))
-        if (cont->ReadEnv(env, prefix, print)==kERROR)
+        if (rc==kTRUE)
+            continue;
+
+        // Check For: Job4.MClassName.Varname
+        if (print)
+            *fLog << all << "Testing: " << prefix+cont->ClassName() << endl;
+        rc = cont->ReadEnv(env, prefix+cont->ClassName(), print);
+        if (rc==kERROR)
             return kERROR;
+        if (rc==kTRUE)
+            continue;
+
+        // Check For: ContainerName.Varname
+        if (print)
+            *fLog << all << "Testing: " << cont->GetName() << endl;
+        rc = cont->ReadEnv(env, cont->GetName(), print);
+        if (rc==kERROR)
+            return kERROR;
+        if (rc==kTRUE)
+            continue;
+
+        // Check For: MClassName.Varname
+        if (print)
+            *fLog << all << "Testing: " << cont->ClassName() << endl;
+        rc = cont->ReadEnv(env, cont->ClassName(), print);
+        if (rc==kERROR)
+            return kERROR;
+        if (rc==kTRUE)
+            continue;
+    }
 
     return kTRUE;