From 916e227028ab19e58a4ae1e5ebb1fa38691633bd Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 23 Nov 2017 16:09:14 -0500
Subject: 0.20.1 struct for opt_actions

---
 org/output_hub.org | 82 +++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

(limited to 'org/output_hub.org')

diff --git a/org/output_hub.org b/org/output_hub.org
index 699e1e6..e8709f2 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -34,7 +34,7 @@ template outputHub() {
 }
 template outputHubOp() {
   <<output_imports>>
-  void outputHubOp(C)(C config) {
+  void outputHubOp(O)(O opt_action) {
     mixin SiSUoutputRgxInit;
     static auto rgx = Rgx();
     <<output_options_op>>
@@ -62,7 +62,7 @@ import sdp.output,
 
 #+name: output_options
 #+BEGIN_SRC d
-if ((doc_matters.opt_action["verbose"])) {
+if ((doc_matters.opt_action.verbose)) {
   writeln(doc_matters.keys_seq.seg);
 }
 #+END_SRC
@@ -72,22 +72,22 @@ if ((doc_matters.opt_action["verbose"])) {
 
 #+name: output_options
 #+BEGIN_SRC d
-if ((doc_matters.opt_action["source"])
-|| (doc_matters.opt_action["sisupod"])) {
-  if ((doc_matters.opt_action["verbose"])
-  && (doc_matters.opt_action["source"]))
+if ((doc_matters.opt_action.source)
+|| (doc_matters.opt_action.sisupod)) {
+  if ((doc_matters.opt_action.verbose)
+  && (doc_matters.opt_action.source))
     { writeln("sisu source processing... "); }
-  if ((doc_matters.opt_action["verbose"])
-  && (doc_matters.opt_action["sisupod"]))
+  if ((doc_matters.opt_action.verbose)
+  && (doc_matters.opt_action.sisupod))
     { writeln("sisupod source processing... "); }
   SiSUpod!()(doc_matters);
-  if ((doc_matters.opt_action["verbose"])
-  && (doc_matters.opt_action["debug"])
-  && (doc_matters.opt_action["source"]))
+  if ((doc_matters.opt_action.verbose)
+  && (doc_matters.opt_action.debug_do)
+  && (doc_matters.opt_action.source))
     { writeln("sisu source done"); }
-  if ((doc_matters.opt_action["verbose"])
-  && (doc_matters.opt_action["debug"])
-  && (doc_matters.opt_action["sisupod"]))
+  if ((doc_matters.opt_action.verbose)
+  && (doc_matters.opt_action.debug_do)
+  && (doc_matters.opt_action.sisupod))
     { writeln("sisupod done"); }
 }
 #+END_SRC
@@ -97,9 +97,9 @@ if ((doc_matters.opt_action["source"])
 
 #+name: output_options
 #+BEGIN_SRC d
-if (doc_matters.opt_action["text"]) {
+if (doc_matters.opt_action.text) {
   /+ mixin outputText; +/
-  if ((doc_matters.opt_action["verbose"])) { writeln("text processing... "); }
+  if ((doc_matters.opt_action.verbose)) { writeln("text processing... "); }
 }
 #+END_SRC
 
@@ -108,23 +108,23 @@ if (doc_matters.opt_action["text"]) {
 
 #+name: output_options
 #+BEGIN_SRC d
-if (doc_matters.opt_action["html"]) {
-  if ((doc_matters.opt_action["verbose"])) { writeln("html scroll processing... "); }
+if (doc_matters.opt_action.html) {
+  if ((doc_matters.opt_action.verbose)) { writeln("html scroll processing... "); }
   outputHTML!().scroll(doc_abstraction, doc_matters);
-  if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { writeln("html scroll done"); }
-  if ((doc_matters.opt_action["verbose"])) { writeln("html seg processing... "); }
+  if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("html scroll done"); }
+  if ((doc_matters.opt_action.verbose)) { writeln("html seg processing... "); }
   outputHTML!().seg(doc_abstraction, doc_matters);
-  if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { writeln("html seg done"); }
+  if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("html seg done"); }
   outputHTML!().css(doc_matters);
-} else if (doc_matters.opt_action["html-seg"]) {
-  if ((doc_matters.opt_action["verbose"])) { writeln("html seg processing... "); }
+} else if (doc_matters.opt_action.html_seg) {
+  if ((doc_matters.opt_action.verbose)) { writeln("html seg processing... "); }
   outputHTML!().seg(doc_abstraction, doc_matters);
-  if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { writeln("html seg done"); }
+  if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("html seg done"); }
   outputHTML!().css(doc_matters);
-} else if (doc_matters.opt_action["html-scroll"]) {
-  if ((doc_matters.opt_action["verbose"])) { writeln("html scroll processing... "); }
+} else if (doc_matters.opt_action.html_scroll) {
+  if ((doc_matters.opt_action.verbose)) { writeln("html scroll processing... "); }
   outputHTML!().scroll(doc_abstraction, doc_matters);
-  if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { writeln("html scroll done"); }
+  if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("html scroll done"); }
   outputHTML!().css(doc_matters);
 }
 #+END_SRC
@@ -134,11 +134,11 @@ if (doc_matters.opt_action["html"]) {
 
 #+name: output_options
 #+BEGIN_SRC d
-if (doc_matters.opt_action["epub"]) {
-  if ((doc_matters.opt_action["verbose"])) { writeln("epub3 processing... "); }
+if (doc_matters.opt_action.epub) {
+  if ((doc_matters.opt_action.verbose)) { writeln("epub3 processing... "); }
   outputEPub3!()(doc_abstraction, doc_matters);
   // epub.css_write;
-  if ((doc_matters.opt_action["verbose"]) && (doc_matters.opt_action["debug"])) { writeln("epub3 done"); }
+  if ((doc_matters.opt_action.verbose) && (doc_matters.opt_action.debug_do)) { writeln("epub3 done"); }
 }
 #+END_SRC
 
@@ -146,7 +146,7 @@ if (doc_matters.opt_action["epub"]) {
 
 #+name: output_options
 #+BEGIN_SRC d
-if (doc_matters.opt_action["pdf"]) {
+if (doc_matters.opt_action.pdf) {
   /+ mixin outputPDF; +/
   writeln("pdf processing");
 }
@@ -156,7 +156,7 @@ if (doc_matters.opt_action["pdf"]) {
 
 #+name: output_options
 #+BEGIN_SRC d
-if (doc_matters.opt_action["odt"]) {
+if (doc_matters.opt_action.odt) {
   /+ mixin outputODT; +/
   writeln("odt processing");
 }
@@ -167,8 +167,8 @@ if (doc_matters.opt_action["odt"]) {
 
 #+name: output_options
 #+BEGIN_SRC d
-if (doc_matters.opt_action["sqlite-discrete"]) {
-  if ((doc_matters.opt_action["verbose"])) { writeln("sqlite processing... "); }
+if (doc_matters.opt_action.sqlite_discrete) {
+  if ((doc_matters.opt_action.verbose)) { writeln("sqlite processing... "); }
   SQLiteDiscreteBuildTablesAndPopulate!()(doc_abstraction, doc_matters);
 }
 #+END_SRC
@@ -177,8 +177,8 @@ if (doc_matters.opt_action["sqlite-discrete"]) {
 
 #+name: output_options
 #+BEGIN_SRC d
-if (doc_matters.opt_action["sqlite-update"]) {
-  if ((doc_matters.opt_action["verbose"])) { writeln("sqlite processing... "); }
+if (doc_matters.opt_action.sqlite_update) {
+  if ((doc_matters.opt_action.verbose)) { writeln("sqlite processing... "); }
   SQLiteBuildTablesAndPopulate!()(doc_abstraction, doc_matters);
 }
 #+END_SRC
@@ -188,12 +188,12 @@ if (doc_matters.opt_action["sqlite-update"]) {
 **** collection
 #+name: output_options_op
 #+BEGIN_SRC d
-if ((config["sqlite-create"])) {
-  if ((config["verbose"])) { writeln("sqlite create table... "); }
+if ((opt_action.sqlite_create)) {
+  if ((opt_action.verbose)) { writeln("sqlite create table... "); }
   SQLiteTablesCreate!()();
 }
-if ((config["sqlite-drop"])) {
-  if ((config["verbose"])) { writeln("sqlite drop table... "); }
+if ((opt_action.sqlite_drop)) {
+  if ((opt_action.verbose)) { writeln("sqlite drop table... "); }
   SQLiteTablesDrop!()();
 }
 #+END_SRC
@@ -202,7 +202,7 @@ if ((config["sqlite-drop"])) {
 
 #+name: output_options
 #+BEGIN_SRC d
-if (doc_matters.opt_action["postgresql"]) {
+if (doc_matters.opt_action.postgresql) {
   /+ mixin outputPostgreSQL; +/
   writeln("pgsql processing");
 }
-- 
cgit v1.2.3