Changeset 4193 for trunk/MagicSoft/Mars/mbase

Timestamp:

05/26/04 15:07:29 (21 years ago)

Author:

merck

Message:

MMerck: Changed MatchFilter to replace al '+' by '/+' in the filter. This allows to have a + in the filename or filter part of a selector to select files like those for the source 1ES1426+428. However this change affects the MatchFilter method in such a way that you can't use anymore a filter using a + in a regular expression.

File:

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

trunk/MagicSoft/Mars/mbase/MDirIter.cc

@@ -195 +195 @@
 Bool_t MDirIter::MatchFilter(const TString &n, const TString &f) const
 {
-    return f.IsNull() || !n(TRegexp(f, kTRUE)).IsNull();
+    // 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();
 }
 
@@ -238 +244 @@
     // Check global filter
     if (!MatchFilter(n, fFilter))
-        return kFALSE;
+         return kFALSE;
 
     // Check for file or directory
@@ -247 +253 @@
     // Check for rread perissions
     return !gSystem->AccessPathName(fqp, kReadPermission);
+
 }