spine search and configuration related

1 files changed, 18 insertions, 8 deletions

diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index 676d395..e162bcc 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -47,7 +47,7 @@ webserv:
   cgi_bin_part:               "cgi-bin"
   cgi_bin_path:               "/usr/lib/cgi-bin"
   cgi_search_title:           "≅ SiSU spine search form"
-  cgi_search_script:          "spine-search"
+  cgi_search_script:          "spine_search"
   cgi_search_script_raw_fn_d: "spine_search.d"
   cgi_port:                   ""
   cgi_user:                   ""
@@ -284,7 +284,8 @@ struct ConfCompositeSiteLocal {
   string   w_srv_cgi_user;
   string   w_srv_cgi_action;
   string   w_srv_cgi_bin_url;
-  string   w_srv_db_sqlite;
+  string   w_srv_db_sqlite_filename;
+  string   w_srv_db_sqlite_path;
   // string   w_srv_db_pg;
   string   w_srv_db_pg_table;
   string   w_srv_db_pg_user;
@@ -722,7 +723,7 @@ if ("webserv" in _yaml
     ) {
       _struct_composite.conf.w_srv_cgi_search_script = _yaml["webserv"]["cgi_search_script"].get!string;
     } else {
-      _struct_composite.conf.w_srv_cgi_search_script = "spine-search";
+      _struct_composite.conf.w_srv_cgi_search_script = "spine_search";
     }
     if (_opt_action.cgi_sqlite_search_filename_d.length > 0) {
       _struct_composite.conf.w_srv_cgi_search_script_raw_fn_d = _opt_action.cgi_sqlite_search_filename_d;
@@ -784,12 +785,21 @@ if ("webserv" in _yaml
     //   _struct_composite.conf.w_srv_cgi_file_links = _yaml["webserv"]["cgi_file_links"].get!string;
     // }
     if (_opt_action.sqlite_filename.length > 0) {
-      _struct_composite.conf.w_srv_db_sqlite = _opt_action.sqlite_filename;
-    } else if ("db_sqlite" in _yaml["webserv"]
-      && _yaml["webserv"]["db_sqlite"].type.string
-      && _yaml["webserv"]["db_sqlite"].tag.match(rgx.yaml_tag_is_str)
+      _struct_composite.conf.w_srv_db_sqlite_filename = _opt_action.sqlite_filename;
+    } else if ("db_sqlite_filename" in _yaml["webserv"]
+      && _yaml["webserv"]["db_sqlite_filename"].type.string
+      && _yaml["webserv"]["db_sqlite_filename"].tag.match(rgx.yaml_tag_is_str)
     ) {
-      _struct_composite.conf.w_srv_db_sqlite = _yaml["webserv"]["db_sqlite"].get!string;
+      _struct_composite.conf.w_srv_db_sqlite_filename = _yaml["webserv"]["db_sqlite_filename"].get!string;
+    } else { // set default ?
+    }
+    if (_opt_action.sqlite_path.length > 0) {
+      _struct_composite.conf.w_srv_db_sqlite_path = _opt_action.sqlite_path;
+    } else if ("db_sqlite_path" in _yaml["webserv"]
+      && _yaml["webserv"]["db_sqlite_path"].type.string
+      && _yaml["webserv"]["db_sqlite_path"].tag.match(rgx.yaml_tag_is_str)
+    ) {
+      _struct_composite.conf.w_srv_db_sqlite_path = _yaml["webserv"]["db_sqlite_path"].get!string;
     } else { // set default ?
     }
   }