From dd8025b275fb25753ddc04a82daf058e10cfb6c2 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 27 Apr 2016 18:06:48 -0400 Subject: [PATCH] init: Removed exclusions --- src/init.cpp | 19 ------------------- src/timew.h | 1 - 2 files changed, 20 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index a93aa018..f78b2809 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -174,10 +174,6 @@ void initializeDataAndRules ( if (shinyNewDatabase) rules.set ("temp.shiny", 1); - // Provide the exclusions from configuration to the database. These are used - // to seed new Diatafile objects. - initializeDatabaseExclusions (database, rules); - // Initialize the database (no data read), but files are enumerated. database.initialize (data._data); @@ -186,21 +182,6 @@ void initializeDataAndRules ( Datetime::lookForwards = false; } -//////////////////////////////////////////////////////////////////////////////// -// The exclusions are read from configuration as strings, and passed to the -// database object as strings. -void initializeDatabaseExclusions (Database& database, const Rules& rules) -{ - for (auto& name : rules.all ("exclusions.")) - { - name = lowerCase (name); - if (name.substr (0, 16) == "exclusions.days.") - database.addExclusion ("exc day " + rules.get (name) + " " + name.substr (16)); - else - database.addExclusion ("exc " + name.substr (11) + " " + rules.get (name)); - } -} - //////////////////////////////////////////////////////////////////////////////// void initializeExtensions ( CLI& cli, diff --git a/src/timew.h b/src/timew.h index 43185812..d8d42f4e 100644 --- a/src/timew.h +++ b/src/timew.h @@ -40,7 +40,6 @@ bool lightweightVersionCheck (int, const char**); void initializeEntities (CLI&); void initializeDataAndRules (const CLI&, Database&, Rules&); -void initializeDatabaseExclusions (Database&, const Rules&); void initializeExtensions (CLI&, const Rules&, Extensions&); int dispatchCommand (const CLI&, Database&, Rules&, const Extensions&);