Changeset 8539 for trunk/MagicSoft

Timestamp:

05/25/07 13:48:15 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto.cc (modified) (1 diff)
• mbase/MEnv.cc (modified) (5 diffs)
• mbase/MEnv.h (modified) (3 diffs)
• mjobs/MJob.cc (modified) (1 diff)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/05/25 Thomas Bretz
+
+   * callisto.cc, star.cc:
+     - removed obsolete check whether config file exists
+
+   * sponde.cc:
+     - aded check for validity of config file (returns 0xfe if not)
+
+   * mbase/MEnv.[h,cc]:
+     - removed obsolete fName workaround
+     - made sure that also ~ paths are correctly expanded and used
+
+   * mjobs/MJob.cc:
+     - one more sanity check if MEnv is not valid
+
+
 
  2007/05/22 Daniel Hoehne

trunk/MagicSoft/Mars/callisto.cc

@@ -261 +261 @@
         return 3;
 
-    if (gSystem->AccessPathName(kConfig, kFileExists))
-    {
-        gLog << err << "Sorry, config file '" << kConfig << "' doesn't exist." << endl;
-        return 4;
-    }
-
     if (kDebugMem)
         TObject::SetObjectStat(kTRUE);

trunk/MagicSoft/Mars/mbase/MEnv.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz  2/2005 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -51 +51 @@
 //---------------------------------------------------------------------------
 //
-// (Default) constructor. If the given file cannot be accessed the data
-// member fName is set to "" which can then be checked by IsValid()
-//
-MEnv::MEnv(const char *name) : TEnv(name), fName(name)
+// (Default) constructor. If the given file cannot be accessed SetRcName("")
+// is called which can then be checked by IsValid()
+//
+MEnv::MEnv(const char *name) : TEnv(name)
 {
     fChecked.SetOwner();
 
-    if (fName.IsNull())
+    if (!IsValid())
         return;
 
@@ -65 +65 @@
 
     if (gSystem->AccessPathName(fname, kFileExists))
-        fName = "";
+        fname = "";
+
+    SetRcName(fname);
+
+    if (GetEntries()<=0 && !fname.IsNull() && fname!=name)
+        ReadFile(fname, kEnvLocal);;
+}
+
+//---------------------------------------------------------------------------
+//
+// Return the total number of entries in the table
+//
+Int_t MEnv::GetEntries() const
+{
+    if (!GetTable())
+        return -1;
+
+    return GetTable()->GetEntries();
 }
 
@@ -123 +140 @@
 {
     MEnv *env = new MEnv("/dev/null");
-    env->fName = fName;
+    env->SetRcName(GetRcName());
     env->AddEnv(*this);
     return env;
@@ -836 +853 @@
     int i=0;
     gLog << inf << flush;
-    gLog.Separator("Untouched Resources");
+
+    TString sep = "Untouched Resources - ";
+    sep += GetRcName();
+    gLog.Separator(sep);
     TIter Next(GetTable());
     TObject *o=0;

trunk/MagicSoft/Mars/mbase/MEnv.h

@@ -21 +21 @@
     TOrdCollection fChecked;
 
-    TString fName; // A workaround!
-
     TString Compile(TString str, const char *post) const;
 
@@ -28 +26 @@
     MEnv(const char *name="");
 
-    Bool_t      IsValid() const { return !fName.IsNull(); }
+    Bool_t      IsValid() const { return !TString(GetRcName()).IsNull(); }
 
     TObject    *Clone(const char *newname="") const;
@@ -34 +32 @@
     Bool_t      Touch(const char *name) { return !TString(GetValue(name, "")).IsNull(); }
 
+    Int_t       GetEntries() const;
+
     Int_t       GetValue(const char *name, Int_t dflt);
     Double_t    GetValue(const char *name, Double_t dflt);
     const char *GetValue(const char *name, const char *dflt);
 
-    const char *GetName() const { return fName; }
+    const char *GetName() const { return GetRcName(); }
 
     Int_t       GetColor(const char *name, Int_t dftl);

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -83 +83 @@
     ClearEnv();
 
-    const Bool_t fileexist = !gSystem->AccessPathName(env, kFileExists);
-    if (!fileexist)
-    {
-        *fLog << err << "ERROR - Resource file '" << env << "' not found... no resources applied." << endl;
-        return kFALSE;
-    }
-
     fEnv = new MEnv(env);
     SetBit(kIsOwner);
+
+    if (!fEnv->IsValid())
+    {
+        ClearEnv();
+        return kFALSE;
+    }
 
     fEnvPrefix = prefix;

trunk/MagicSoft/Mars/star.cc

@@ -160 +160 @@
         return 2;
 
-    if (gSystem->AccessPathName(kConfig, kFileExists))
-    {
-        gLog << err << "Sorry, config file '" << kConfig << "' doesn't exist." << endl;
-        return 2;
-    }
-
     //
     // Setup sequence and check its validity