Changeset 8091 for trunk/MagicSoft/Mars/mfbase

Timestamp:

10/17/06 14:39:40 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfbase

Files:

• FBaseLinkDef.h (modified) (1 diff)
• MF.cc (modified) (8 diffs)
• MF.h (modified) (2 diffs)
• MFDataPhrase.cc (added)
• MFDataPhrase.h (added)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mfbase/FBaseLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MFDataChain+;
 #pragma link C++ class MFDataMember+;
+#pragma link C++ class MFDataPhrase+;
 #pragma link C++ class MFRealTimePeriod+;
 

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -88 +88 @@
 #include "MParList.h"
 
-#include "MFilterList.h"
-#include "MFDataChain.h"
-#include "MFDataMember.h"
+//#include "MFilterList.h"
+#include "MFDataPhrase.h"
+//#include "MFDataMember.h"
 
 #include "MLog.h"
@@ -123 +123 @@
 
     *fLog << inf << "Parsing filter rule... " << flush;
+    fF = new MFDataPhrase(text);
+    /*
     if (!(fF=ParseString(text, 1)))
     {
@@ -128 +130 @@
         return;
     }
-
+    */
     *fLog << inf << "found: ";
     fF->Print();
@@ -143 +145 @@
         delete fF;
 }
-
+/*
 // --------------------------------------------------------------------------
 //
@@ -348 +350 @@
     return filter0;
 }
+*/
 
 // --------------------------------------------------------------------------
@@ -481 +484 @@
 
     /*
+     // It is assumed that each filter itself calls MFilter::ReadEnv
+     // to process the Inverted directive
      Bool_t rc = MFilter::ReadEnv(env, prefix, print);
      if (rc==kERROR)
-     return kERROR;
-    */
+        return kERROR;
+        */
     if (IsEnvDefined(env, prefix, "Condition", print))
     {
@@ -523 +528 @@
         SetAllowEmpty(kFALSE);
 
+        const Int_t fg = rule.First('>');
+        const Int_t fl = rule.First('<');
+
+        if (fg<0 && fl<0)
+        {
+            MFilter *f = (MFilter*)GetNewObject(rule, MFilter::Class());
+            if (!f)
+            {
+                *fLog << err << dbginf << "Syntax Error: '" << rule << "' is neither a MFilter nor conditional sign found." << endl;
+                return kERROR;
+            }
+            fF = f;
+        }
+        else
+            fF = new MFDataPhrase(rule);
+        /*
         if (!(fF=ParseString(rule, 1)))
         {
@@ -528 +549 @@
             return kERROR;
         }
-
+        */
         if (print)
         {

trunk/MagicSoft/Mars/mfbase/MF.h

@@ -23 +23 @@
     MFilter *fF;                     // Filter
     Bool_t fAllowEmpty;              // Not a Bit to be stored
-
+/*
     Int_t IsRule(TString &txt, TString &rule) const;
     Int_t IsVal(const TString &txt) const;
@@ -30 +30 @@
     MFilter *ParseRule(TString &txt, MFilter *filter0, Int_t level) const;
     MFilter *ParseString(TString txt, Int_t level);
-
+  */
     void StreamPrimitive(ostream &out) const;
 

trunk/MagicSoft/Mars/mfbase/Makefile

@@ -16 +16 @@
 
 SRCFILES = MF.cc \
+           MFDataPhrase.cc \
            MFilterList.cc \
            MFEventSelector.cc \