From db92f9af3293f8009543448a100b08b7a2f2ffbe Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 23 Apr 2018 12:07:22 -0400 Subject: 0.26.1 single sqlite file, premature? --- src/sdp/output/hub.d | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) (limited to 'src/sdp/output/hub.d') diff --git a/src/sdp/output/hub.d b/src/sdp/output/hub.d index 373092b..d395269 100644 --- a/src/sdp/output/hub.d +++ b/src/sdp/output/hub.d @@ -8,7 +8,6 @@ template outputHub() { sdp.output.epub3, sdp.output.html, sdp.output.sqlite, - sdp.output.sqlite_discrete, sdp.output.xmls, sdp.output.source_sisupod, sdp.output.create_zip_file, @@ -16,6 +15,35 @@ template outputHub() { void outputHub(D,I)(D doc_abstraction, I doc_matters) { mixin SiSUoutputRgxInit; static auto rgx = Rgx(); + debug (substitutions) { + enum Substitute { match, markup, html, } + writeln(__LINE__, ":", __FILE__, ": DEBUG substitutions:"); + writeln("Doc Title: ", doc_matters.conf_make_meta.meta.title_full); + if (doc_matters.conf_make_meta.make.bold) { + writeln("regex to match: ", doc_matters.conf_make_meta.make.bold[Substitute.match]); + writeln("substitution to make: ", doc_matters.conf_make_meta.make.bold[Substitute.html]); + + auto _w = "1. Debian test string. Debian again. (the problem) do not use initialized only not repopulated" + .replaceAll( + regex(doc_matters.conf_make_meta.make.bold[Substitute.match]), + doc_matters.conf_make_meta.make.bold[Substitute.html] + ); + writeln(_w); + + writeln("2a. Debian test string. Debian again. (the problem) do not use initialized only not repopulated" + .replaceAll( + regex(doc_matters.conf_make_meta.make.bold[Substitute.match]), + doc_matters.conf_make_meta.make.bold[Substitute.html] + )); + + auto _v = regex(doc_matters.conf_make_meta.make.bold[Substitute.match]); + writeln("2b. Debian test string. Debian again. (the problem) do not use initialized only not repopulated" + .replaceAll( + _v, + doc_matters.conf_make_meta.make.bold[Substitute.html] + )); + } + } if (doc_matters.opt.action.verbose) { writeln(doc_matters.xml.keys_seq.seg); } @@ -109,13 +137,13 @@ template outputHub() { if ((doc_matters.opt.action.verbose)) { writeln("sqlite processing... "); } - SQLiteDiscreteBuildTablesAndPopulate!()(doc_abstraction, doc_matters); + SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_abstraction, doc_matters); } if (doc_matters.opt.action.sqlite_update) { if ((doc_matters.opt.action.verbose)) { writeln("sqlite processing... "); } - SQLiteBuildTablesAndPopulate!()(doc_abstraction, doc_matters); + SQLiteHubBuildTablesAndPopulate!()(doc_abstraction, doc_matters); } if (doc_matters.opt.action.postgresql) { /+ mixin outputPostgreSQL; +/ @@ -128,7 +156,6 @@ template outputHubOp() { sdp.output.epub3, sdp.output.html, sdp.output.sqlite, - sdp.output.sqlite_discrete, sdp.output.xmls, sdp.output.source_sisupod, sdp.output.create_zip_file, -- cgit v1.2.3