From abe7e7688d045982a28cfb22b8f6269269dd6cf5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 5 Oct 2021 12:55:42 -0400 Subject: sqlite related internal naming --- src/doc_reform/meta/conf_make_meta_yaml.d | 14 ++++++++------ src/doc_reform/meta/metadoc.d | 8 ++++---- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src/doc_reform/meta') diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d index 6afec40..6d4a2b1 100644 --- a/src/doc_reform/meta/conf_make_meta_yaml.d +++ b/src/doc_reform/meta/conf_make_meta_yaml.d @@ -395,13 +395,15 @@ template contentYAMLtoSpineStruct() { : _struct_composite.conf.w_srv_host ~ _struct_composite.conf.w_srv_cgi_bin_subpath; } - if (_opt_action.cgi_sqlite_search_filename.length > 0) { - _struct_composite.conf.w_srv_cgi_action = _struct_composite.conf.w_srv_cgi_bin_url ~ "/" ~ _opt_action.cgi_sqlite_search_filename; + if (_opt_action.cgi_url_action.length > 0) { + _struct_composite.conf.w_srv_cgi_action = _opt_action.cgi_url_action; } else if ("cgi_action" in _yaml["webserv"] && _yaml["webserv"]["cgi_action"].type.string && _yaml["webserv"]["cgi_action"].tag.match(rgx.yaml_tag_is_str) ) { _struct_composite.conf.w_srv_cgi_action = _yaml["webserv"]["cgi_action"].get!string; + } else if (_opt_action.cgi_sqlite_search_filename.length > 0) { // WORKON + _struct_composite.conf.w_srv_cgi_action = _struct_composite.conf.w_srv_cgi_bin_url ~ "/" ~ _opt_action.cgi_sqlite_search_filename; } else { // action is composite, build } // if ("cgi_file_links" in _yaml["webserv"] @@ -410,8 +412,8 @@ 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_filename = _opt_action.sqlite_filename; + if (_opt_action.sqliteDB_filename.length > 0) { + _struct_composite.conf.w_srv_db_sqlite_filename = _opt_action.sqliteDB_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) @@ -419,8 +421,8 @@ template contentYAMLtoSpineStruct() { _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; + if (_opt_action.sqliteDB_path.length > 0) { + _struct_composite.conf.w_srv_db_sqlite_path = _opt_action.sqliteDB_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) diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d index 6f4a2a4..fdec126 100644 --- a/src/doc_reform/meta/metadoc.d +++ b/src/doc_reform/meta/metadoc.d @@ -185,8 +185,8 @@ template spineAbstraction() { @safe string filename() { string _fn = ""; string _pth = ""; - if (_opt_action.sqlite_filename.length > 0) { - _fn = _opt_action.sqlite_filename; + if (_opt_action.sqliteDB_filename.length > 0) { + _fn = _opt_action.sqliteDB_filename; } else if (_make_and_meta_struct.conf.w_srv_db_sqlite_filename.length > 0) { _fn = _make_and_meta_struct.conf.w_srv_db_sqlite_filename; } @@ -194,8 +194,8 @@ template spineAbstraction() { } @safe string path() { string _pth = ""; - if (_opt_action.sqlite_path.length > 0) { - _pth = _opt_action.sqlite_path; + if (_opt_action.sqliteDB_path.length > 0) { + _pth = _opt_action.sqliteDB_path; } else if (_make_and_meta_struct.conf.w_srv_db_sqlite_path.length > 0) { _pth = _make_and_meta_struct.conf.w_srv_db_sqlite_path; } -- cgit v1.2.3