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

---
 src/sdp/output/hub.d | 82 ++++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

(limited to 'src/sdp/output/hub.d')

diff --git a/src/sdp/output/hub.d b/src/sdp/output/hub.d
index 4f5a363..1600dd2 100644
--- a/src/sdp/output/hub.d
+++ b/src/sdp/output/hub.d
@@ -16,73 +16,73 @@ template outputHub() {
   void outputHub(D,I)(D doc_abstraction, I doc_matters) {
     mixin SiSUoutputRgxInit;
     static auto rgx = Rgx();
-    if ((doc_matters.opt_action["verbose"])) {
+    if ((doc_matters.opt_action.verbose)) {
       writeln(doc_matters.keys_seq.seg);
     }
-    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"); }
     }
-    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... "); }
     }
-    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);
     }
-    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"); }
     }
-    if (doc_matters.opt_action["pdf"]) {
+    if (doc_matters.opt_action.pdf) {
       /+ mixin outputPDF; +/
       writeln("pdf processing");
     }
-    if (doc_matters.opt_action["odt"]) {
+    if (doc_matters.opt_action.odt) {
       /+ mixin outputODT; +/
       writeln("odt processing");
     }
-    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);
     }
-    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);
     }
-    if (doc_matters.opt_action["postgresql"]) {
+    if (doc_matters.opt_action.postgresql) {
       /+ mixin outputPostgreSQL; +/
       writeln("pgsql processing");
     }
@@ -98,15 +98,15 @@ template outputHubOp() {
     sdp.output.source_sisupod,
     sdp.output.create_zip_file,
     sdp.output.paths_output;
-  void outputHubOp(C)(C config) {
+  void outputHubOp(O)(O opt_action) {
     mixin SiSUoutputRgxInit;
     static auto rgx = Rgx();
-    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!()();
     }
   }
-- 
cgit v1.2.3