From 25c30732826b75420bab6287bfe7cbbc9f75e3b5 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 6 Jun 2017 17:54:49 -0400
Subject: getopt, fixes, & naming command line options related

---
 src/sdp/output/hub.d | 69 ++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

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

diff --git a/src/sdp/output/hub.d b/src/sdp/output/hub.d
index 79b8996..fd64851 100644
--- a/src/sdp/output/hub.d
+++ b/src/sdp/output/hub.d
@@ -14,64 +14,63 @@ template outputHub() {
   void outputHub(D,I)(D doc_abstraction, I doc_matters) {
     mixin SiSUoutputRgxInit;
     auto rgx = Rgx();
-    if ((doc_matters.opt_action_bool["verbose"])) {
+    if ((doc_matters.opt_action["verbose"])) {
       writeln(doc_matters.keys_seq.seg);
     }
-    if ((doc_matters.opt_action_bool["source"])
-    || (doc_matters.opt_action_bool["sisupod"])) {
-      if ((doc_matters.opt_action_bool["verbose"])
-      && (doc_matters.opt_action_bool["source"]))
-        { write("sisu source processing... "); }
-      if ((doc_matters.opt_action_bool["verbose"])
-      && (doc_matters.opt_action_bool["sisupod"]))
-        { write("sisupod source processing... "); }
+    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"]))
+        { writeln("sisupod source processing... "); }
       SiSUpod!()(doc_matters);
-      if ((doc_matters.opt_action_bool["verbose"])
-      && (doc_matters.opt_action_bool["source"]))
+      if ((doc_matters.opt_action["verbose"])
+      && (doc_matters.opt_action["source"]))
         { writeln("sisu source done"); }
-      if ((doc_matters.opt_action_bool["verbose"])
-      && (doc_matters.opt_action_bool["sisupod"]))
+      if ((doc_matters.opt_action["verbose"])
+      && (doc_matters.opt_action["sisupod"]))
         { writeln("sisupod done"); }
     }
-    if (doc_matters.opt_action_bool["text"]) {
+    if (doc_matters.opt_action["text"]) {
       /+ mixin outputText; +/
-      writeln("text processing");
+      if ((doc_matters.opt_action["verbose"])) { writeln("text processing... "); }
     }
-    if (doc_matters.opt_action_bool["html"]) {
-      if ((doc_matters.opt_action_bool["verbose"])) { write("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_bool["verbose"])) { writeln("html scroll done"); }
-      if ((doc_matters.opt_action_bool["verbose"])) { write("html seg processing... "); }
+      if ((doc_matters.opt_action["verbose"])) { 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_bool["verbose"])) { writeln("html seg done"); }
-    } else if (doc_matters.opt_action_bool["html_seg"]) {
-      if ((doc_matters.opt_action_bool["verbose"])) { write("html seg processing... "); }
+      if ((doc_matters.opt_action["verbose"])) { writeln("html seg done"); }
+    } 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_bool["verbose"])) { writeln("html seg done"); }
-    } else if (doc_matters.opt_action_bool["html_scroll"]) {
-      if ((doc_matters.opt_action_bool["verbose"])) { write("html scroll processing... "); }
+      if ((doc_matters.opt_action["verbose"])) { writeln("html seg done"); }
+    } 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_bool["verbose"])) { writeln("html scroll done"); }
+      if ((doc_matters.opt_action["verbose"])) { writeln("html scroll done"); }
     }
-    if (doc_matters.opt_action_bool["epub"]) {
-      if ((doc_matters.opt_action_bool["verbose"])) { write("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_bool["verbose"])) { writeln("epub3 done"); }
+      if ((doc_matters.opt_action["verbose"])) { writeln("epub3 done"); }
     }
-    if (doc_matters.opt_action_bool["pdf"]) {
+    if (doc_matters.opt_action["pdf"]) {
       /+ mixin outputPDF; +/
       writeln("pdf processing");
     }
-    if (doc_matters.opt_action_bool["odt"]) {
+    if (doc_matters.opt_action["odt"]) {
       /+ mixin outputODT; +/
       writeln("odt processing");
     }
-    if (doc_matters.opt_action_bool["sqlite"]) {
-      /+ mixin outputSQLite; +/
-      writeln("sqlite processing");
+    if (doc_matters.opt_action["sqlite"]) {
+      if ((doc_matters.opt_action["verbose"])) { writeln("sqlite processing... "); }
     }
-    if (doc_matters.opt_action_bool["postgresql"]) {
+    if (doc_matters.opt_action["postgresql"]) {
       /+ mixin outputPostgreSQL; +/
       writeln("pgsql processing");
     }
-- 
cgit v1.2.3