From abe7e7688d045982a28cfb22b8f6269269dd6cf5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 5 Oct 2021 12:55:42 -0400 Subject: sqlite related internal naming --- org/spine.org | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'org/spine.org') diff --git a/org/spine.org b/org/spine.org index d9db466..805524d 100644 --- a/org/spine.org +++ b/org/spine.org @@ -642,12 +642,6 @@ struct OptActions { @trusted bool source_or_pod() { return (opts["pod"] || opts["source"]) ? true : false; } - @trusted string sqlite_db_path() { - return settings["sqlite-db-path"]; - } - @trusted string sqlite_db_filename() { - return settings["sqlite-db-filename"]; - } @trusted bool sqlite_discrete() { return opts["sqlite-discrete"]; } @@ -720,10 +714,10 @@ struct OptActions { @trusted string output_dir_set() { return settings["output"]; } - @trusted string sqlite_filename() { + @trusted string sqliteDB_filename() { return settings["sqlite-db-filename"]; } - @trusted string sqlite_path() { + @trusted string sqliteDB_path() { return settings["sqlite-db-path"]; } @trusted string cgi_bin_root() { @@ -1652,8 +1646,8 @@ struct DocumentMatters { @safe string filename() { string _fn = ""; string _pth = ""; - if (_opt_action.sqlite_filename.length > 0) { - _fn = _opt_action.sqlite_filename; + if (_opt_action.sqliteDB_filename.length > 0) { + _fn = _opt_action.sqliteDB_filename; } else if (_make_and_meta_struct.conf.w_srv_db_sqlite_filename.length > 0) { _fn = _make_and_meta_struct.conf.w_srv_db_sqlite_filename; } @@ -1661,8 +1655,8 @@ struct DocumentMatters { } @safe string path() { string _pth = ""; - if (_opt_action.sqlite_path.length > 0) { - _pth = _opt_action.sqlite_path; + if (_opt_action.sqliteDB_path.length > 0) { + _pth = _opt_action.sqliteDB_path; } else if (_make_and_meta_struct.conf.w_srv_db_sqlite_path.length > 0) { _pth = _make_and_meta_struct.conf.w_srv_db_sqlite_path; } -- cgit v1.2.3