init: Propagated CLI to initializeDataAndRules

This commit is contained in:
Paul Beckingham 2016-04-04 07:58:39 -04:00
parent 0137c60878
commit e335e325be
3 changed files with 6 additions and 7 deletions

View file

@ -82,6 +82,7 @@ void initializeEntities (CLI& cli)
////////////////////////////////////////////////////////////////////////////////
void initializeDataAndRules (
CLI& cli,
Database& database,
Rules& rules,
Log& log)

View file

@ -69,17 +69,15 @@ int main (int argc, const char** argv)
}
log.write ("command", commandLine);
cli.analyze ();
// TODO Remove.
std::cout << cli.dump () << "\n";
try
{
// One-time command line scan.
cli.analyze ();
// Prepare the database, but do not read data.
Database database;
Rules rules;
initializeDataAndRules (database, rules, log);
initializeDataAndRules (cli, database, rules, log);
// Load extension script info.
Extensions extensions;

View file

@ -38,7 +38,7 @@
// init.cpp
bool lightweightVersionCheck (int, const char**);
void initializeEntities (CLI&);
void initializeDataAndRules (Database&, Rules&, Log&);
void initializeDataAndRules (CLI&, Database&, Rules&, Log&);
void initializeExtensions (Rules&, Extensions&, Log&);
int dispatchCommand (CLI&, Database&, Rules&, Extensions&, Log&);