Changeset 18961 for trunk/FACT++

Timestamp:

04/04/18 17:41:01 (6 years ago)

Author:

tbretz

Message:

ignore already exists in 'tuple'

Location:

trunk/FACT++/src

Files:

• root2sql.cc (modified) (2 diffs)
• rootifysql.cc (modified) (3 diffs)

trunk/FACT++/src/root2sql.cc

@@ -275 +275 @@
     const vector<Map> mymap      = conf.Vec<Map>("map");
     const vector<Map> sqltypes   = conf.Vec<Map>("sql-type");
-    const vector<string> ignore  = conf.Vec<string>("ignore");
+    const vector<string> _ignore = conf.Vec<string>("ignore");
     const vector<string> primary = conf.Vec<string>("primary");
 
@@ -351 +351 @@
 
         bool found = false;
-        for (const auto &b: ignore)
+        for (const auto &b: _ignore)
         {
             if (boost::regex_match(name, boost::regex(b)))

trunk/FACT++/src/rootifysql.cc

@@ -109 +109 @@
     const uint16_t compression = conf.Get<uint16_t>("compression");
     const string   delimiter   = conf.Get<string>("delimiter");
-    const vector<string> ignore = conf.Vec<string>("ignore");
+    const vector<string> _ignore = conf.Vec<string>("ignore");
+    //const vector<Map> mymap    = conf.Vec<Map>("map");
     // -------------------------------------------------------------------------
 
@@ -241 +242 @@
 
         bool found = false;
-        for (const auto &pattern: ignore)
+        for (const auto &pattern: _ignore)
         {
             if (regex_match(l[i], regex(pattern)))
@@ -265 +266 @@
         if (use)
         {
+            // string name = l[i];
+            // for (const auto &m: mymap)
+            //     name = boost::regex_replace(l[i], boost::regex(m.first), m.second);
+
             ttree->Branch(l[i].c_str(), buf.data()+i);
             cols++;