From 02718313824caa0e87eb0f1448684ff8d2dbe4d1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 5 Oct 2021 12:39:53 -0400
Subject: primarily org related

---
 src/doc_reform/spine.d | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/doc_reform/spine.d')

diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d
index 0893572..502ad15 100755
--- a/src/doc_reform/spine.d
+++ b/src/doc_reform/spine.d
@@ -41,7 +41,7 @@
     - docReform object numbering
       - standard SiSU object citation numbering & system
 
-  - Hompages:
+  - Homepages:
     [https://www.doc_reform.org]
     [https://www.sisudoc.org]
 
@@ -52,7 +52,7 @@
 module doc_reform.sisu_document_parser;
 /++
 name        "spine"
-description "A SiSU inspired document parser writen in D."
+description "A SiSU inspired document parser written in D."
 homepage    "https://sisudoc.org"
 +/
 import
@@ -119,11 +119,11 @@ string program_name = "spine";
     "debug"                       : false,
     "digest"                      : false,
     "epub"                        : false,
-    "curate"                     : false,
-    "curate-authors"             : false,
-    "curate-topics"              : false,
+    "curate"                      : false,
+    "curate-authors"              : false,
+    "curate-topics"               : false,
     "html"                        : false,
-    "html-link-curate"           : false,
+    "html-link-curate"            : false,
     "html-link-search"            : false,
     "html-seg"                    : false,
     "html-scroll"                 : false,
@@ -177,6 +177,8 @@ string program_name = "spine";
     "www-host"                    : "",    //_cfg.www_host,              // start with "localhost" ?
     "www-host-doc-root"           : "",    //_cfg.www_host_doc_root,     // start with "localhost" ?
     "www-url-doc-root"            : "",    //_cfg.www_url_doc_root,      // start with "http://localhost" ?
+    "cgi-http"                    : "",    //_cfg.cgi_http,              // suggest
+    "cgi-host"                    : "",    //_cfg.cgi_host,              // suggest
     "cgi-bin-root"                : "",    //_cfg.cgi_bin_root,          // suggest "/var/www/cgi/cgi-bin"
     "cgi-sqlite-search-filename"  : "",    //_cfg.cgi_filename,          // suggest "spine_search" (though "spine-search" would have been preferable?)
     "cgi-url-root"                : "",    //_cfg.cgi_url_root,          // start with "http://localhost/cgi-bin" ?
@@ -503,7 +505,7 @@ string program_name = "spine";
       return settings["www-host-doc-root"];
     }
     @trusted string  webserver_url_doc_root() {
-      return settings["www-url-root"];
+      return settings["www-url-doc-root"];
     }
     @trusted string  webserver_http() {
       return settings["www-http"];
@@ -654,7 +656,7 @@ string program_name = "spine";
   auto _manifested = PathMatters!()(_opt_action, _env, "");
   auto _manifests = [ _manifested ];
   auto _conf_file_details = configFilePaths!()(_manifested, _env, _opt_action.config_path_set);
-  ConfComposite _config;
+  ConfComposite _siteConfig;
   if (
     _opt_action.require_processing_files
     && _opt_action.config_path_set.empty
@@ -666,7 +668,7 @@ string program_name = "spine";
           _conf_file_details = configFilePaths!()(_manifested, _env, _opt_action.config_path_set);
           auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg);
           import doc_reform.meta.conf_make_meta_yaml;
-          _config = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_config, _manifested, _opt_action); // - get local site config
+          _siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action); // - get local site config
           break;
         }
       }
@@ -674,11 +676,11 @@ string program_name = "spine";
   } else { /+ local site config +/
     auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg);
     import doc_reform.meta.conf_make_meta_yaml;
-    _config = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_config, _manifested, _opt_action); // - get local site config
+    _siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action); // - get local site config
   }
   if (_opt_action.show_config) {
     import doc_reform.meta.metadoc_show_config;
-    spineShowSiteConfig!()(_opt_action, _config);
+    spineShowSiteConfig!()(_opt_action, _siteConfig);
   }
   if (!(_opt_action.skip_output)) {
     if ((_opt_action.debug_do)
@@ -686,15 +688,15 @@ string program_name = "spine";
     ) {
       writeln("step0 commence → (without processing files)");
     }
-    outputHubOp!()(_env, _opt_action, _config);
+    outputHubOp!()(_env, _opt_action, _siteConfig);
     if ((_opt_action.debug_do)
     || (_opt_action.very_verbose)
     ) {
       writeln("- step0 complete");
     }
   }
-  ConfComposite _make_and_meta_struct = _config;
-  destroy(_config);
+  ConfComposite _make_and_meta_struct = _siteConfig;
+  destroy(_siteConfig);
   foreach(arg; args[1..$]) {
     if (arg.match(rgx.flag_action)) { /+ cli instruction, flag do +/
       flag_action ~= " " ~ arg;   // flags not taken by getopt
-- 
cgit v1.2.3