From 24269204508d8cf8f963eb9c7d149d18840e4dad Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Thu, 12 Aug 2021 13:14:49 -0400
Subject: config, clean up and make a bit more consistent

- check version settings with:
  rg -A2 _version_set$ org
---
 org/spine.org | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'org/spine.org')

diff --git a/org/spine.org b/org/spine.org
index 6621fac..14d5297 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -58,7 +58,8 @@ string program_name = "spine";
   <<spine_init_0>>
   <<spine_init_1>>
   <<spine_init_2>>
-  <<spine_args_0_args_init>>
+  <<spine_args_0_args_init_opts>>
+  <<spine_args_0_args_init_settings>>
   <<spine_args_1_args_get_options_aa>>
   <<spine_args_2_args_get_options_aa2str>>
   <<spine_args_3_program_info>>
@@ -331,9 +332,10 @@ scope(failure) {
 *** getopt args for loop :args:getopt:
 **** set getopt options
 - set getopt options
-***** initialize
 
-#+NAME: spine_args_0_args_init
+***** initialize opts
+
+#+NAME: spine_args_0_args_init_opts
 #+BEGIN_SRC d
 bool[string] opts = [
   "abstraction"                 : false,
@@ -397,17 +399,25 @@ bool[string] opts = [
   "theme-light"                 : false,
   "workon"                      : false,
 ];
+#+END_SRC
+
+***** initialize settings
+
+see also: config_d_cfte.org
+
+#+NAME: spine_args_0_args_init_settings
+#+BEGIN_SRC d
 string[string] settings = [
   "output"                      : "",    //_cfg.www_doc_root,          // "/srv/www/spine/static" or "/var/www/html"
   "www-http"                    : "",    //_cfg.www_http,              // "http" or "https"
-  "www-domain"                  : "",    //_cfg.www_domain,            // start with "localhost" ?
-  "www-domain-doc-root"         : "",    //_cfg.www_domain_doc_root,   // start with "localhost" ?
+  "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-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" ?
   "cgi-url-action"              : "",    //_cfg.cgi_url_action,        // start with "http://localhost/cgi-bin/spine-search"
-  "cgi-search-title"            : "",    //_cfg.cgi_title,             // e.g. "≅ SiSU Spine search"
+  "cgi-search-title"            : "",    //_cfg.cgi_search_form_title, // e.g. "≅ SiSU Spine search"
   "config"                      : "",
   "lang"                        : "all", //_cfg.default_language,      // suggest "all" or "en" (default which language to process)
   "set-papersize"               : "",    //_cfg.default_papersize,     // suggest: a4
@@ -486,8 +496,8 @@ auto helpInfo = getopt(args,
   "sqlite-insert",              "sqlite output",                                                  &opts["sqlite-insert"],
   "sqlite-update",              "sqlite output",                                                  &opts["sqlite-update"],
   "www-http",                   "http or https",                                                  &settings["www-http"],
-  "www-domain",                 "web server domain name",                                         &settings["www-domain"],
-  "www-domain-doc-root",        "web host domain name with path to doc root",                     &settings["www-domain-doc-root"],
+  "www-host",                   "web server host (domain) name",                                  &settings["www-host"],
+  "www-host-doc-root",          "web host host (domain) name with path to doc root",              &settings["www-host-doc-root"],
   "www-url-doc-root",           "e.g. http://localhost",                                          &settings["www-url-doc-root"],
   "text",                       "text output",                                                    &opts["text"],
   "theme-dark",                 "alternative dark theme",                                         &opts["theme-dark"],
@@ -735,11 +745,11 @@ struct OptActions {
   @trusted string latex_papersize() {
     return settings["set-papersize"];
   }
-  @trusted string  webserver_domain_name() {
-    return settings["www-domain"];
+  @trusted string  webserver_host_name() {
+    return settings["www-host"];
   }
-  @trusted string  webserver_domain_doc_root() {
-    return settings["www-domain-doc-root"];
+  @trusted string  webserver_host_doc_root() {
+    return settings["www-host-doc-root"];
   }
   @trusted string  webserver_url_doc_root() {
     return settings["www-url-root"];
-- 
cgit v1.2.3