From d8befa209e2d55379f0a22492f6cbeedfd68ab63 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 4 Mar 2016 16:48:45 -0500 Subject: [PATCH] init: Database is initialized --- src/Database.cpp | 4 ++-- src/init.cpp | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Database.cpp b/src/Database.cpp index 0f2bdbcd..c64b29a6 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -50,9 +50,9 @@ void Database::initialize (const std::string& location) std::string Database::dump () const { std::stringstream out; - out << "Database\n"; + out << "# Database\n"; for (const auto& file : _data_files) - out << " Data: " << file << "\n"; + out << "# Data: " << file << "\n"; return out.str (); } diff --git a/src/init.cpp b/src/init.cpp index 8def0727..5fa4cbb6 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -101,16 +101,18 @@ void initializeData (Configuration& configuration, Database& database) configuration.set ("db", dbLocation._data); std::cout << "# rc.db=" << configuration.get ("db") << "\n"; - // Perhaps some later code would like to know this is a new db. - configuration.set ("shiny", 1); + // Perhaps some subsequent code would like to know this is a new db and + // possibly a first run. + configuration.set ("shiny", (shinyNewDatabase ? 1 : 0)); - // TODO Init database (no data read). + // Initialize the database (no data read), but files are enumerated. + database.initialize (dbLocation._data); std::cout << "# Configuration\n"; for (const auto& name : configuration.all ()) std::cout << "# " << name << "=" << configuration[name] << "\n"; - std::cout << "# " << database.dump (); + std::cout << database.dump (); } ////////////////////////////////////////////////////////////////////////////////