diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2021-10-05 12:55:42 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2021-11-27 19:40:46 -0500 |
| commit | abe7e7688d045982a28cfb22b8f6269269dd6cf5 (patch) | |
| tree | 10f0348dd04a9e11f32f0b5d2b6e3c97505ccb9c /src/doc_reform/io_out | |
| parent | xmls homepage link (diff) | |
sqlite related internal naming
Diffstat (limited to 'src/doc_reform/io_out')
| -rw-r--r-- | src/doc_reform/io_out/cgi_sqlite_search_form.d | 4 | ||||
| -rw-r--r-- | src/doc_reform/io_out/hub.d | 4 | ||||
| -rw-r--r-- | src/doc_reform/io_out/sqlite.d | 16 |
3 files changed, 12 insertions, 12 deletions
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 585ea50..092e882 100644 --- a/src/doc_reform/io_out/cgi_sqlite_search_form.d +++ b/src/doc_reform/io_out/cgi_sqlite_search_form.d @@ -55,9 +55,9 @@ template CGIsearchSQLite() { std.file, std.format; import doc_reform.io_out; - string _sqlite_db_fn = (opt_action.sqlite_filename.empty) + string _sqlite_db_fn = (opt_action.sqliteDB_filename.empty) ? make_and_meta_struct.conf.w_srv_db_sqlite_filename - : opt_action.sqlite_filename; + : opt_action.sqliteDB_filename; string _cgi_search_script = (opt_action.cgi_sqlite_search_filename.empty) ? make_and_meta_struct.conf.w_srv_cgi_search_script : opt_action.cgi_sqlite_search_filename; diff --git a/src/doc_reform/io_out/hub.d b/src/doc_reform/io_out/hub.d index a644b66..fc6dd98 100644 --- a/src/doc_reform/io_out/hub.d +++ b/src/doc_reform/io_out/hub.d @@ -189,9 +189,9 @@ template outputHubOp() { } if ((opt_action.cgi_search_form_codegen)) { if ((opt_action.verbose)) { - string _sqlite_db_fn = (opt_action.sqlite_filename.empty) + string _sqlite_db_fn = (opt_action.sqliteDB_filename.empty) ? config.conf.w_srv_db_sqlite_filename - : opt_action.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; diff --git a/src/doc_reform/io_out/sqlite.d b/src/doc_reform/io_out/sqlite.d index b66aa13..cb7b065 100644 --- a/src/doc_reform/io_out/sqlite.d +++ b/src/doc_reform/io_out/sqlite.d @@ -1548,13 +1548,13 @@ template SQLiteTablesCreate() { } if (opt_action.sqlite_db_create) { string _db_statement; - string db_filename = (opt_action.sqlite_filename.length > 0) - ? opt_action.sqlite_filename + string db_filename = (opt_action.sqliteDB_filename.length > 0) + ? opt_action.sqliteDB_filename : (config.conf.w_srv_db_sqlite_filename.length > 0) ? config.conf.w_srv_db_sqlite_filename : ""; - string db_path = (opt_action.output_dir_set.length > 0) - ? opt_action.output_dir_set + string db_path = (opt_action.sqliteDB_path.length > 0) + ? opt_action.sqliteDB_path : (config.conf.w_srv_db_sqlite_path.length > 0) ? config.conf.w_srv_db_sqlite_path : ""; @@ -1581,13 +1581,13 @@ template SQLiteDbDrop() { void SQLiteDbDrop(O,C)(O opt_action, C config) { writeln("db drop"); if ((opt_action.sqlite_db_drop)) { - string db_filename = (opt_action.sqlite_filename.length > 0) - ? opt_action.sqlite_filename + string db_filename = (opt_action.sqliteDB_filename.length > 0) + ? opt_action.sqliteDB_filename : (config.conf.w_srv_db_sqlite_filename.length > 0) ? config.conf.w_srv_db_sqlite_filename : ""; - string db_path = (opt_action.sqlite_db_path.length > 0) // - ? opt_action.sqlite_db_path + string db_path = (opt_action.sqliteDB_path.length > 0) // + ? opt_action.sqliteDB_path : (config.conf.w_srv_db_sqlite_path.length > 0) ? config.conf.w_srv_db_sqlite_path : ""; |