0.23.3 work on source & target file paths/locations

1 files changed, 21 insertions, 21 deletions

diff --git a/org/output_sqlite_discrete.org b/org/output_sqlite_discrete.org
index 056e691..abcb5b3 100644
--- a/org/output_sqlite_discrete.org
+++ b/org/output_sqlite_discrete.org
@@ -66,7 +66,7 @@ template SQLiteDiscreteBuildTablesAndPopulate() {
         <<sqlite_objects_loop>>
       }
     }
-    SQLiteObjectsLoop!()(doc_matters.keys_seq.sql);
+    SQLiteObjectsLoop!()(doc_matters.xml.keys_seq.sql);
   }
 }
 template SQLiteDiscreteTablesCreate() {
@@ -133,7 +133,7 @@ auto generic_munge_sanitize_text_for_search(
   if (_urls.length > 0) {
     _txt ~= _urls;
   }
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     writeln(_txt, "\n");
   }
   debug(sql_text_clean) {
@@ -198,7 +198,7 @@ auto munge_html(O)(
   if (_notes.length > 0) {
     _txt ~= _notes;
   }
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     writeln(_txt, "\n");
   }
   return _txt;
@@ -466,8 +466,8 @@ auto html_table(O)(
 
 #+name: sqlite_db_initialize
 #+BEGIN_SRC d
-auto pth_sqlite = SiSUpathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.language);
-auto db = Database(pth_sqlite.sqlite_file(doc_matters.source_filename));
+auto pth_sqlite = SiSUpathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language);
+auto db = Database(pth_sqlite.sqlite_file(doc_matters.src.filename));
 // auto db = Database(":memory:"); // open database in memory
 db.run("
 #+END_SRC
@@ -1067,7 +1067,7 @@ auto heading(O)(
     "text": generic_munge_sanitize_text_for_search(obj.text),
     "html": html_heading(obj)
   ];
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     debug(sql_txt) {
       writeln(obj_txt["text"]);
     }
@@ -1092,7 +1092,7 @@ auto para(O)(
     "text": generic_munge_sanitize_text_for_search(obj.text),
     "html": html_para(obj)
   ];
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     debug(sql_txt) {
       writeln(obj_txt["text"]);
     }
@@ -1117,7 +1117,7 @@ auto quote(O)(
     "text": generic_munge_sanitize_text_for_search(obj.text),
     "html": html_quote(obj)
   ];
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     debug(sql_txt) {
       writeln(obj_txt["text"]);
     }
@@ -1141,7 +1141,7 @@ auto group(O)(
     "text": generic_munge_sanitize_text_for_search(obj.text),
     "html": html_group(obj)
   ];
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     debug(sql_txt) {
       writeln(obj_txt["text"]);
     }
@@ -1166,7 +1166,7 @@ auto block(O)(
     "text": generic_munge_sanitize_text_for_search(obj.text),
     "html": html_block(obj)
   ];
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     debug(sql_txt) {
       writeln(obj_txt["text"]);
     }
@@ -1191,7 +1191,7 @@ auto verse(O)(
     "text": generic_munge_sanitize_text_for_search(obj.text),
     "html": html_verse(obj)
   ];
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     debug(sql_txt) {
       writeln(obj_txt["text"]);
     }
@@ -1216,7 +1216,7 @@ auto code(O)(
     "text": generic_munge_sanitize_text_for_search(obj.text),
     "html": html_code(obj)
   ];
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     debug(sql_txt) {
       writeln(obj_txt["text"]);
     }
@@ -1241,7 +1241,7 @@ auto table(O)(
     "text": generic_munge_sanitize_text_for_search(obj.text),
     "html": html_table(obj)
   ];
-  if (doc_matters.opt_action.debug_do) {
+  if (doc_matters.opt.action.debug_do) {
     debug(sql_txt) {
       writeln(obj_txt["text"]);
     }
@@ -1274,14 +1274,14 @@ foreach (part; doc_parts) {
           obj_txt = format_and_sqlite_load.heading(obj);
           break;
         default:
-          if ((doc_matters.opt_action.debug_do)) {
+          if ((doc_matters.opt.action.debug_do)) {
             writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
           }
           break;
         }
         break;
       default:
-        if ((doc_matters.opt_action.debug_do)) {
+        if ((doc_matters.opt.action.debug_do)) {
           writeln(__FILE__, ":", __LINE__, ": ", obj.is_of);
         }
         break;
@@ -1303,7 +1303,7 @@ foreach (part; doc_parts) {
           obj_txt = format_and_sqlite_load.para(obj);
           break;
         default:
-          if ((doc_matters.opt_action.debug_do)) {
+          if ((doc_matters.opt.action.debug_do)) {
             writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
           }
           break;
@@ -1332,14 +1332,14 @@ foreach (part; doc_parts) {
           obj_txt = format_and_sqlite_load.table(obj);
           break;
         default:
-          if ((doc_matters.opt_action.debug_do)) {
+          if ((doc_matters.opt.action.debug_do)) {
             writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
           }
           break;
         }
         break;
       default:
-        if ((doc_matters.opt_action.debug_do)) {
+        if ((doc_matters.opt.action.debug_do)) {
           writeln(__FILE__, ":", __LINE__, ": ", obj.is_of);
         }
         break;
@@ -1369,14 +1369,14 @@ foreach (part; doc_parts) {
           obj_txt = format_and_sqlite_load.para(obj);
           break;
         default:
-          if ((doc_matters.opt_action.debug_do)) {
+          if ((doc_matters.opt.action.debug_do)) {
             writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
           }
           break;
         }
         break;
       default:
-        if ((doc_matters.opt_action.debug_do)) {
+        if ((doc_matters.opt.action.debug_do)) {
           writeln(__FILE__, ":", __LINE__, ": ", obj.is_of);
         }
         break;
@@ -1385,7 +1385,7 @@ foreach (part; doc_parts) {
     case "comment":
       break;
     default:
-      if ((doc_matters.opt_action.debug_do)) {
+      if ((doc_matters.opt.action.debug_do)) {
         writeln(__FILE__, ":", __LINE__, ": ", obj.of_part); // check where empty value could come from
         writeln(__FILE__, ":", __LINE__, ": ", obj.is_a);
         writeln(__FILE__, ":", __LINE__, ": ", obj.text); // check where empty value could come from