Changeset 18961 for trunk/FACT++/src
- Timestamp:
- 04/04/18 17:41:01 (7 years ago)
- Location:
- trunk/FACT++/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/root2sql.cc
r18928 r18961 275 275 const vector<Map> mymap = conf.Vec<Map>("map"); 276 276 const vector<Map> sqltypes = conf.Vec<Map>("sql-type"); 277 const vector<string> ignore= conf.Vec<string>("ignore");277 const vector<string> _ignore = conf.Vec<string>("ignore"); 278 278 const vector<string> primary = conf.Vec<string>("primary"); 279 279 … … 351 351 352 352 bool found = false; 353 for (const auto &b: ignore)353 for (const auto &b: _ignore) 354 354 { 355 355 if (boost::regex_match(name, boost::regex(b))) -
trunk/FACT++/src/rootifysql.cc
r18929 r18961 109 109 const uint16_t compression = conf.Get<uint16_t>("compression"); 110 110 const string delimiter = conf.Get<string>("delimiter"); 111 const vector<string> ignore = conf.Vec<string>("ignore"); 111 const vector<string> _ignore = conf.Vec<string>("ignore"); 112 //const vector<Map> mymap = conf.Vec<Map>("map"); 112 113 // ------------------------------------------------------------------------- 113 114 … … 241 242 242 243 bool found = false; 243 for (const auto &pattern: ignore)244 for (const auto &pattern: _ignore) 244 245 { 245 246 if (regex_match(l[i], regex(pattern))) … … 265 266 if (use) 266 267 { 268 // string name = l[i]; 269 // for (const auto &m: mymap) 270 // name = boost::regex_replace(l[i], boost::regex(m.first), m.second); 271 267 272 ttree->Branch(l[i].c_str(), buf.data()+i); 268 273 cols++;
Note:
See TracChangeset
for help on using the changeset viewer.