org, minor reorganize for d config views

1 files changed, 62 insertions, 23 deletions

diff --git a/org/config_d_cfte.org b/org/config_d_cfte.org
index a1e8f81..5b63bdd 100644
--- a/org/config_d_cfte.org
+++ b/org/config_d_cfte.org
@@ -109,54 +109,56 @@ enum _cfg = Cfg();
 <<config_localhost>>
 #+END_SRC
 
-**** configure remote host (sisudoc.org)
+**** configure localhost
 
-#+NAME: config_remotehost
-#+HEADER: :tangle ../views/configuration.txt_remotehost_
+#+NAME: config_localhost
+#+HEADER: :tangle ../views/configuration.txt_localhost_
 #+BEGIN_SRC d
+/+ obt - org-mode generated file +/
 struct Cfg {
-  string http_request_type        = "https";
-  string http_host                = "sisudoc.org";
-  string www_url_doc_root         = "https://sisudoc.org";
+  string http_request_type        = "http";
+  string http_host                = "localhost";
+  string www_url_doc_root         = "http://localhost";
   string www_url_doc_subroot      = "/spine";
   string processing_path_doc_root = "/srv/www/spine";
   string cgi_bin_root             = "/var/www/cgi/cgi-bin";
-  string cgi_bin_subpath          = "";
+  string cgi_bin_subpath          = "/cgi-bin";
   string cgi_filename             = "spine_search";
-  string cgi_url_root             = "https://sisudoc.org";
+  string cgi_url_root             = "http://localhost/cgi-bin";
   string cgi_port                 = "";
   string cgi_user                 = "";
-  string cgi_url_action           = "https://sisudoc.org/spine_search";
-  string cgi_search_form_title    = "≅ SiSU Spine search";
+  string cgi_url_action           = "http://localhost/cgi-bin/spine_search";
+  string cgi_search_form_title    = "<<cgi_search_form_title>>";
   string db_sqlite_path           = "/var/www/sqlite";
   string db_sqlite_filename       = "spine.search.db";
   string default_language         = "en";
-  string default_papersize        = "a4";
+  string default_papersize        = "a4,letter.portrait";
   string default_text_wrap        = "80";
   string default_hash_digest      = "sha256";
 }
 enum _cfg = Cfg();
 #+END_SRC
 
-**** configure localhost
+**** configure remote host (sisudoc.org)
 
-#+NAME: config_localhost
-#+HEADER: :tangle ../views/configuration.txt_localhost_
+#+NAME: config_remotehost
+#+HEADER: :tangle ../views/configuration.txt_remotehost_
 #+BEGIN_SRC d
+/+ obt - org-mode generated file +/
 struct Cfg {
-  string http_request_type        = "http";
-  string http_host                = "localhost";
-  string www_url_doc_root         = "http://localhost";
+  string http_request_type        = "https";
+  string http_host                = "sisudoc.org";
+  string www_url_doc_root         = "https://sisudoc.org";
   string www_url_doc_subroot      = "/spine";
   string processing_path_doc_root = "/srv/www/spine";
   string cgi_bin_root             = "/var/www/cgi/cgi-bin";
-  string cgi_bin_subpath          = "/cgi-bin";
+  string cgi_bin_subpath          = "";
   string cgi_filename             = "spine_search";
-  string cgi_url_root             = "http://localhost/cgi-bin";
+  string cgi_url_root             = "https://sisudoc.org";
   string cgi_port                 = "";
   string cgi_user                 = "";
-  string cgi_url_action           = "http://localhost/cgi-bin/spine_search";
-  string cgi_search_form_title    = "≅ SiSU Spine search";
+  string cgi_url_action           = "https://sisudoc.org/spine_search";
+  string cgi_search_form_title    = "<<cgi_search_form_title>>";
   string db_sqlite_path           = "/var/www/sqlite";
   string db_sqlite_filename       = "spine.search.db";
   string default_language         = "en";
@@ -168,22 +170,59 @@ enum _cfg = Cfg();
 #+END_SRC
 
 *** shared settings SET defaults
+**** default set
 
 #+NAME: http_request_type
 #+BEGIN_SRC sh
-http
+<<http_request_type_localhost>>
 #+END_SRC
 
 #+NAME: http_host
 #+BEGIN_SRC sh
-localhost
+<<http_host_localhost>>
 #+END_SRC
 
 #+NAME: www_url_doc_root
 #+BEGIN_SRC sh
+<<www_url_doc_root_localhost>>
+#+END_SRC
+
+**** localhost
+
+#+NAME: http_request_type_localhost
+#+BEGIN_SRC sh
+http
+#+END_SRC
+
+#+NAME: http_host_localhost
+#+BEGIN_SRC sh
+localhost
+#+END_SRC
+
+#+NAME: www_url_doc_root_localhost
+#+BEGIN_SRC sh
 http://localhost
 #+END_SRC
 
+**** remotehost
+
+#+NAME: http_request_type_remotehost
+#+BEGIN_SRC sh
+https
+#+END_SRC
+
+#+NAME: http_host_remotehost
+#+BEGIN_SRC sh
+sisudoc.org
+#+END_SRC
+
+#+NAME: www_url_doc_root_remotehost
+#+BEGIN_SRC sh
+https://sisudoc.org
+#+END_SRC
+
+**** directory paths
+
 #+NAME: www_url_doc_subroot
 #+BEGIN_SRC sh
 /spine