aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/meta_conf_make_meta.org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2021-10-05 12:55:42 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2021-11-27 19:40:46 -0500
commitabe7e7688d045982a28cfb22b8f6269269dd6cf5 (patch)
tree10f0348dd04a9e11f32f0b5d2b6e3c97505ccb9c /org/meta_conf_make_meta.org
parentxmls homepage link (diff)
sqlite related internal naming
Diffstat (limited to 'org/meta_conf_make_meta.org')
-rw-r--r--org/meta_conf_make_meta.org14
1 files changed, 8 insertions, 6 deletions
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index 1bd2d7a..cdb7571 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -769,13 +769,15 @@ if ("webserv" in _yaml
: _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"]
@@ -784,8 +786,8 @@ 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_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)
@@ -793,8 +795,8 @@ if ("webserv" in _yaml
_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)