config & sqlite search output, some changes

1 files changed, 9 insertions, 9 deletions

diff --git a/org/out_cgi_search_sqlite.org b/org/out_cgi_search_sqlite.org
index 7f17bc9..fc54d1d 100644
--- a/org/out_cgi_search_sqlite.org
+++ b/org/out_cgi_search_sqlite.org
@@ -88,7 +88,7 @@ template CGIsearchSQLite() {
     string _cgi_search_script_raw_fn_d = (opt_action.cgi_sqlite_search_filename_d.empty)
       ? make_and_meta_struct.conf.w_srv_cgi_search_script_raw_fn_d
       : opt_action.cgi_sqlite_search_filename_d;
-    string get_doc_collection_sub_root(string output_path) {
+    string get_doc_collection_subroot(string output_path) {
       string web_doc_root_path = environment.get("DOCUMENT_ROOT", "/var/www/html");
       auto m = output_path.matchFirst(regex("^(" ~ web_doc_root_path ~ ")"));
       return m.post;
@@ -136,7 +136,7 @@ void cgi_function_intro(Cgi cgi) {
 }
 mixin GenericMain!cgi_function_intro;
 ≓",
-  get_doc_collection_sub_root(make_and_meta_struct.conf.output_path),
+  get_doc_collection_subroot(make_and_meta_struct.conf.output_path),
   make_and_meta_struct.conf.output_path ~ "/sqlite/",
   _sqlite_db_fn,
   (opt_action.cgi_search_title.empty)
@@ -277,7 +277,7 @@ struct Config {
   string http_host;
   // string server_name;
   string web_doc_root_path;
-  string doc_collection_sub_root;
+  string doc_collection_subroot;
   string cgi_root;
   string cgi_script;
   string data_path_html;
@@ -291,7 +291,7 @@ conf.http_request_type       = environment.get("REQUEST_SCHEME",        "http");
 conf.http_host               = environment.get("HTTP_HOST",             "localhost");
 // conf.server_name             = environment.get("SERVER_NAME",           "localhost");
 conf.web_doc_root_path       = environment.get("DOCUMENT_ROOT",         "/var/www/html");
-conf.doc_collection_sub_root = "%s"; // (output_path - web_doc_root_path)
+conf.doc_collection_subroot = "%s"; // (output_path - web_doc_root_path)
 conf.cgi_root                = environment.get("CONTEXT_DOCUMENT_ROOT", "/usr/lib/cgi-bin/");
 // conf.cgi_script              = environment.get("SCRIPT_NAME",           "/cgi-bin/spine-search");
 conf.query_string            = environment.get("QUERY_STRING",          "");
@@ -2097,7 +2097,7 @@ if (!select_query_results.empty) {
         _close_para
         ~ "<hr><div class=\"publication\">"
           ~ "<p class=\"publication\"><a href=\""
-            ~ "https://" ~ conf.http_host ~ conf.doc_collection_sub_root ~ "/"
+            ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
             ~ row["language_document_char"].as!string ~ "/html/"
             ~ row["src_filename_base"].as!string ~ "/"
             ~ "toc.html"
@@ -2125,7 +2125,7 @@ if (cv.results_type == "txt") {
       "<div class=\"flex-container\">"
       ~ "<div class=\"textview_ocn\" style=\"flex: 0 0 1.2em\">"
         ~ "<p class=\"ocn_is\"><a href=\""
-          ~ "https://" ~ conf.http_host ~ conf.doc_collection_sub_root ~ "/"
+          ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
           ~ row["language_document_char"].as!string ~ "/html/"
           ~ row["src_filename_base"].as!string ~ "/"
           ~ row["seg_name"].as!string ~ ".html#" ~ row["ocn"].as!string
@@ -2143,7 +2143,7 @@ if (cv.results_type == "txt") {
       "<div class=\"flex-container\">"
       ~ "<div class=\"textview_ocn\" style=\"flex: 0 0 1.2em\">"
         ~ "<p class=\"ocn_is\"><a href=\""
-          ~ "https://" ~ conf.http_host ~ conf.doc_collection_sub_root ~ "/"
+          ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
           ~ row["language_document_char"].as!string ~ "/html/"
           ~ row["src_filename_base"].as!string ~ "/toc.html"
         ~ "\">"
@@ -2167,7 +2167,7 @@ if (cv.results_type == "txt") {
     cgi.write(
       _matched_ocn_open
       ~ "<a href=\""
-        ~ "https://" ~ conf.http_host ~ conf.doc_collection_sub_root ~ "/"
+        ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
         ~ row["language_document_char"].as!string ~ "/html/"
         ~ row["src_filename_base"].as!string ~ "/"
         ~ row["seg_name"].as!string ~ ".html#" ~ row["ocn"].as!string
@@ -2179,7 +2179,7 @@ if (cv.results_type == "txt") {
     cgi.write(
       _matched_ocn_open
       ~ "<a href=\""
-        ~ "https://" ~ conf.http_host ~ conf.doc_collection_sub_root ~ "/"
+        ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
         ~ row["language_document_char"].as!string ~ "/html/"
         ~ row["src_filename_base"].as!string ~ "/toc.html"
       ~ "\">"