From 118ea61dc79bf9b1c45bbf81b31361a749e32fdd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 11 Aug 2021 03:06:47 -0400 Subject: spine search and configuration related --- src/doc_reform/meta/conf_make_meta_yaml.d | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/doc_reform/meta/conf_make_meta_yaml.d') diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d index 0940f49..3780553 100644 --- a/src/doc_reform/meta/conf_make_meta_yaml.d +++ b/src/doc_reform/meta/conf_make_meta_yaml.d @@ -350,7 +350,7 @@ template contentYAMLtoSpineStruct() { ) { _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; @@ -412,12 +412,21 @@ template contentYAMLtoSpineStruct() { // _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 ? } } -- cgit v1.2.3