From d39da3f07036b22892ffb0b05737e8ba7e1ff954 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 28 Jan 2022 10:38:10 -0500 Subject: config & sqlite search output, some changes --- src/doc_reform/io_out/cgi_sqlite_search_form.d | 18 +++++++++--------- src/doc_reform/io_out/sqlite.d | 11 +++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) (limited to 'src/doc_reform/io_out') diff --git a/src/doc_reform/io_out/cgi_sqlite_search_form.d b/src/doc_reform/io_out/cgi_sqlite_search_form.d index 091c77f..e835b07 100644 --- a/src/doc_reform/io_out/cgi_sqlite_search_form.d +++ b/src/doc_reform/io_out/cgi_sqlite_search_form.d @@ -64,7 +64,7 @@ template CGIsearchSQLite() { string _cgi_search_script_raw_fn_d = (opt_action.cgi_sqlite_search_filename_d.empty) ? make_and_meta_struct.conf.w_srv_cgi_search_script_raw_fn_d : opt_action.cgi_sqlite_search_filename_d; - string get_doc_collection_sub_root(string output_path) { + string get_doc_collection_subroot(string output_path) { string web_doc_root_path = environment.get("DOCUMENT_ROOT", "/var/www/html"); auto m = output_path.matchFirst(regex("^(" ~ web_doc_root_path ~ ")")); return m.post; @@ -89,7 +89,7 @@ void cgi_function_intro(Cgi cgi) { string http_host; // string server_name; string web_doc_root_path; - string doc_collection_sub_root; + string doc_collection_subroot; string cgi_root; string cgi_script; string data_path_html; @@ -103,7 +103,7 @@ void cgi_function_intro(Cgi cgi) { conf.http_host = environment.get("HTTP_HOST", "localhost"); // conf.server_name = environment.get("SERVER_NAME", "localhost"); conf.web_doc_root_path = environment.get("DOCUMENT_ROOT", "/var/www/html"); - conf.doc_collection_sub_root = "%s"; // (output_path - web_doc_root_path) + conf.doc_collection_subroot = "%s"; // (output_path - web_doc_root_path) conf.cgi_root = environment.get("CONTEXT_DOCUMENT_ROOT", "/usr/lib/cgi-bin/"); // conf.cgi_script = environment.get("SCRIPT_NAME", "/cgi-bin/spine-search"); conf.query_string = environment.get("QUERY_STRING", ""); @@ -1736,7 +1736,7 @@ LIMIT %%s OFFSET %%s _close_para ~ "
" ~ "

" ~ "