Changeset 8674 for trunk/MagicSoft/Mars/mbase

Timestamp:

08/18/07 12:04:44 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEnv.cc (modified) (2 diffs)
• MEnv.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MEnv.cc

@@ -71 +71 @@
     if (GetEntries()<=0 && !fname.IsNull() && fname!=name)
         ReadFile(fname, kEnvLocal);;
+}
+
+//---------------------------------------------------------------------------
+//
+// Make sure that the name used for writing doesn't contain a full path
+//
+const char *MEnv::GetName() const
+{
+    const char *pos = strrchr(GetRcName(), '/');
+    return pos>0 ? pos+1 : GetRcName();
 }
 
@@ -847 +857 @@
 //---------------------------------------------------------------------------
 //
+// Add name and full path to output
+//
+void MEnv::PrintEnv(EEnvLevel level) const
+{
+    cout << "# Path: " << GetRcName() << endl;
+    cout << "# Name: " << GetName() << endl;
+    TEnv::PrintEnv(level);
+}
+
+//---------------------------------------------------------------------------
+//
 // Print resources which have never been touched (for debugging)
 //

trunk/MagicSoft/Mars/mbase/MEnv.h

@@ -38 +38 @@
     const char *GetValue(const char *name, const char *dflt);
 
-    const char *GetName() const { return GetRcName(); }
+    const char *GetName() const { return strrchr(GetRcName(), '/')?strrchr(GetRcName(), '/')+1:GetRcName(); }
 
     Int_t       GetColor(const char *name, Int_t dftl);
@@ -67 +67 @@
     void        AddEnv(const TEnv &env, Bool_t overwrite=kTRUE);
 
+    void        PrintEnv(EEnvLevel level = kEnvAll) const;
     void        Print(Option_t *option) const { TEnv::Print(option); }
-    void        Print() const { TEnv::PrintEnv(kEnvLocal); } //*MENU*
+    void        Print() const { PrintEnv(kEnvLocal); } //*MENU*
 
     void PrintUntouched() const;