Changeset 5307 for trunk/MagicSoft/Mars/mbase

Timestamp:

10/22/04 15:59:02 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MDirIter.cc (modified) (2 diffs)
• MDirIter.h (modified) (1 diff)
• MRunIter.cc (modified) (1 diff)
• MStatusDisplay.cc (modified) (2 diffs)
• MTaskEnv.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MDirIter.cc

@@ -202 +202 @@
 // --------------------------------------------------------------------------
 //
+// As the filter string may contain a + character, we have to replace
+// this filter by a new filter contaning a \+ at all locations where a +
+// was in the original filter.
+//
+// We replace:
+//   .  by  \\.
+//   +  by  \\+
+//   *  by  [^\\/:]*
+//   ?  by  .
+//
+// And surround the filter by ^ and $.
+//
+// For more details you can have a look at the template:
+//  TRegexp::MakeWildcard
+//
+const TRegexp MDirIter::MakeRegexp(TString n) const
+{
+    n.Prepend("^");
+    n.ReplaceAll(".", "\\.");
+    n.ReplaceAll("+", "\\+");
+    n.ReplaceAll("*", "[^\\/:]*");
+    n.ReplaceAll("?", ".");
+    n.Append("$");
+
+    return TRegexp(n, kFALSE);
+}
+
+// --------------------------------------------------------------------------
+//
 // Check whether the given name n matches the filter f.
 // Filters are of the form TRegexp(f, kTRUE)
@@ -207 +236 @@
 Bool_t MDirIter::MatchFilter(const TString &n, const TString &f) const
 {
-    // As the filter string may contain a + character, we have to replace
-    // this filter by a new filter contaning a \+ at all locations where a +
-    // was in the original filter.
-    TString nf(f);
-    nf.ReplaceAll("+","\\+");
-
-    return f.IsNull() || !n(TRegexp(nf, kTRUE)).IsNull();
+
+    return f.IsNull() || !n(MakeRegexp(f)).IsNull();
 }
 

trunk/MagicSoft/Mars/mbase/MDirIter.h

@@ -23 +23 @@
     TString ConcatFileName(const char *dir, const char *name) const;
     void    PrintEntry(const TObject &o) const;
+    const   TRegexp MakeRegexp(TString n) const;
 
 public:

trunk/MagicSoft/Mars/mbase/MRunIter.cc

@@ -53 +53 @@
 
     // R. DeLosReyes and T. Bretz
-    // Changes to read the DAQ numbering format. Changes takes place 
+    // Changes to read the DAQ numbering format. Changes takes place
     // between runs 35487 and 00035488 (2004_08_30)
+    const char *fmt = run>35487 ? "*_%08d_*_%s" : "*_%05d_*_%s";
 
-      MDirIter Next;
-      if(run<=35487)
-        Next.AddDirectory(p, Form("*_%05d_*_%s", run,fIsRawFile?"*.raw":"*.root"), -1);
-      else
-        Next.AddDirectory(p, Form("*_%08d_*_%s", run,fIsRawFile?"*.raw":"*.root"), -1);
+    MDirIter Next;
+    Next.AddDirectory(p, Form(fmt, run,fIsRawFile?"*.raw":"*.root"), -1);
 
     const TString name(Next());

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1483 +1483 @@
     if (TestBit(kExitLoopOnExit) || TestBit(kExitLoopOnClose))
     {
-        gLog << dbg << "CloseWindow() calling ExitLoop." << endl;
+        //gLog << dbg << "CloseWindow() calling ExitLoop." << endl;
         gSystem->ExitLoop();
     }
@@ -1491 +1491 @@
         //gLog << dbg << "delete " << fName << ";" << endl;
         delete this;
-    }
-    fStatus = kFileExit;
-    //gLog << dbg << fName << ".fStatus=kFileExit;" << endl;
+        // DO NOT EXECUTE ANY COMMAND AFTER this!
+    }
+    else
+    {
+        fStatus = kFileExit;
+        //gLog << dbg << fName << ".fStatus=kFileExit;" << endl;
+    }
 }
 

trunk/MagicSoft/Mars/mbase/MTaskEnv.cc

@@ -215 +215 @@
 {
     if (!IsEnvDefined(env, prefix, print))
-        return kFALSE;
+        return fTask ? fTask->ReadEnv(env, prefix, print) : kFALSE;
 
     TString task = GetEnvValue(env, prefix, "");