Changeset 5307 for trunk/MagicSoft/Mars/mbase/MDirIter.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MDirIter.cc (modified) (2 diffs)

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();
 }