diff options
Diffstat (limited to 'src/doc_reform')
-rw-r--r-- | src/doc_reform/io_out/hub.d | 27 | ||||
-rw-r--r-- | src/doc_reform/io_out/paths_output.d | 39 | ||||
-rwxr-xr-x | src/doc_reform/spine.d | 5 |
3 files changed, 1 insertions, 70 deletions
diff --git a/src/doc_reform/io_out/hub.d b/src/doc_reform/io_out/hub.d index b031a1e..5ecaf0e 100644 --- a/src/doc_reform/io_out/hub.d +++ b/src/doc_reform/io_out/hub.d @@ -187,31 +187,6 @@ template outputHubOp() { writeln("sqlite create table done"); } } - if ((opt_action.cgi_search_form_codegen)) { - if ((opt_action.verbose)) { - string _sqlite_db_fn = (opt_action.sqliteDB_filename.empty) - ? config.conf.w_srv_db_sqlite_filename - : opt_action.sqliteDB_filename; - string _cgi_search_script = (opt_action.cgi_sqlite_search_filename.empty) - ? config.conf.w_srv_cgi_search_script - : opt_action.cgi_sqlite_search_filename; - string _cgi_search_script_raw_fn_d = (opt_action.cgi_sqlite_search_filename_d.empty) - ? config.conf.w_srv_cgi_search_script_raw_fn_d - : opt_action.cgi_sqlite_search_filename_d; - string _cgi_path = (opt_action.output_dir_set.length > 0) - ? opt_action.output_dir_set - : (config.conf.w_srv_data_root_path.length > 0) - ? config.conf.w_srv_data_root_path - : ""; - auto pth_sqlite_cgi = spinePathsSQLiteCGI!()(_cgi_search_script_raw_fn_d, _cgi_search_script, _cgi_path); - writeln("sqlite cgi search form..."); - writeln(" ", pth_sqlite_cgi.search_form_path_out); - } - import doc_reform.io_out.cgi_sqlite_search_form; - CGIsearchSQLite!()(env, opt_action, config); - if ((opt_action.very_verbose)) { - writeln("sqlite cgi search form done"); - } - } + } } diff --git a/src/doc_reform/io_out/paths_output.d b/src/doc_reform/io_out/paths_output.d index 34ce929..9398240 100644 --- a/src/doc_reform/io_out/paths_output.d +++ b/src/doc_reform/io_out/paths_output.d @@ -622,42 +622,3 @@ template spinePathsSQLite() { return _PathsStruct(); } } -template spinePathsSQLiteCGI() { - mixin spineRgxIn; - static auto rgx = RgxI(); - auto spinePathsSQLiteCGI()( - string cgi_search_form_d, - string cgi_search_form, - string output_pth_root, - ) { - struct _PathsStruct { - string base_filename(string fn_src) { - return fn_src.baseName.stripExtension; - } - string base() { - auto out_pth = spineOutPathSQLiteCGI!()(output_pth_root); - string base_dir = "cgi"; - return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array; - } - string src() { - return ((base.chainPath("src")).asNormalizedPath).array; - } - string cgi_bin() { - return ((base.chainPath("cgi-bin")).asNormalizedPath).array; - } - string dub_sdl_path_out() { - return ((base.chainPath("dub.sdl")).asNormalizedPath).array; - } - string search_form_dub_path() { - return ("src/".chainPath(base_filename(cgi_search_form_d)).asNormalizedPath).array; - } - string search_form_path_out() { - return (src.chainPath(cgi_search_form_d).asNormalizedPath).array; - } - string cgi_d_path_out() { - return (src.chainPath("cgi.d").asNormalizedPath).array; - } - } - return _PathsStruct(); - } -} diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d index 2b768d9..aacdaab 100755 --- a/src/doc_reform/spine.d +++ b/src/doc_reform/spine.d @@ -113,7 +113,6 @@ string program_name = "spine"; "abstraction" : false, "allow-downloads" : false, "assertions" : false, - "cgi-search-form-codegen" : false, "concordance" : false, "dark" : false, "debug" : false, @@ -197,7 +196,6 @@ string program_name = "spine"; "abstraction", "document abstraction", &opts["abstraction"], "allow-downloads", "allow downloads (includes cgi.d from github)", &opts["allow-downloads"], "assert", "set optional assertions on", &opts["assertions"], - "cgi-search-form-codegen", "generates (pre-compiled) d code for search of specified db", &opts["cgi-search-form-codegen"], "cgi-bin-root", "path to cgi-bin directory", &settings["cgi-bin-root"], "cgi-url-root", "url to cgi-bin (to find cgi-bin)", &settings["cgi-url-root"], "cgi-url-action", "url to post to cgi-bin search form", &settings["cgi-url-action"], @@ -285,9 +283,6 @@ string program_name = "spine"; @trusted bool assertions() { return opts["assertions"]; } - @trusted bool cgi_search_form_codegen() { - return opts["cgi-search-form-codegen"]; - } @trusted bool concordance() { return opts["concordance"]; } |