aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc_reform/io_out
diff options
context:
space:
mode:
Diffstat (limited to 'src/doc_reform/io_out')
-rw-r--r--src/doc_reform/io_out/cgi_sqlite_search_form.d2
-rw-r--r--src/doc_reform/io_out/epub3.d4
-rw-r--r--src/doc_reform/io_out/html.d2
-rw-r--r--src/doc_reform/io_out/hub.d2
-rw-r--r--src/doc_reform/io_out/metadata.d4
-rw-r--r--src/doc_reform/io_out/paths_output.d2
-rw-r--r--src/doc_reform/io_out/sqlite.d42
-rw-r--r--src/doc_reform/io_out/xmls.d4
8 files changed, 31 insertions, 31 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 362d02c..3265ae7 100644
--- a/src/doc_reform/io_out/cgi_sqlite_search_form.d
+++ b/src/doc_reform/io_out/cgi_sqlite_search_form.d
@@ -56,7 +56,7 @@ template CGIsearchSQLite() {
std.format;
import doc_reform.io_out;
string _sqlite_db_fn = (opt_action.sqlite_filename.empty)
- ? make_and_meta_struct.conf.w_srv_db_sqlite
+ ? make_and_meta_struct.conf.w_srv_db_sqlite_filename
: opt_action.sqlite_filename;
string _cgi_search_script = (opt_action.cgi_sqlite_search_filename.empty)
? make_and_meta_struct.conf.w_srv_cgi_search_script
diff --git a/src/doc_reform/io_out/epub3.d b/src/doc_reform/io_out/epub3.d
index 1a8d924..aa875ad 100644
--- a/src/doc_reform/io_out/epub3.d
+++ b/src/doc_reform/io_out/epub3.d
@@ -344,7 +344,7 @@ template outputEPub3() {
</ncx>┃");
return toc;
}
-
+
@system void outputEPub3(D,I)(
const D doc_abstraction,
I doc_matters,
@@ -858,5 +858,5 @@ template outputEPub3() {
}
}
}
-
+
}
diff --git a/src/doc_reform/io_out/html.d b/src/doc_reform/io_out/html.d
index ceaf9f9..c6f36a1 100644
--- a/src/doc_reform/io_out/html.d
+++ b/src/doc_reform/io_out/html.d
@@ -560,7 +560,7 @@ template outputHTML() {
M doc_matters,
) {
{ /+ (copy html images) +/
-
+
auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
if (!exists(pth_html.image)) {
pth_html.image.mkdirRecurse;
diff --git a/src/doc_reform/io_out/hub.d b/src/doc_reform/io_out/hub.d
index 5b2d74b..4188d6e 100644
--- a/src/doc_reform/io_out/hub.d
+++ b/src/doc_reform/io_out/hub.d
@@ -190,7 +190,7 @@ template outputHubOp() {
if ((opt_action.cgi_search_form_codegen)) {
if ((opt_action.verbose)) {
string _sqlite_db_fn = (opt_action.sqlite_filename.empty)
- ? config.conf.w_srv_db_sqlite
+ ? config.conf.w_srv_db_sqlite_filename
: opt_action.sqlite_filename;
string _cgi_search_script = (opt_action.cgi_sqlite_search_filename.empty)
? config.conf.w_srv_cgi_search_script
diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d
index d196988..58d8b33 100644
--- a/src/doc_reform/io_out/metadata.d
+++ b/src/doc_reform/io_out/metadata.d
@@ -72,10 +72,10 @@ template outputMetadata() {
<!-- SiSU Spine Search -->
</div>┃",
doc_matters.conf_make_meta.conf.w_srv_cgi_action,
- (doc_matters.conf_make_meta.conf.w_srv_db_sqlite.empty)
+ (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty)
? ""
: "\n <input type=\"hidden\" name=\"db\" value=\""
- ~ doc_matters.conf_make_meta.conf.w_srv_db_sqlite
+ ~ doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename
~ "\">",
doc_matters.src.filename_base,
);
diff --git a/src/doc_reform/io_out/paths_output.d b/src/doc_reform/io_out/paths_output.d
index 62bf6c0..96ef12d 100644
--- a/src/doc_reform/io_out/paths_output.d
+++ b/src/doc_reform/io_out/paths_output.d
@@ -612,7 +612,7 @@ template spinePathsSQLite() {
}
string base() {
auto out_pth = spineOutPathSQLite!()(output_pth_root); // decide whether to have separate files for each language
- string base_dir = "sqlite";
+ string base_dir = "";
return (((out_pth.output_root).chainPath(base_dir)).asNormalizedPath).array;
}
string sqlite_file() {
diff --git a/src/doc_reform/io_out/sqlite.d b/src/doc_reform/io_out/sqlite.d
index a97a39d..abdfc7a 100644
--- a/src/doc_reform/io_out/sqlite.d
+++ b/src/doc_reform/io_out/sqlite.d
@@ -66,7 +66,7 @@ template SQLiteHubBuildTablesAndPopulate() {
const D doc_abstraction,
M doc_matters,
) {
- auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path);
+ auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.sqlite.path);
pth_sqlite.base.mkdirRecurse;
auto db = Database(pth_sqlite.sqlite_file);
template SQLiteDbStatementComposite() {
@@ -79,7 +79,7 @@ template SQLiteHubBuildTablesAndPopulate() {
{
string _db_statement;
if ((doc_matters.opt.action.sqlite_db_create)) {
- auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path);
+ auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.sqlite.path);
pth_sqlite.base.mkdirRecurse;
_db_statement ~= SQLiteTablesReCreate!()();
SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "TABLE RE-CREATE");
@@ -114,7 +114,7 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() {
M doc_matters,
) {
auto url_html = spineUrlsHTML!()(doc_matters.conf_make_meta.conf.w_srv_data_root_url_html, doc_matters.src.language);
- auto pth_sqlite = spinePathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language);
+ auto pth_sqlite = spinePathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); // doc_matters.db_path
pth_sqlite.base.mkdirRecurse;
auto db = Database(pth_sqlite.sqlite_file(doc_matters.src.filename));
template SQLiteDiscreteDbStatementComposite() {
@@ -1550,19 +1550,19 @@ template SQLiteTablesCreate() {
string _db_statement;
string db_filename = (opt_action.sqlite_filename.length > 0)
? opt_action.sqlite_filename
- : (config.conf.w_srv_db_sqlite.length > 0)
- ? config.conf.w_srv_db_sqlite
+ : (config.conf.w_srv_db_sqlite_filename.length > 0)
+ ? config.conf.w_srv_db_sqlite_filename
: "";
- string output_path = (opt_action.output_dir_set.length > 0)
+ string db_path = (opt_action.output_dir_set.length > 0)
? opt_action.output_dir_set
- : (config.conf.output_path.length > 0)
- ? config.conf.output_path
+ : (config.conf.w_srv_db_sqlite_path.length > 0)
+ ? config.conf.w_srv_db_sqlite_path
: "";
- if (db_filename.length > 0 && output_path.length > 0) {
+ if (db_filename.length > 0 && db_path.length > 0) {
if ((opt_action.verbose)) {
- writeln("db name & path: ", config.conf.output_path, "/sqlite/", db_filename);
+ writeln("db name & path: ", db_path, db_filename);
}
- auto pth_sqlite = spinePathsSQLite!()(db_filename, output_path);
+ auto pth_sqlite = spinePathsSQLite!()(db_filename, db_path);
pth_sqlite.base.mkdirRecurse;
auto db = Database(pth_sqlite.sqlite_file);
{
@@ -1572,7 +1572,7 @@ template SQLiteTablesCreate() {
} else {
writeln("must provide db name & output root path either on the command line or in configuration file");
writeln("db name: ", db_filename);
- writeln("output root path (path less /sqlite which is added: ", config.conf.output_path);
+ writeln("db path: ", db_path);
}
}
}
@@ -1583,16 +1583,16 @@ template SQLiteDbDrop() {
if ((opt_action.sqlite_db_drop)) {
string db_filename = (opt_action.sqlite_filename.length > 0)
? opt_action.sqlite_filename
- : (config.conf.w_srv_db_sqlite.length > 0)
- ? config.conf.w_srv_db_sqlite
+ : (config.conf.w_srv_db_sqlite_filename.length > 0)
+ ? config.conf.w_srv_db_sqlite_filename
: "";
- string output_path = (opt_action.output_dir_set.length > 0)
- ? opt_action.output_dir_set
- : (config.conf.output_path.length > 0)
- ? config.conf.output_path
+ string db_path = (opt_action.sqlite_db_path.length > 0) //
+ ? opt_action.sqlite_db_path
+ : (config.conf.w_srv_db_sqlite_path.length > 0)
+ ? config.conf.w_srv_db_sqlite_path
: "";
- if (db_filename.length > 0 && output_path.length > 0) {
- auto pth_sqlite = spinePathsSQLite!()(db_filename, output_path);
+ if (db_filename.length > 0 && db_path.length > 0) {
+ auto pth_sqlite = spinePathsSQLite!()(db_filename, db_path);
writeln("remove(", pth_sqlite.sqlite_file, ")");
try {
remove(pth_sqlite.sqlite_file);
@@ -1602,7 +1602,7 @@ template SQLiteDbDrop() {
} else {
writeln("must provide db name & output root path either on the command line or in configuration file");
writeln("db name: ", db_filename);
- writeln("output root path (path less /sqlite which is added: ", config.conf.output_path);
+ writeln("db path: ", db_path);
}
}
}
diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d
index e8e0978..e6012fe 100644
--- a/src/doc_reform/io_out/xmls.d
+++ b/src/doc_reform/io_out/xmls.d
@@ -220,10 +220,10 @@ template outputXHTMLs() {
<!-- SiSU Spine Search -->
</div>┃",
doc_matters.conf_make_meta.conf.w_srv_cgi_action,
- (doc_matters.conf_make_meta.conf.w_srv_db_sqlite.empty)
+ (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty)
? ""
: "\n <input type=\"hidden\" name=\"db\" value=\""
- ~ doc_matters.conf_make_meta.conf.w_srv_db_sqlite
+ ~ doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename
~ "\">",
doc_matters.src.filename_base,
);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 12:41:48 +0000