Changeset 8724 for trunk/MagicSoft/Mars/mbase/MParContainer.cc

Timestamp:

08/31/07 14:11:36 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MParContainer.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -868 +868 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Check if the given resource is defined. If there is a postfix, prefix
+// the postfix with a dot. Calls IsEnvDefined(env, name, print)
+//
 Bool_t MParContainer::IsEnvDefined(const TEnv &env, TString prefix, TString postfix, Bool_t print) const
 {
@@ -876 +881 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// If print==kTRUE print information about what's going on. This is necessary
+// to debug parsing of resource files. Check if a resource "name" is defined
+// and return kFALSE/kTRUE depending on the result.
+//
 Bool_t MParContainer::IsEnvDefined(const TEnv &env, TString name, Bool_t print) const
 {
@@ -881 +892 @@
         *fLog << all << GetDescriptor() << " - " << name << "... " << flush;
 
-    if (!((TEnv&)env).Defined(name))
+    if (!const_cast<TEnv&>(env).Defined(name))
     {
         if (print)
@@ -894 +905 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return the resource prefix+"."+postfix from env or deftl if not available.
+// If prefix IsNull search for postfix only.
+//
 Int_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, TString postfix, Int_t dflt) const
 {
-    return GetEnvValue(env, prefix+"."+postfix, dflt);
-}
-
+    return GetEnvValue(env, prefix.IsNull()?postfix:(prefix+"."+postfix), dflt);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the resource prefix+"."+postfix from env or deftl if not available.
+// If prefix IsNull search for postfix only.
+//
 Double_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, TString postfix, Double_t dflt) const
 {
-    return GetEnvValue(env, prefix+"."+postfix, dflt);
-}
-
+    return GetEnvValue(env, prefix.IsNull()?postfix:(prefix+"."+postfix), dflt);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the resource prefix+"."+postfix from env or deftl if not available.
+// If prefix IsNull search for postfix only.
+//
 const char *MParContainer::GetEnvValue(const TEnv &env, TString prefix, TString postfix, const char *dflt) const
 {
-    return GetEnvValue(env, prefix+"."+postfix, dflt);
-}
-
+    return GetEnvValue(env, prefix.IsNull()?postfix:(prefix+"."+postfix), dflt);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the resource prefix from env or deftl if not available.
+//
 Int_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, Int_t dflt) const
 {
-    return ((TEnv&)env).GetValue(prefix, dflt);
-}
-
+    return const_cast<TEnv&>(env).GetValue(prefix, dflt);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the resource prefix from env or deftl if not available.
+//
 Double_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, Double_t dflt) const
 {
-    return ((TEnv&)env).GetValue(prefix, dflt);
-}
-
+    return const_cast<TEnv&>(env).GetValue(prefix, dflt);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the resource prefix from env or deftl if not available.
+//
 const char *MParContainer::GetEnvValue(const TEnv &env, TString prefix, const char *dflt) const
 {
-    return ((TEnv&)env).GetValue(prefix, dflt);
+    return const_cast<TEnv&>(env).GetValue(prefix, dflt);
+}
+
+// --------------------------------------------------------------------------
+//
+// Check for the resource prefix+"."+postfix. If it is not available or
+// prefix IsNull check for the more common resource postfix. If none
+// is found return the default.
+//
+template <class T>
+T MParContainer::GetEnvValue2Imp(const TEnv &env, const TString &prefix, const TString &postfix, T dftl, Bool_t print) const
+{
+    // Check for a dedicated resource (prefix.postfix) first
+    if (!prefix.IsNull())
+    {
+        if (IsEnvDefined(env, prefix, postfix, print))
+            return GetEnvValue(env, prefix, postfix, dftl);
+    }
+
+    // check for a general resource (postfix)
+    if (IsEnvDefined(env, postfix, print))
+        return GetEnvValue(env, postfix, dftl);
+
+    // return default
+    return dftl;
+}
+
+// --------------------------------------------------------------------------
+//
+// see template GetEnvValue2Imp
+//
+const char *MParContainer::GetEnvValue2(const TEnv &env, const TString &prefix, const TString &postfix, const char *dftl, Bool_t print) const
+{
+    return GetEnvValue2Imp(env, prefix, postfix, dftl, print);
+}
+
+// --------------------------------------------------------------------------
+//
+// see template GetEnvValue2Imp
+//
+Int_t MParContainer::GetEnvValue2(const TEnv &env, const TString &prefix, const TString &postfix, Int_t dftl, Bool_t print) const
+{
+    return GetEnvValue2Imp(env, prefix, postfix, dftl, print);
+}
+
+// --------------------------------------------------------------------------
+//
+// see template GetEnvValue2Imp
+//
+Double_t MParContainer::GetEnvValue2(const TEnv &env, const TString &prefix, const TString &postfix, Double_t dftl, Bool_t print) const
+{
+    return GetEnvValue2Imp(env, prefix, postfix, dftl, print);
 }