spine search and configuration related

1 files changed, 21 insertions, 21 deletions

diff --git a/src/doc_reform/io_out/sqlite.d b/src/doc_reform/io_out/sqlite.d
index a97a39d..abdfc7a 100644
--- a/src/doc_reform/io_out/sqlite.d
+++ b/src/doc_reform/io_out/sqlite.d
@@ -66,7 +66,7 @@ template SQLiteHubBuildTablesAndPopulate() {
     const D  doc_abstraction,
           M  doc_matters,
   ) {
-    auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path);
+    auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.sqlite.path);
     pth_sqlite.base.mkdirRecurse;
     auto db = Database(pth_sqlite.sqlite_file);
     template SQLiteDbStatementComposite() {
@@ -79,7 +79,7 @@ template SQLiteHubBuildTablesAndPopulate() {
           {
             string _db_statement;
             if ((doc_matters.opt.action.sqlite_db_create)) {
-              auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path);
+              auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.sqlite.path);
               pth_sqlite.base.mkdirRecurse;
               _db_statement ~= SQLiteTablesReCreate!()();
               SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "TABLE RE-CREATE");
@@ -114,7 +114,7 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() {
           M    doc_matters,
   ) {
     auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.w_srv_data_root_url_html, doc_matters.src.language);
-    auto pth_sqlite = spinePathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language);
+    auto pth_sqlite = spinePathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); // doc_matters.db_path
     pth_sqlite.base.mkdirRecurse;
     auto db = Database(pth_sqlite.sqlite_file(doc_matters.src.filename));
     template SQLiteDiscreteDbStatementComposite() {
@@ -1550,19 +1550,19 @@ template SQLiteTablesCreate() {
       string _db_statement;
       string db_filename = (opt_action.sqlite_filename.length > 0)
       ? opt_action.sqlite_filename
-      : (config.conf.w_srv_db_sqlite.length > 0)
-        ? config.conf.w_srv_db_sqlite
+      : (config.conf.w_srv_db_sqlite_filename.length > 0)
+        ? config.conf.w_srv_db_sqlite_filename
         : "";
-      string output_path = (opt_action.output_dir_set.length > 0)
+      string db_path = (opt_action.output_dir_set.length > 0)
       ? opt_action.output_dir_set
-      : (config.conf.output_path.length > 0)
-        ? config.conf.output_path
+      : (config.conf.w_srv_db_sqlite_path.length > 0)
+        ? config.conf.w_srv_db_sqlite_path
         : "";
-      if (db_filename.length > 0 && output_path.length > 0) {
+      if (db_filename.length > 0 && db_path.length > 0) {
         if ((opt_action.verbose)) {
-          writeln("db name & path: ", config.conf.output_path, "/sqlite/", db_filename);
+          writeln("db name & path: ", db_path, db_filename);
         }
-        auto pth_sqlite = spinePathsSQLite!()(db_filename, output_path);
+        auto pth_sqlite = spinePathsSQLite!()(db_filename, db_path);
         pth_sqlite.base.mkdirRecurse;
         auto db = Database(pth_sqlite.sqlite_file);
         {
@@ -1572,7 +1572,7 @@ template SQLiteTablesCreate() {
       } else {
         writeln("must provide db name & output root path either on the command line or in configuration file");
         writeln("db name: ", db_filename);
-        writeln("output root path (path less /sqlite which is added: ", config.conf.output_path);
+        writeln("db path: ", db_path);
       }
     }
   }
@@ -1583,16 +1583,16 @@ template SQLiteDbDrop() {
     if ((opt_action.sqlite_db_drop)) {
       string db_filename = (opt_action.sqlite_filename.length > 0)
       ? opt_action.sqlite_filename
-      : (config.conf.w_srv_db_sqlite.length > 0)
-        ? config.conf.w_srv_db_sqlite
+      : (config.conf.w_srv_db_sqlite_filename.length > 0)
+        ? config.conf.w_srv_db_sqlite_filename
         : "";
-      string output_path = (opt_action.output_dir_set.length > 0)
-      ? opt_action.output_dir_set
-      : (config.conf.output_path.length > 0)
-        ? config.conf.output_path
+      string db_path = (opt_action.sqlite_db_path.length > 0) //
+      ? opt_action.sqlite_db_path
+      : (config.conf.w_srv_db_sqlite_path.length > 0)
+        ? config.conf.w_srv_db_sqlite_path
         : "";
-      if (db_filename.length > 0 && output_path.length > 0) {
-        auto pth_sqlite = spinePathsSQLite!()(db_filename, output_path);
+      if (db_filename.length > 0 && db_path.length > 0) {
+        auto pth_sqlite = spinePathsSQLite!()(db_filename, db_path);
         writeln("remove(", pth_sqlite.sqlite_file, ")");
         try {
           remove(pth_sqlite.sqlite_file);
@@ -1602,7 +1602,7 @@ template SQLiteDbDrop() {
       } else {
         writeln("must provide db name & output root path either on the command line or in configuration file");
         writeln("db name: ", db_filename);
-        writeln("output root path (path less /sqlite which is added: ", config.conf.output_path);
+        writeln("db path: ", db_path);
       }
     }
   }