0.10.0 search sqlite & cgi

2 files changed, 33 insertions, 26 deletions

diff --git a/src/doc_reform/io_in/read_config_files.d b/src/doc_reform/io_in/read_config_files.d
index 9daf362..69c2f55 100644
--- a/src/doc_reform/io_in/read_config_files.d
+++ b/src/doc_reform/io_in/read_config_files.d
@@ -19,30 +19,37 @@ template readConfigSite() {
     string config_file_str;
     string default_config_file_str = format(q"┃
 flag:
-  act0: --html
-  act1: --html --epub
-#output:
-#  path: ""
+  act0:              "--html"
+  act1:              "--html --epub"
+output:
+  path:              "/var/www/html"
 default:
-  language:  "en"
-  papersize: "a4"
-  text_wrap: "80"
-  digest:    "sha256"
-search:
-  title:     ""
-  flag:      ""
-  action:    ""
-  db:        ""
+  language:          "en"
+  papersize:         "a4"
+  text_wrap:         "80"
+  digest:            "sha256"
 webserv:
-  url_domain:    "not-configured"
-  url_root:      "doc"
-  doc_path:      "doc"
-  images:        ""
-  cgi:           ""
-  cgi_host:      ""
-  cgi_host_path: ""
-  cgi_port:      ""
-  cgi_user:      ""
+  http:              "http"
+  domain:            "localhost"
+  data_http:         "http"
+  data_domain:       "localhost"
+  data_root_url:     "http://localhost"
+  data_root_path:    "/var/www/html"
+  data_root_part:    ""
+  images_root_part:  "image"
+  cgi_title:         "≅ SiSU Spine search"
+  cgi_http:          "http"
+  cgi_domain:        "localhost"
+  cgi_bin_url:       "http://localhost/cgi-bin"
+  cgi_bin_part:      "cgi-bin"
+  cgi_bin_path:       "/usr/lib/cgi-bin"
+  cgi_search_script: "spine-search"
+  cgi_port:          ""
+  cgi_user:          ""
+  cgi_action:        "http://localhost/cgi-bin/spine-search"
+  db_sqlite:         "spine.search.db"
+  db_pg_table:       ""
+  db_pg_user:        ""
 ┃");
     foreach(conf_fn; [_conf_file_details.config_filename_site]) {
       foreach(pth; _conf_file_details.possible_config_path_locations.config_local_site) {
diff --git a/src/doc_reform/io_in/read_source_files.d b/src/doc_reform/io_in/read_source_files.d
index 7d826a9..2959cc6 100644
--- a/src/doc_reform/io_in/read_source_files.d
+++ b/src/doc_reform/io_in/read_source_files.d
@@ -187,7 +187,7 @@ template spineRawMarkupContent() {
           }
           contents_insert ~= line;
         } else if (line.matchFirst(rgx.block_curly_code_open)) {
-          type1["curly_code"] = 1;
+          type1["curly_code"]  = 1;
           type1["header_make"] = 0;
           type1["header_meta"] = 0;
           contents_insert ~= line;
@@ -199,7 +199,7 @@ template spineRawMarkupContent() {
           }
           contents_insert ~= line;
         } else if (line.matchFirst(rgx.block_tic_code_open)) {
-          type1["tic_code"] = 1;
+          type1["tic_code"]    = 1;
           type1["header_make"] = 0;
           type1["header_meta"] = 0;
           contents_insert ~= line;
@@ -265,7 +265,7 @@ template spineRawMarkupContent() {
       auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm);
       auto markup_src_file_path = fn_pth_full.captures[1];
       char[][] contents_insert;
-      string[] _images =[];
+      string[] _images          =[];
       string[] insert_file_list =[];
       foreach (line; sourcefile_body_content) {
         if (type["curly_code"] == 1) {
@@ -285,7 +285,7 @@ template spineRawMarkupContent() {
           type["tic_code"] = 1;
           contents ~= line;
         } else if (auto m = line.match(rgx.insert_src_fn_ssi_or_sst)) {
-          auto insert_fn = m.captures[2];
+          auto insert_fn      = m.captures[2];
           auto insert_sub_pth = m.captures[1];
           auto fn_src_insert
             = chainPath(markup_src_file_path, insert_sub_pth ~ insert_fn).array;