From 24269204508d8cf8f963eb9c7d149d18840e4dad Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 12 Aug 2021 13:14:49 -0400 Subject: config, clean up and make a bit more consistent - check version settings with: rg -A2 _version_set$ org --- sundry/spine_search_cgi/src/spine_search.d | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'sundry/spine_search_cgi/src/spine_search.d') diff --git a/sundry/spine_search_cgi/src/spine_search.d b/sundry/spine_search_cgi/src/spine_search.d index a2d290a..2f9de26 100644 --- a/sundry/spine_search_cgi/src/spine_search.d +++ b/sundry/spine_search_cgi/src/spine_search.d @@ -72,6 +72,8 @@ void cgi_function_intro(Cgi cgi) { string doc_collection_sub_root; string cgi_root; string cgi_script_name; + string cgi_search_form_title; + string cgi_search_form_html_title; string data_path_html; string http_url; string query_base_url; @@ -80,12 +82,19 @@ void cgi_function_intro(Cgi cgi) { string db_path; } auto conf = Config(); - conf.http_request_type = environment.get("REQUEST_SCHEME", _cfg.http_request_type); - conf.http_host = environment.get("SERVER_NAME", _cfg.http_host); - conf.web_doc_root_path = environment.get("DOCUMENT_ROOT", _cfg.www_doc_root); - conf.doc_collection_sub_root = "/spine/static"; // (output_path - web_doc_root_path) - conf.cgi_root = environment.get("CONTEXT_DOCUMENT_ROOT", _cfg.cgi_bin_subpath); - conf.cgi_script_name = environment.get("SCRIPT_NAME", _cfg.cgi_filename); + conf.http_request_type = environment.get("REQUEST_SCHEME", _cfg.http_request_type); + conf.http_host = environment.get("SERVER_NAME", _cfg.http_host); + conf.web_doc_root_path = environment.get("DOCUMENT_ROOT", _cfg.www_doc_root); + conf.doc_collection_sub_root = "/spine/static"; // (output_path - web_doc_root_path) + conf.cgi_root = environment.get("CONTEXT_DOCUMENT_ROOT", _cfg.cgi_bin_subpath); + conf.cgi_script_name = environment.get("SCRIPT_NAME", _cfg.cgi_filename); + conf.cgi_search_form_title = _cfg.cgi_search_form_title; // ≅ SiSU spine search form + conf.cgi_search_form_html_title = "" + ~ _cfg.cgi_search_form_title + ~ ""; conf.query_base_url = conf.http_request_type ~ "://" ~ conf.http_host ~ "/" ~ conf.cgi_script_name ~ "?"; conf.query_string = environment.get("QUERY_STRING", ""); conf.http_url = environment.get("HTTP_REFERER", conf.query_base_url ~ conf.query_string); @@ -547,7 +556,7 @@ void cgi_function_intro(Cgi cgi) { - ≅ SiSU spine search form + %s @@ -1351,6 +1360,7 @@ void cgi_function_intro(Cgi cgi) { ┃", + conf.cgi_search_form_title, conf.http_request_type, conf.http_host, ); @@ -1361,14 +1371,16 @@ void cgi_function_intro(Cgi cgi) {
- ≅ SiSU spine search form + %s
- ┃"); + ┃", + conf.cgi_search_form_html_title, + ); } { string post_value(string field_name, string type="box", string set="on") { -- cgit v1.2.3