aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/sisudoc/io_out/cgi_sqlite_search_form.d1959
-rw-r--r--src/sisudoc/ocda/abstraction/package.d86
-rw-r--r--src/sisudoc/ocda/abstraction/ssp.d (renamed from src/sisudoc/io_out/create_abstraction_txt.d)12
-rw-r--r--src/sisudoc/ocda/io_in/paths_source.d (renamed from src/sisudoc/io_in/paths_source.d)6
-rw-r--r--src/sisudoc/ocda/io_in/read_config_files.d (renamed from src/sisudoc/io_in/read_config_files.d)30
-rw-r--r--src/sisudoc/ocda/io_in/read_source_files.d (renamed from src/sisudoc/io_in/read_source_files.d)10
-rw-r--r--src/sisudoc/ocda/io_in/read_zip_pod.d (renamed from src/sisudoc/io_in/read_zip_pod.d)2
-rw-r--r--src/sisudoc/ocda/meta/conf_make_meta_json.d (renamed from src/sisudoc/meta/conf_make_meta_json.d)10
-rw-r--r--src/sisudoc/ocda/meta/conf_make_meta_structs.d (renamed from src/sisudoc/meta/conf_make_meta_structs.d)8
-rw-r--r--src/sisudoc/ocda/meta/conf_make_meta_yaml.d (renamed from src/sisudoc/meta/conf_make_meta_yaml.d)22
-rw-r--r--src/sisudoc/ocda/meta/defaults.d (renamed from src/sisudoc/meta/defaults.d)2
-rw-r--r--src/sisudoc/ocda/meta/doc_debugs.d (renamed from src/sisudoc/meta/doc_debugs.d)6
-rw-r--r--src/sisudoc/ocda/meta/metadoc.d (renamed from src/sisudoc/meta/metadoc.d)24
-rw-r--r--src/sisudoc/ocda/meta/metadoc_from_src.d (renamed from src/sisudoc/meta/metadoc_from_src.d)14
-rw-r--r--src/sisudoc/ocda/meta/metadoc_from_src_functions.d (renamed from src/sisudoc/meta/metadoc_from_src_functions.d)3
-rw-r--r--src/sisudoc/ocda/meta/metadoc_object_setter.d (renamed from src/sisudoc/meta/metadoc_object_setter.d)2
-rw-r--r--src/sisudoc/ocda/meta/metadoc_show_config.d (renamed from src/sisudoc/meta/metadoc_show_config.d)10
-rw-r--r--src/sisudoc/ocda/meta/metadoc_show_make.d (renamed from src/sisudoc/meta/metadoc_show_make.d)6
-rw-r--r--src/sisudoc/ocda/meta/metadoc_show_metadata.d (renamed from src/sisudoc/meta/metadoc_show_metadata.d)6
-rw-r--r--src/sisudoc/ocda/meta/metadoc_show_summary.d (renamed from src/sisudoc/meta/metadoc_show_summary.d)6
-rw-r--r--src/sisudoc/ocda/meta/package.d (renamed from src/sisudoc/meta/package.d)4
-rw-r--r--src/sisudoc/ocda/meta/rgx.d (renamed from src/sisudoc/meta/rgx.d)2
-rw-r--r--src/sisudoc/ocda/meta/rgx_files.d (renamed from src/sisudoc/meta/rgx_files.d)2
-rw-r--r--src/sisudoc/ocda/meta/rgx_yaml.d (renamed from src/sisudoc/meta/rgx_yaml.d)2
-rw-r--r--src/sisudoc/ocda/package.d68
-rw-r--r--src/sisudoc/outputs/conf/compile_time_info.d (renamed from src/sisudoc/conf/compile_time_info.d)2
-rw-r--r--src/sisudoc/outputs/io_out/create_abstraction_db.d (renamed from src/sisudoc/io_out/create_abstraction_db.d)4
-rw-r--r--src/sisudoc/outputs/io_out/create_zip_file.d (renamed from src/sisudoc/io_out/create_zip_file.d)2
-rw-r--r--src/sisudoc/outputs/io_out/curate/metadoc_curate.d (renamed from src/sisudoc/meta/metadoc_curate.d)8
-rw-r--r--src/sisudoc/outputs/io_out/curate/metadoc_curate_authors.d (renamed from src/sisudoc/meta/metadoc_curate_authors.d)8
-rw-r--r--src/sisudoc/outputs/io_out/curate/metadoc_curate_topics.d (renamed from src/sisudoc/meta/metadoc_curate_topics.d)8
-rw-r--r--src/sisudoc/outputs/io_out/defaults.d (renamed from src/sisudoc/io_out/defaults.d)2
-rw-r--r--src/sisudoc/outputs/io_out/epub3.d (renamed from src/sisudoc/io_out/epub3.d)16
-rw-r--r--src/sisudoc/outputs/io_out/html.d (renamed from src/sisudoc/io_out/html.d)22
-rw-r--r--src/sisudoc/outputs/io_out/html_snippet.d (renamed from src/sisudoc/io_out/html_snippet.d)8
-rw-r--r--src/sisudoc/outputs/io_out/hub.d (renamed from src/sisudoc/io_out/hub.d)58
-rw-r--r--src/sisudoc/outputs/io_out/latex.d (renamed from src/sisudoc/io_out/latex.d)24
-rw-r--r--src/sisudoc/outputs/io_out/metadata.d (renamed from src/sisudoc/io_out/metadata.d)8
-rw-r--r--src/sisudoc/outputs/io_out/odt.d (renamed from src/sisudoc/io_out/odt.d)37
-rw-r--r--src/sisudoc/outputs/io_out/package.d (renamed from src/sisudoc/io_out/package.d)10
-rw-r--r--src/sisudoc/outputs/io_out/paths_output.d (renamed from src/sisudoc/io_out/paths_output.d)4
-rw-r--r--src/sisudoc/outputs/io_out/rgx.d (renamed from src/sisudoc/io_out/rgx.d)2
-rw-r--r--src/sisudoc/outputs/io_out/rgx_latex.d (renamed from src/sisudoc/io_out/rgx_latex.d)2
-rw-r--r--src/sisudoc/outputs/io_out/rgx_xhtml.d (renamed from src/sisudoc/io_out/rgx_xhtml.d)2
-rw-r--r--src/sisudoc/outputs/io_out/skel.d (renamed from src/sisudoc/io_out/skel.d)6
-rw-r--r--src/sisudoc/outputs/io_out/source_pod.d (renamed from src/sisudoc/io_out/source_pod.d)69
-rw-r--r--src/sisudoc/outputs/io_out/sqlite.d (renamed from src/sisudoc/io_out/sqlite.d)36
-rw-r--r--src/sisudoc/outputs/io_out/text.d (renamed from src/sisudoc/io_out/text.d)10
-rw-r--r--src/sisudoc/outputs/io_out/xmls.d (renamed from src/sisudoc/io_out/xmls.d)16
-rw-r--r--src/sisudoc/outputs/io_out/xmls_css.d (renamed from src/sisudoc/io_out/xmls_css.d)202
-rw-r--r--src/sisudoc/outputs/share/defaults.d (renamed from src/sisudoc/share/defaults.d)2
-rw-r--r--[-rwxr-xr-x]src/sisudoc/spine.d70
52 files changed, 681 insertions, 2259 deletions
diff --git a/src/sisudoc/io_out/cgi_sqlite_search_form.d b/src/sisudoc/io_out/cgi_sqlite_search_form.d
deleted file mode 100644
index e835b07..0000000
--- a/src/sisudoc/io_out/cgi_sqlite_search_form.d
+++ /dev/null
@@ -1,1959 +0,0 @@
-/+
-- Name: Spine, Doc Reform [a part of]
- - Description: documents, structuring, processing, publishing, search
- - static content generator
-
- - Author: Ralph Amissah
- [ralph.amissah@gmail.com]
-
- - Copyright: (C) 2015 - 2022 Ralph Amissah, All Rights
- Reserved.
-
- - License: AGPL 3 or later:
-
- Spine (SiSU), a framework for document structuring, publishing and
- search
-
- Copyright (C) Ralph Amissah
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU AFERO General Public License as published by the
- Free Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along with
- this program. If not, see [https://www.gnu.org/licenses/].
-
- If you have Internet connection, the latest version of the AGPL should be
- available at these locations:
- [https://www.fsf.org/licensing/licenses/agpl.html]
- [https://www.gnu.org/licenses/agpl.html]
-
- - Spine (by Doc Reform, related to SiSU) uses standard:
- - docReform markup syntax
- - standard SiSU markup syntax with modified headers and minor modifications
- - docReform object numbering
- - standard SiSU object citation numbering & system
-
- - Homepages:
- [https://www.doc_reform.org]
- [https://www.sisudoc.org]
-
- - Git
- [https://git.sisudoc.org/projects/?p=software/spine.git;a=summary]
-
-+/
-module doc_reform.io_out.cgi_sqlite_search_form;
-template CGIsearchSQLite() {
- void CGIsearchSQLite(E,O,M)(E env, O opt_action, M make_and_meta_struct) {
- import
- std.file,
- std.format;
- import doc_reform.io_out;
- string _sqlite_db_fn = (opt_action.sqliteDB_filename.empty)
- ? make_and_meta_struct.conf.w_srv_db_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;
- string _cgi_search_script_raw_fn_d = (opt_action.cgi_sqlite_search_filename_d.empty)
- ? make_and_meta_struct.conf.w_srv_cgi_search_script_raw_fn_d
- : opt_action.cgi_sqlite_search_filename_d;
- string get_doc_collection_subroot(string output_path) {
- string web_doc_root_path = environment.get("DOCUMENT_ROOT", "/var/www/html");
- auto m = output_path.matchFirst(regex("^(" ~ web_doc_root_path ~ ")"));
- return m.post;
- }
- string the_cgi_search_form = format(q"≓
-/+ dub.sdl
- name "spine search"
- description "spine cgi search"
-+/
-import std.format;
-import std.range;
-import std.regex;
-import arsd.cgi;
-import d2sqlite3;
-import std.process : environment;
-void cgi_function_intro(Cgi cgi) {
- string header;
- string table;
- string form;
- struct Config {
- string http_request_type;
- string http_host;
- // string server_name;
- string web_doc_root_path;
- string doc_collection_subroot;
- string cgi_root;
- string cgi_script;
- string data_path_html;
- string db_path;
- string query_string;
- string http_url;
- string request_method;
- }
- auto conf = Config();
- conf.http_request_type = environment.get("REQUEST_SCHEME", "http");
- conf.http_host = environment.get("HTTP_HOST", "localhost");
- // conf.server_name = environment.get("SERVER_NAME", "localhost");
- conf.web_doc_root_path = environment.get("DOCUMENT_ROOT", "/var/www/html");
- conf.doc_collection_subroot = "%s"; // (output_path - web_doc_root_path)
- conf.cgi_root = environment.get("CONTEXT_DOCUMENT_ROOT", "/usr/lib/cgi-bin/");
- // conf.cgi_script = environment.get("SCRIPT_NAME", "/cgi-bin/spine-search");
- conf.query_string = environment.get("QUERY_STRING", "");
- conf.http_url = environment.get("HTTP_REFERER", conf.http_request_type ~ "://" ~ conf.http_host ~ conf.cgi_script ~ "?" ~ conf.query_string);
- conf.db_path = "%s"; // (output_path + /sqlite)
- conf.request_method = environment.get("REQUEST_METHOD", "POST");
- struct CGI_val {
- string db_selected = "";
- string sql_match_limit = ""; // radio: ( 1000 | 2500 )
- string sql_match_offset = "";
- string search_text = "";
- string results_type = ""; // index
- bool checked_echo = false;
- bool checked_stats = false;
- bool checked_url = false;
- bool checked_searched = false;
- bool checked_tip = false;
- bool checked_sql = false;
- }
- auto cv = CGI_val();
- cv.db_selected = "%s";
- auto text_fields() {
- string canned_query_str = environment.get("QUERY_STRING", "");
- if ("query_string" in cgi.post) {
- canned_query_str = environment.get("QUERY_STRING", "");
- }
- string[string] canned_query;
- if (conf.request_method == "POST") {
- } else if (conf.request_method == "GET") {
- foreach (pair_str; canned_query_str.split("&")) {
- // cgi.write(pair_str ~ "<br>");
- string[] pair = pair_str.split("=");
- canned_query[pair[0]] = pair[1];
- }
- // foreach (field, content; canned_query) {
- // cgi.write(field ~ ": " ~ content ~ "<br>");
- // }
- }
- static struct Rgx {
- // static canned_query = ctRegex!(`\A(?P<matched>.+)\Z`, "m");
- static search_text_area = ctRegex!(`\A(?P<matched>.+)\Z`, "m");
- // static fulltext = ctRegex!(`\A(?P<matched>.+)\Z`, "m");
- static line = ctRegex!(`^(?P<matched>.+?)(?: ~|$)`, "m");
- static text = ctRegex!(`(?:^|\s~\s*)text:\s+(?P<matched>.+?)(?: ~|$)`, "m");
- static author = ctRegex!(`(?:^|\s~\s*)author:\s+(?P<matched>.+)$`, "m");
- static title = ctRegex!(`(?:^|\s~\s*)title:\s+(?P<matched>.+)$`, "m");
- static uid = ctRegex!(`(?:^|\s~\s*)uid:\s+(?P<matched>.+)$`, "m");
- static fn = ctRegex!(`(?:^|\s~\s*)fn:\s+(?P<matched>.+)$`, "m");
- static keywords = ctRegex!(`(?:^|\s~\s*)keywords:\s+(?P<matched>.+)$`, "m");
- static topic_register = ctRegex!(`(?:^|\s~\s*)topic_register:\s+(?P<matched>.+)$`, "m");
- static subject = ctRegex!(`(?:^|\s~\s*)subject:\s+(?P<matched>.+)$`, "m");
- static description = ctRegex!(`(?:^|\s~\s*)description:\s+(?P<matched>.+)$`, "m");
- static publisher = ctRegex!(`(?:^|\s~\s*)publisher:\s+(?P<matched>.+)$`, "m");
- static editor = ctRegex!(`(?:^|\s~\s*)editor:\s+(?P<matched>.+)$`, "m");
- static contributor = ctRegex!(`(?:^|\s~\s*)contributor:\s+(?P<matched>.+)$`, "m");
- static date = ctRegex!(`(?:^|\s~\s*)date:\s+(?P<matched>.+)$`, "m");
- static results_type = ctRegex!(`(?:^|\s~\s*)type:\s+(?P<matched>.+)$`, "m");
- static format = ctRegex!(`(?:^|\s~\s*)format:\s+(?P<matched>.+)$`, "m");
- static source = ctRegex!(`(?:^|\s~\s*)source:\s+(?P<matched>.+)$`, "m");
- static language = ctRegex!(`(?:^|\s~\s*)language:\s+(?P<matched>.+)$`, "m");
- static relation = ctRegex!(`(?:^|\s~\s*)relation:\s+(?P<matched>.+)$`, "m");
- static coverage = ctRegex!(`(?:^|\s~\s*)coverage:\s+(?P<matched>.+)$`, "m");
- static rights = ctRegex!(`(?:^|\s~\s*)rights:\s+(?P<matched>.+)$`, "m");
- static comment = ctRegex!(`(?:^|\s~\s*)comment:\s+(?P<matched>.+)$`, "m");
- // static abstract_ = ctRegex!(`(?:^|\s~\s*)abstract:\s+(?P<matched>.+)$`, "m");
- static src_filename_base = ctRegex!(`^src_filename_base:\s+(?P<matched>.+)$`, "m");
- }
- struct searchFields {
- string canned_query = ""; // GET canned_query == cq
- string search_text_area = ""; // POST search_text_area == tsa
- string text = ""; // text == txt
- string author = ""; // author == au
- string title = ""; // title == ti
- string uid = ""; // uid == uid
- string fn = ""; // fn == fn
- string keywords = ""; // keywords == kw
- string topic_register = ""; // topic_register == tr
- string subject = ""; // subject == su
- string description = ""; // description == de
- string publisher = ""; // publisher == pb
- string editor = ""; // editor == ed
- string contributor = ""; // contributor == ct
- string date = ""; // date == dt
- string format = ""; // format == fmt
- string source = ""; // source == src sfn
- string language = ""; // language == lng
- string relation = ""; // relation == rl
- string coverage = ""; // coverage == cv
- string rights = ""; // rights == rgt
- string comment = ""; // comment == cmt
- // string abstract = "";
- string src_filename_base = ""; // src_filename_base == bfn
- string results_type = ""; // results_type == rt radio
- string sql_match_limit = ""; // sql_match_limit == sml radio
- string sql_match_offset = ""; // sql_match_offset == smo
- string stats = ""; // stats == sts checked
- string echo = ""; // echo == ec checked
- string url = ""; // url == url checked
- string searched = ""; // searched == se checked
- string sql = ""; // sql == sql checked
- }
- auto rgx = Rgx();
- auto got = searchFields();
- if (environment.get("REQUEST_METHOD", "POST") == "POST") {
- if ("sf" in cgi.post) {
- got.search_text_area = cgi.post["sf"];
- if (auto m = got.search_text_area.matchFirst(rgx.text)) {
- got.text = m["matched"];
- got.canned_query ~= "sf=" ~ m["matched"];
- } else if (auto m = got.search_text_area.matchFirst(rgx.line)) {
- if (
- !(m["matched"].matchFirst(rgx.author))
- && !(m["matched"].matchFirst(rgx.title))
- ) {
- got.text = m["matched"];
- got.canned_query ~= "sf=" ~ m["matched"];
- }
- }
- if (auto m = got.search_text_area.matchFirst(rgx.author)) {
- got.author = m["matched"];
- got.canned_query ~= "&au=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.title)) {
- got.title = m["matched"];
- got.canned_query ~= "&ti=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.uid)) {
- got.uid = m["matched"];
- got.canned_query ~= "&uid=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.fn)) {
- got.fn = m["matched"];
- got.canned_query ~= "&fn=" ~ m["matched"];
- } else if ("fn" in cgi.post) {
- got.search_text_area ~= "\nfn: " ~ cgi.post["fn"] ~ "\n";
- }
- if (auto m = got.search_text_area.matchFirst(rgx.keywords)) {
- got.keywords = m["matched"];
- got.canned_query ~= "&kw=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.topic_register)) {
- got.topic_register = m["matched"];
- got.canned_query ~= "&tr=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.subject)) {
- got.subject = m["matched"];
- got.canned_query ~= "&su=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.description)) {
- got.description = m["matched"];
- got.canned_query ~= "&de=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.publisher)) {
- got.publisher = m["matched"];
- got.canned_query ~= "&pb=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.editor)) {
- got.editor = m["matched"];
- got.canned_query ~= "&ed=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.contributor)) {
- got.contributor = m["matched"];
- got.canned_query ~= "&ct=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.date)) {
- got.date = m["matched"];
- got.canned_query ~= "&dt=" ~ m["matched"];
- }
- // if (auto m = got.search_text_area.matchFirst(rgx.results_type)) {
- // got.results_type = m["matched"];
- // got.canned_query ~= "&rt=" ~ m["matched"];
- // }
- if (auto m = got.search_text_area.matchFirst(rgx.format)) {
- got.format = m["matched"];
- got.canned_query ~= "&fmt=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.source)) {
- got.source = m["matched"];
- got.canned_query ~= "&src=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.language)) {
- got.language = m["matched"];
- got.canned_query ~= "&lng=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.relation)) {
- got.relation = m["matched"];
- got.canned_query ~= "&rl=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.coverage)) {
- got.coverage = m["matched"];
- got.canned_query ~= "&cv=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.rights)) {
- got.rights = m["matched"];
- got.canned_query ~= "&rgt=" ~ m["matched"];
- }
- if (auto m = got.search_text_area.matchFirst(rgx.comment)) {
- got.comment = m["matched"];
- got.canned_query ~= "&cmt=" ~ m["matched"];
- }
- // if (auto m = search_text_area.matchFirst(rgx.abstract)) {
- // got.abstract = m["matched"];
- // }
- if (auto m = got.search_text_area.matchFirst(rgx.src_filename_base)) {
- got.src_filename_base = m["matched"];
- got.canned_query ~= "&bfn=" ~ m["matched"];
- }
- }
- if ("fn" in cgi.post) {
- got.fn = cgi.post["fn"];
- got.canned_query ~= "&fn=" ~ cgi.post["fn"];
- }
- if ("rt" in cgi.post) {
- got.results_type = cgi.post["rt"];
- got.canned_query ~= "&rt=" ~ cgi.post["rt"];
- }
- if ("sts" in cgi.post) {
- got.stats = cgi.post["sts"];
- got.canned_query ~= "&sts=" ~ cgi.post["sts"];
- }
- if ("ec" in cgi.post) {
- got.echo = cgi.post["ec"];
- got.canned_query ~= "&ec=" ~ cgi.post["ec"];
- }
- if ("url" in cgi.post) {
- got.url = cgi.post["url"];
- got.canned_query ~= "&url=" ~ cgi.post["url"];
- }
- if ("se" in cgi.post) {
- got.searched = cgi.post["se"];
- got.canned_query ~= "&se=" ~ cgi.post["se"];
- }
- if ("sql" in cgi.post) {
- got.sql = cgi.post["sql"];
- got.canned_query ~= "&sql=" ~ cgi.post["sql"];
- }
- if ("sml" in cgi.post) {
- got.sql_match_limit = cgi.post["sml"];
- got.canned_query ~= "&sml=" ~ cgi.post["sml"];
- }
- if ("smo" in cgi.post) {
- got.sql_match_offset = "0"; // cgi.post["smo"];
- got.canned_query ~= "&smo=0"; // ~ cgi.post["smo"];
- }
- got.canned_query = got.canned_query.strip.split(" ").join("%%20");
- conf.query_string = got.canned_query;
- // cgi.write("f.canned_query: " ~ got.canned_query ~ "<br>");
- } else if (environment.get("REQUEST_METHOD", "POST") == "GET") {
- got.canned_query = environment.get("QUERY_STRING", "");
- // cgi.write("f.canned_query: " ~ got.canned_query ~ "<br>");
- got.search_text_area = "";
- if ("sf" in canned_query && !(canned_query["sf"]).empty) {
- got.text = canned_query["sf"].split("%%20").join(" ");
- got.search_text_area ~= "text: " ~ got.text ~ "\n";
- }
- if ("au" in canned_query && !(canned_query["au"]).empty) {
- got.author = canned_query["au"].split("%%20").join(" ");
- got.search_text_area ~= "author: " ~ got.author ~ "\n";
- }
- if ("ti" in canned_query && !(canned_query["ti"]).empty) {
- got.title = canned_query["ti"].split("%%20").join(" ");
- got.search_text_area ~= "title: " ~ got.title ~ "\n";
- }
- if ("uid" in canned_query && !(canned_query["uid"]).empty) {
- got.uid = canned_query["uid"].split("%%20").join(" ");
- got.search_text_area ~= "uid: " ~ got.uid ~ "\n";
- }
- if ("fn" in canned_query && !(canned_query["fn"]).empty) {
- got.fn = canned_query["fn"].split("%%20").join(" ");
- got.search_text_area ~= "fn: " ~ got.fn ~ "\n";
- }
- if ("kw" in canned_query && !(canned_query["kw"]).empty) {
- got.keywords = canned_query["kw"].split("%%20").join(" ");
- got.search_text_area ~= "keywords: " ~ got.keywords ~ "\n";
- }
- if ("tr" in canned_query && !(canned_query["tr"]).empty) {
- got.topic_register = canned_query["tr"].split("%%20").join(" ");
- got.search_text_area ~= "topic_register: " ~ got.topic_register ~ "\n";
- }
- if ("su" in canned_query && !(canned_query["su"]).empty) {
- got.subject = canned_query["su"].split("%%20").join(" ");
- got.search_text_area ~= "subject: " ~ got.subject ~ "\n";
- }
- if ("de" in canned_query && !(canned_query["de"]).empty) {
- got.description = canned_query["de"].split("%%20").join(" ");
- got.search_text_area ~= "description: " ~ got.description ~ "\n";
- }
- if ("pb" in canned_query && !(canned_query["pb"]).empty) {
- got.publisher = canned_query["pb"].split("%%20").join(" ");
- got.search_text_area ~= "publisher: " ~ got.publisher ~ "\n";
- }
- if ("ed" in canned_query && !(canned_query["ed"]).empty) {
- got.editor = canned_query["ed"].split("%%20").join(" ");
- got.search_text_area ~= "editor: " ~ got.editor ~ "\n";
- }
- if ("ct" in canned_query && !(canned_query["ct"]).empty) {
- got.contributor = canned_query["ct"].split("%%20").join(" ");
- got.search_text_area ~= "contributor: " ~ got.contributor ~ "\n";
- }
- if ("dt" in canned_query && !(canned_query["dt"]).empty) {
- got.date = canned_query["dt"].split("%%20").join(" ");
- got.search_text_area ~= "date: " ~ got.date ~ "\n";
- }
- if ("rt" in canned_query && !(canned_query["rt"]).empty) {
- got.results_type = canned_query["rt"].split("%%20").join(" ");
- // got.search_text_area ~= "results_type: " ~ got.results_type ~ "\n";
- }
- if ("fmt" in canned_query && !(canned_query["fmt"]).empty) {
- got.format = canned_query["fmt"].split("%%20").join(" ");
- got.search_text_area ~= "format: " ~ got.format ~ "\n";
- }
- if ("src" in canned_query && !(canned_query["src"]).empty) {
- got.source = canned_query["src"].split("%%20").join(" ");
- got.search_text_area ~= "source: " ~ got.source ~ "\n";
- }
- if ("lng" in canned_query && !(canned_query["lng"]).empty) {
- got.language = canned_query["lng"].split("%%20").join(" ");
- got.search_text_area ~= "language: " ~ got.language ~ "\n";
- }
- if ("rl" in canned_query && !(canned_query["rl"]).empty) {
- got.relation = canned_query["rl"].split("%%20").join(" ");
- got.search_text_area ~= "relation: " ~ got.relation ~ "\n";
- }
- if ("cv" in canned_query && !(canned_query["cv"]).empty) {
- got.coverage = canned_query["cv"].split("%%20").join(" ");
- got.search_text_area ~= "coverage: " ~ got.coverage ~ "\n";
- }
- if ("rgt" in canned_query && !(canned_query["rgt"]).empty) {
- got.rights = canned_query["rgt"].split("%%20").join(" ");
- got.search_text_area ~= "rights: " ~ got.rights ~ "\n";
- }
- if ("cmt" in canned_query && !(canned_query["cmt"]).empty) {
- got.comment = canned_query["cmt"].split("%%20").join(" ");
- got.search_text_area ~= "comment: " ~ got.comment ~ "\n";
- }
- // if ("abstract" in canned_query && !(canned_query["abstract"]).empty) {
- // got.abstract = canned_query["abstract"];
- // }
- if ("bfn" in canned_query && !(canned_query["bfn"]).empty) { // search_field
- got.src_filename_base = canned_query["bfn"].split("%%20").join(" ");
- got.search_text_area ~= "src_filename_base: " ~ got.src_filename_base ~ "\n";
- }
- if ("sml" in canned_query && !(canned_query["sml"]).empty) {
- got.sql_match_limit = canned_query["sml"].split("%%20").join(" ");
- // got.search_text_area ~= "sql_match_limit: " ~ got.sql_match_limit ~ "\n";
- }
- // cgi.write("f.search_text_area: " ~ got.search_text_area ~ "<br>");
- }
- return got;
- }
- auto tf = text_fields; //
- struct SQL_select {
- string the_body = "";
- string the_range = "";
- }
- auto sql_select = SQL_select();
- string canned_url () {
- string _url = "";
- if (environment.get("REQUEST_METHOD", "POST") == "POST") {
- _url = conf.http_request_type ~ "://" ~ conf.http_host ~ conf.cgi_script ~ "?" ~ tf.canned_query;
- } else if (environment.get("REQUEST_METHOD", "POST") == "GET") {
- _url = conf.http_request_type ~ "://" ~ conf.http_host ~ conf.cgi_script ~ "?" ~ environment.get("QUERY_STRING", "");
- }
- return _url;
- }
- auto regex_canned_search () {
- static struct RgxCS {
- static track_offset = ctRegex!(`(?P<offset_key>[&]smo=)(?P<offset_val>[0-9]+)`);
- static results_type = ctRegex!(`[&]rt=(?P<results_type>idx|txt)`);
- static results_type_index = ctRegex!(`[&]rt=idx`);
- static results_type_text = ctRegex!(`[&]rt=txt`);
- static fn = ctRegex!(`[&]fn=(?P<fn>[^&]+)`);
- }
- return RgxCS();
- }
- string show_matched_objects (string fn) {
- auto rgx = regex_canned_search;
- string _matched_objects_text = "";
- string _url = canned_url;
- string _url_new = "";
- string _matches_show_text = "&rt=txt";
- string _matches_show_index = "&rt=idx";
- string _fn = "&fn=" ~ fn;
- _url_new = _url;
- if (_url_new.match(rgx.results_type_index)) {
- _url_new = _url_new.replace(rgx.results_type_index, _matches_show_text);
- } else if (_url.match(rgx.results_type_text)) {
- _url_new = _url_new.replace(rgx.results_type_text, _matches_show_index);
- } else {
- if (!(_url.match(rgx.results_type))) {
- _url_new = _url ~ _matches_show_text;
- }
- }
- if (!(_url_new.match(rgx.fn))) {
- _url_new = _url_new ~ _fn;
- }
- _matched_objects_text =
- "<font size=\"2\" color=\"#666666\">"
- ~ "<a href=\""
- ~ _url_new
- ~ "\">"
- ~ "※"
- ~ "</a></font>";
- return _matched_objects_text;
- }
- string base ; // = "";
- string tip ; // = "";
- string search_note ; // = "";
- uint sql_match_offset_count = 0;
- string previous_next () {
- auto rgx = regex_canned_search;
- string _previous_next = "";
- int _current_offset_value = 0;
- string _set_offset_next = "";
- string _set_offset_previous = "";
- string _url = canned_url;
- string _url_previous = "";
- string _url_next = "";
- string arrow_previous = "";
- string arrow_next = "";
- if (auto m = _url.matchFirst(rgx.track_offset)) {
- _current_offset_value = m.captures["offset_val"].to!int;
- _set_offset_next = m.captures["offset_key"] ~ ((m.captures["offset_val"]).to!int + cv.sql_match_limit.to!int).to!string;
- _url_next = _url.replace(rgx.track_offset, _set_offset_next);
- if (_current_offset_value < cv.sql_match_limit.to!int) {
- _url_previous = "";
- } else {
- _url_previous = "";
- _set_offset_previous = m.captures["offset_key"] ~ ((m.captures["offset_val"]).to!int - cv.sql_match_limit.to!int).to!string;
- _url_previous = _url.replace(rgx.track_offset, _set_offset_previous);
- }
- } else {// _current_offset_value = 0;
- _url_next = _url ~= "&smo=" ~ cv.sql_match_limit.to!string;
- }
- if (_url_previous.empty) {
- arrow_previous = "";
- } else {
- arrow_previous =
- "<font size=\"2\" color=\"#666666\">"
- ~ "<a href=\""
- ~ _url_previous
- ~ "\">"
- ~ "&lt;&lt prev"
- ~ "</a> || </font>";
- }
- arrow_next =
- "<font size=\"2\" color=\"#666666\">"
- ~ "<a href=\""
- ~ _url_next
- ~ "\">"
- ~ "next &gt;&gt"
- ~ "</a></font>";
- _previous_next = "<hr>" ~ arrow_previous ~ arrow_next;
- return _previous_next;
- }
- {
- header = format(q"┃
-<!DOCTYPE html>
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>
- %s
- </title>
- <meta name="sourcefile" content="SiSU.sst">
- <link rel="generator" href="sisudoc.org">
- <link rel="shortcut icon" href="https://%%s/image_sys/spine.ico">
- <style media = "all">
- *{
- padding : 0px;
- margin : 2px;
- }
- body {
- height : 100vh;
- background-color : #%s;
- }
- body {
- color : #%s;
- background : #%s;
- background-color : #%s;
- }
- a:link {
- color : #%s;
- text-decoration : none;
- }
- a:visited {
- color : #%s;
- text-decoration : none;
- }
- a:hover {
- color : #%s;
- background-color : #%s;
- }
- a.lnkocn:link {
- color : #%s;
- text-decoration : none;
- }
- a.lnkocn:visited {
- color : #%s;
- text-decoration : none;
- }
- a.lnkocn:hover {
- color : #%s;
- font-size : 15px;
- }
- a:hover img {
- background-color : #%s;
- }
- a:active {
- color : #%s;
- text-decoration : underline;
- }
- .flex-container {
- display : flex;
- }
- div.publication {
- margin-top : 2px;
- margin-bottom : 4px;
- margin-left : 0%%%%;
- margin-right : 0%%%%;
- }
- div.textview_ocn {
- margin-left : 0%%%%;
- margin-right : 1%%%%;
- }
- div.textview_found {
- margin-left : 1%%%%;
- margin-right : 1%%%%;
- }
- textarea {
- color : #%s;
- background-color : #%s;
- }
- span.match {
- color : #%s;
- background-color : #%s;
- }
- p.norm { }
- p.center { text-align : center; }
- p.i1 { padding-left : 1em; }
- p.i2 { padding-left : 2em; }
- p.i3 { padding-left : 3em; }
- p.i4 { padding-left : 4em; }
- p.i5 { padding-left : 5em; }
- p.i6 { padding-left : 6em; }
- p.i7 { padding-left : 7em; }
- p.i8 { padding-left : 8em; }
- p.i9 { padding-left : 9em; }
- /* hanging indent */
- p[indent="h0i0"] {
- padding-left : 0em;
- text-indent : 0em;
- }
- p.publication {
- font-size : 100%%%%;
- margin-left : 0em;
- margin-top : 0px;
- margin-bottom : 0px;
- margin-right : 6px;
- text-align : left;
- }
- p.ocn_is {
- font-size : 100%%%%;
- display : inline-block;
- }
- p.matched_ocn {
- font-size : 90%%%%;
- margin-left : 2em;
- margin-top : 0px;
- margin-bottom : 0px;
- margin-right : 6px;
- text-align : left;
- }
- p[indent="h0i1"] {
- padding-left : 1em;
- text-indent : -1em;
- }
- p[indent="h0i2"] {
- padding-left : 2em;
- text-indent : -2em;
- }
- p[indent="h0i3"] {
- padding-left : 3em;
- text-indent : -3em;
- }
- p[indent="h0i4"] {
- padding-left : 4em;
- text-indent : -4em;
- }
- p[indent="h0i5"] {
- padding-left : 5em;
- text-indent : -5em;
- }
- p[indent="h0i6"] {
- padding-left : 6em;
- text-indent : -6em;
- }
- p[indent="h0i7"] {
- padding-left : 7em;
- text-indent : -7em;
- }
- p[indent="h0i8"] {
- padding-left : 8em;
- text-indent : -8em;
- }
- p[indent="h0i9"] {
- padding-left : 9em;
- text-indent : -9em;
- }
- p[indent="h1i0"] {
- padding-left : 0em;
- text-indent : 1em;
- }
- p[indent="h1i1"] {
- padding-left : 1em;
- text-indent : 0em;
- }
- p[indent="h1i2"] {
- padding-left : 2em;
- text-indent : -1em;
- }
- p[indent="h1i3"] {
- padding-left : 3em;
- text-indent : -2em;
- }
- p[indent="h1i4"] {
- padding-left : 4em;
- text-indent : -3em;
- }
- p[indent="h1i5"] {
- padding-left : 5em;
- text-indent : -4em;
- }
- p[indent="h1i6"] {
- padding-left : 6em;
- text-indent : -5em;
- }
- p[indent="h1i7"] {
- padding-left : 7em;
- text-indent : -6em;
- }
- p[indent="h1i8"] {
- padding-left : 8em;
- text-indent : -7em;
- }
- p[indent="h1i9"] {
- padding-left : 9em;
- text-indent : -8em;
- }
- p[indent="h2i0"] {
- padding-left : 0em;
- text-indent : 2em;
- }
- p[indent="h2i1"] {
- padding-left : 1em;
- text-indent : 1em;
- }
- p[indent="h2i2"] {
- padding-left : 2em;
- text-indent : 0em;
- }
- p[indent="h2i3"] {
- padding-left : 3em;
- text-indent : -1em;
- }
- p[indent="h2i4"] {
- padding-left : 4em;
- text-indent : -2em;
- }
- p[indent="h2i5"] {
- padding-left : 5em;
- text-indent : -3em;
- }
- p[indent="h2i6"] {
- padding-left : 6em;
- text-indent : -4em;
- }
- p[indent="h2i7"] {
- padding-left : 7em;
- text-indent : -5em;
- }
- p[indent="h2i8"] {
- padding-left : 8em;
- text-indent : -6em;
- }
- p[indent="h2i9"] {
- padding-left : 9em;
- text-indent : -7em;
- }
- p[indent="h3i0"] {
- padding-left : 0em;
- text-indent : 3em;
- }
- p[indent="h3i1"] {
- padding-left : 1em;
- text-indent : 2em;
- }
- p[indent="h3i2"] {
- padding-left : 2em;
- text-indent : 1em;
- }
- p[indent="h3i3"] {
- padding-left : 3em;
- text-indent : 0em;
- }
- p[indent="h3i4"] {
- padding-left : 4em;
- text-indent : -1em;
- }
- p[indent="h3i5"] {
- padding-left : 5em;
- text-indent : -2em;
- }
- p[indent="h3i6"] {
- padding-left : 6em;
- text-indent : -3em;
- }
- p[indent="h3i7"] {
- padding-left : 7em;
- text-indent : -4em;
- }
- p[indent="h3i8"] {
- padding-left : 8em;
- text-indent : -5em;
- }
- p[indent="h3i9"] {
- padding-left : 9em;
- text-indent : -6em;
- }
- p[indent="h4i0"] {
- padding-left : 0em;
- text-indent : 4em;
- }
- p[indent="h4i1"] {
- padding-left : 1em;
- text-indent : 3em;
- }
- p[indent="h4i2"] {
- padding-left : 2em;
- text-indent : 2em;
- }
- p[indent="h4i3"] {
- padding-left : 3em;
- text-indent : 1em;
- }
- p[indent="h4i4"] {
- padding-left : 4em;
- text-indent : 0em;
- }
- p[indent="h4i5"] {
- padding-left : 5em;
- text-indent : -1em;
- }
- p[indent="h4i6"] {
- padding-left : 6em;
- text-indent : -2em;
- }
- p[indent="h4i7"] {
- padding-left : 7em;
- text-indent : -3em;
- }
- p[indent="h4i8"] {
- padding-left : 8em;
- text-indent : -4em;
- }
- p[indent="h4i9"] {
- padding-left : 9em;
- text-indent : -5em;
- }
- p[indent="h5i0"] {
- padding-left : 0em;
- text-indent : 5em;
- }
- p[indent="h5i1"] {
- padding-left : 1em;
- text-indent : 4em;
- }
- p[indent="h5i2"] {
- padding-left : 2em;
- text-indent : 3em;
- }
- p[indent="h5i3"] {
- padding-left : 3em;
- text-indent : 2em;
- }
- p[indent="h5i4"] {
- padding-left : 4em;
- text-indent : 1em;
- }
- p[indent="h5i5"] {
- padding-left : 5em;
- text-indent : 0em;
- }
- p[indent="h5i6"] {
- padding-left : 6em;
- text-indent : -1em;
- }
- p[indent="h5i7"] {
- padding-left : 7em;
- text-indent : -2em;
- }
- p[indent="h5i8"] {
- padding-left : 8em;
- text-indent : -3em;
- }
- p[indent="h5i9"] {
- padding-left : 9em;
- text-indent : -4em;
- }
- p[indent="h6i0"] {
- padding-left : 0em;
- text-indent : 6em;
- }
- p[indent="h6i1"] {
- padding-left : 1em;
- text-indent : 5em;
- }
- p[indent="h6i2"] {
- padding-left : 2em;
- text-indent : 4em;
- }
- p[indent="h6i3"] {
- padding-left : 3em;
- text-indent : 3em;
- }
- p[indent="h6i4"] {
- padding-left : 4em;
- text-indent : 2em;
- }
- p[indent="h6i5"] {
- padding-left : 5em;
- text-indent : 1em;
- }
- p[indent="h6i6"] {
- padding-left : 6em;
- text-indent : 0em;
- }
- p[indent="h6i7"] {
- padding-left : 7em;
- text-indent : -1em;
- }
- p[indent="h6i8"] {
- padding-left : 8em;
- text-indent : -2em;
- }
- p[indent="h6i9"] {
- padding-left : 9em;
- text-indent : -3em;
- }
- p[indent="h7i0"] {
- padding-left : 0em;
- text-indent : 7em;
- }
- p[indent="h7i1"] {
- padding-left : 1em;
- text-indent : 6em;
- }
- p[indent="h7i2"] {
- padding-left : 2em;
- text-indent : 5em;
- }
- p[indent="h7i3"] {
- padding-left : 3em;
- text-indent : 4em;
- }
- p[indent="h7i4"] {
- padding-left : 4em;
- text-indent : 3em;
- }
- p[indent="h7i5"] {
- padding-left : 5em;
- text-indent : 2em;
- }
- p[indent="h7i6"] {
- padding-left : 6em;
- text-indent : 1em;
- }
- p[indent="h7i7"] {
- padding-left : 7em;
- text-indent : 0em;
- }
- p[indent="h7i8"] {
- padding-left : 8em;
- text-indent : -1em;
- }
- p[indent="h7i9"] {
- padding-left : 9em;
- text-indent : -2em;
- }
- p[indent="h8i0"] {
- padding-left : 0em;
- text-indent : 8em;
- }
- p[indent="h8i1"] {
- padding-left : 1em;
- text-indent : 7em;
- }
- p[indent="h8i2"] {
- padding-left : 2em;
- text-indent : 6em;
- }
- p[indent="h8i3"] {
- padding-left : 3em;
- text-indent : 5em;
- }
- p[indent="h8i4"] {
- padding-left : 4em;
- text-indent : 4em;
- }
- p[indent="h8i5"] {
- padding-left : 5em;
- text-indent : 3em;
- }
- p[indent="h8i6"] {
- padding-left : 6em;
- text-indent : 2em;
- }
- p[indent="h8i7"] {
- padding-left : 7em;
- text-indent : 1em;
- }
- p[indent="h8i8"] {
- padding-left : 8em;
- text-indent : 0em;
- }
- p[indent="h8i9"] {
- padding-left : 9em;
- text-indent : -1em;
- }
- p[indent="h9i0"] {
- padding-left : 0em;
- text-indent : 9em;
- }
- p[indent="h9i1"] {
- padding-left : 1em;
- text-indent : 8em;
- }
- p[indent="h9i2"] {
- padding-left : 2em;
- text-indent : 7em;
- }
- p[indent="h9i3"] {
- padding-left : 3em;
- text-indent : 6em;
- }
- p[indent="h9i4"] {
- padding-left : 4em;
- text-indent : 5em;
- }
- p[indent="h9i5"] {
- padding-left : 5em;
- text-indent : 4em;
- }
- p[indent="h9i6"] {
- padding-left : 6em;
- text-indent : 3em;
- }
- p[indent="h9i7"] {
- padding-left : 7em;
- text-indent : 2em;
- }
- p[indent="h9i8"] {
- padding-left : 8em;
- text-indent : 1em;
- }
- p[indent="h9i9"] {
- padding-left : 9em;
- text-indent : 0em;
- }
- p.spaced { white-space : pre; }
- p.block {
- white-space : pre;
- }
- p.group { }
- p.alt { }
- p.verse {
- white-space : pre;
- margin-bottom : 6px;
- }
- p.caption {
- text-align : left;
- font-size : 80%%%%;
- display : inline;
- }
- p.endnote {
- font-size : 96%%%%;
- line-height : 120%%%%;
- text-align : left;
- margin-right : 15mm;
- padding-left : 1em;
- text-indent : -1em;
- }
- p.center {
- text-align : center;
- }
- p.bold {
- font-weight : bold;
- }
- p.bold_left {
- font-weight : bold;
- text-align : left;
- }
- p.centerbold {
- text-align : center;
- font-weight : bold;
- }
- p.em {
- font-weight : bold;
- font-style : normal;
- background : #FFF3B6;
- }
- p.small {
- font-size : 80%%%%;
- margin-top : 0px;
- margin-bottom : 0px;
- margin-right : 6px;
- text-align : left;
- }
- .tiny, .tiny_left, .tiny_right, .tiny_center {
- font-size : 10px;
- margin-top : 0px;
- margin-bottom : 0px;
- color : #EEEEEE;
- margin-right : 6px;
- text-align : left;
- }
- p.tiny { }
- p.tiny_left {
- margin-left : 0px;
- margin-right : 0px;
- text-align : left;
- }
- p.tiny_right {
- margin-right : 1em;
- text-align : right;
- }
- p.tiny_center {
- margin-left : 0px;
- margin-right : 0px;
- text-align : center;
- }
- p.book_index_lev1 {
- line-height : 100%%%%;
- margin-top : 4px;
- margin-bottom : 1px;
- }
- p.book_index_lev2 {
- line-height : 100%%%%;
- text-align : left;
- margin-left : 3em;
- margin-top : 1px;
- margin-bottom : 3px;
- }
- tt {
- font-family : inconsolata, "liberation mono", "bitstream vera mono", "dejavu mono", monaco, consolas, "andale mono", "courier new", "courier 10 pitch", courier, monospace;
- background-color : #555555;
- color : #DDDDDD;
- }
- pre {
- width : auto;
- display : block;
- clear : both;
- color : #555555;
- }
- pre.codeline {
- display : table;
- clear : both;
- table-layout : fixed;
- margin-left : 5%%%%;
- margin-right : 5%%%%;
- width : 90%%%%;
- white-space : pre-wrap;
- border-style : none;
- border-radius : 5px 5px 5px 5px;
- box-shadow : 0 2px 5px #AAAAAA inset;
- margin-bottom : 1em;
- padding : 0.5em 1em;
- page-break-inside : avoid;
- word-wrap : break-word;
- font-family : inconsolata, "liberation mono", "bitstream vera mono", "dejavu mono", monaco, consolas, "andale mono", "courier new", "courier 10 pitch", courier, monospace;
- white-space : pre;
- white-space : pre-wrap;
- white-space : -moz-pre-wrap;
- white-space : -o-pre-wrap;
- background-color : #555555;
- color : #DDDDDD;
- font-size : 95%%%%;
- line-height : 100%%%%;
- }
- pre.codeline::before {
- counter-reset : linenum;
- }
- pre.codeline span.tr {
- display : table-row;
- counter-increment : linenum;
- }
- pre.codeline span.th {
- display : table-cell;
- user-select : none;
- -moz-user-select : none;
- -webkit-user-select : none;
- padding : 0.5em 0.5em;
- }
- pre.codeline span.th::before {
- content : counter(linenum) ".";
- color : #999999;
- text-align : right;
- display : block;
- }
- pre.codeline span.th {
- width : 4em;
- }
- pre.codeline code {
- display : table-cell;
- }
- p.code {
- border-style : none;
- }
- note { white-space : pre; }
- em {
- font-weight : bold;
- font-style : italic;
- }
- p.left,th.left,td.left {
- text-align : left;
- }
- p.small_left,th.small_left,td.small_left {
- text-align : left;
- font-size : 80%%%%;
- }
- p.right,th.right,td.right {
- text-align : right;
- }
- ul, li {
- list-style-type : none;
- list-style : none;
- padding-left : 20px;
- font-weight : normal;
- line-height : 150%%%%;
- text-align : left;
- text-indent : 0mm;
- margin-left : 1em;
- margin-right : 2em;
- margin-top : 3px;
- margin-bottom : 3px;
- }
- li {
- background : (../image_sys/bullet_09.png) no-repeat 0px 6px;
- }
- ul { }
- h0, h1, h2, h3, h4, h5, h6, h7 {
- font-weight : bold;
- line-height : 120%%%%;
- text-align : left;
- margin-top : 20px;
- margin-bottom : 10px;
- }
- h4.norm, h5.norm, h6.norm, h7.norm {
- margin-top : 10px;
- margin-bottom : 0px;
- }
- h0 { font-size : 125%%%%; }
- h1 { font-size : 120%%%%; }
- h2 { font-size : 115%%%%; }
- h3 { font-size : 110%%%%; }
- h4 { font-size : 105%%%%; }
- h5 { font-size : 100%%%%; }
- h6 { font-size : 100%%%%; }
- h7 { font-size : 100%%%%; }
- h0, h1, h2, h3, h4, h5, h6, h7 {
- text-shadow : .2em .2em .3em #999999;
- }
- h1.i { margin-left : 2em; }
- h2.i { margin-left : 3em; }
- h3.i { margin-left : 4em; }
- h4.i { margin-left : 5em; }
- h5.i { margin-left : 6em; }
- h6.i { margin-left : 7em; }
- h7.i { margin-left : 8em; }
- h8.i { margin-left : 9em; }
- h9.i { margin-left : 10em; }
- .toc {
- font-weight : normal;
- margin-top : 6px;
- margin-bottom : 6px;
- }
- h0.toc {
- margin-left : 1em;
- font-size : 120%%%%;
- line-height : 150%%%%;
- }
- h1.toc {
- margin-left : 1em;
- font-size : 115%%%%;
- line-height : 150%%%%;
- }
- h2.toc {
- margin-left : 2em;
- font-size : 110%%%%;
- line-height : 140%%%%;
- }
- h3.toc {
- margin-left : 3em;
- font-size : 105%%%%;
- line-height : 120%%%%;
- }
- h4.toc {
- margin-left : 4em;
- font-size : 100%%%%;
- line-height : 120%%%%;
- }
- h5.toc {
- margin-left : 5em;
- font-size : 95%%%%;
- line-height : 110%%%%;
- }
- h6.toc {
- margin-left : 6em;
- font-size : 90%%%%;
- line-height : 110%%%%;
- }
- h7.toc {
- margin-left : 7em;
- font-size : 85%%%%;
- line-height : 100%%%%;
- }
- .subtoc {
- margin-right : 34%%%%;
- font-weight : normal;
- }
- h5.subtoc {
- margin-left : 2em;
- font-size : 80%%%%;
- margin-top : 2px;
- margin-bottom : 2px;
- }
- h6.subtoc {
- margin-left : 3em;
- font-size : 75%%%%;
- margin-top : 0px;
- margin-bottom : 0px;
- }
- h7.subtoc {
- margin-left : 4em;
- font-size : 70%%%%;
- margin-top : 0px;
- margin-bottom : 0px;
- }
- hr {
- display : block;
- height : 1px;
- width : 100%%%%;
- border : 0;
- border-top : 1px solid #AAAAAA;
- border-color : #AAAAAA
- background-color : #AAAAAA
- margin-left : 0%%%%;
- margin-right : 0em;
- margin-top : 0.5em;
- margin-bottom : 0.5em;
- padding : 0;
- }
-</style>
-</head>
-<body lang="en" xml:lang="en">
-┃",
- conf.http_host,
- );
- }
- {
- table = format(q"┃
-<table summary="band" border="0" cellpadding="2" cellspacing="0">
-<tr><td width="20%%%%">
- <table summary="home button / home information" border="0" cellpadding="2" cellspacing="0">
- <tr><td align="left">
- %s
- </td></tr>
- </table>
-</td>
-<td>
-</td></tr>
-</table>
-┃");
- }
- {
- string post_value(string field_name, string type="box", string set="on") {
- string val = "";
- switch (type) {
- case "field":
- val = ((field_name in cgi.post && !(cgi.post[field_name]).empty)
- ? cgi.post[field_name]
- : (field_name in cgi.get)
- ? cgi.get[field_name]
- : "");
- val = tf.search_text_area;
- break;
- case "box": // generic for checkbox or radio; checkbox set == "on" radio set == "name set"
- val = ((field_name in cgi.post && !(cgi.post[field_name]).empty)
- ? (cgi.post[field_name] == set ? "checked" : "off")
- : (field_name in cgi.get)
- ? (cgi.get[field_name] == set ? "checked" : "off")
- : "off");
- break;
- case "radio": // used generic bo
- val = ((field_name in cgi.post && !(cgi.post[field_name]).empty)
- ? (cgi.post[field_name] == set ? "checked" : "off")
- : (field_name in cgi.get)
- ? (cgi.get[field_name] == set ? "checked" : "off")
- : "checked");
- break;
- case "checkbox": // used generic bo
- val = ((field_name in cgi.post && !(cgi.post[field_name]).empty)
- ? (cgi.post[field_name] == set ? "checked" : "off")
- : (field_name in cgi.get)
- ? (cgi.get[field_name] == set ? "checked" : "off")
- : "checked");
- break;
- default:
- }
- return val;
- }
- string the_can(string fv) {
- string show_the_can = post_value("url");
- string _the_can = "";
- if (show_the_can == "checked") {
- tf = text_fields;
- string method_get_url = conf.http_request_type ~ "://" ~ conf.http_host ~ conf.cgi_script ~ "?" ~ environment.get("QUERY_STRING", "");
- string method_post_url_construct = conf.http_request_type ~ "://" ~ conf.http_host ~ conf.cgi_script ~ "?" ~ tf.canned_query;
- // assert(method_get_url == environment.get("HTTP_REFERER", conf.http_request_type ~ "://" ~ conf.http_host ~ conf.cgi_script ~ "?" ~ conf.query_string));
- if (conf.request_method == "POST") {
- _the_can =
- "<font size=\"2\" color=\"#666666\">"
- ~ "POST:&nbsp;"
- ~ "<a href=\""
- ~ method_post_url_construct
- ~ "\">"
- ~ method_post_url_construct
- ~ "</a></font>"
- ~ "<br>";
- } else if (conf.request_method == "GET") {
- _the_can =
- "<font size=\"2\" color=\"#666666\">"
- ~ "GET:&nbsp;&nbsp;"
- ~ "<a href=\""
- ~ method_get_url
- ~ "\">"
- ~ method_get_url
- ~ "</a></font>";
- }
- conf.http_url = conf.http_request_type ~ "://" ~ conf.http_host ~ conf.cgi_script ~ tf.canned_query;
- }
- return _the_can;
- }
- string provide_tip() {
- string searched_tip = post_value("se");
- string tip = "";
- if (searched_tip == "checked") {
- string search_field = post_value("sf", "field");
- tf = text_fields;
- tip = format(q"┃
-<font size="2" color="#666666">
-<b>database:</b> <font size="2" color="#004000">%%s</font>; <b>selected view:</b> <font size="2" color="#004000">index</font>
-<b>search string:</b> %%s %%s %%s %%s %%s %%s<br>
-%%s %%s %%s %%s %%s %%s
-</font>
-┃",
- cv.db_selected,
- (tf.text.empty ? "" : "\"text: <font size=\"2\" color=\"#004000\">" ~ tf.text ~ "</font>; "),
- (tf.title.empty ? "" : "\"title: <font size=\"2\" color=\"#004000\">" ~ tf.title ~ "</font>; "),
- (tf.author.empty ? "" : "\"author: <font size=\"2\" color=\"#004000\">" ~ tf.author ~ "</font>; "),
- (tf.date.empty ? "" : "\"date <font size=\"2\" color=\"#004000\">" ~ tf.date ~ "</font>; "),
- (tf.uid.empty ? "" : "\"uid: <font size=\"2\" color=\"#004000\">" ~ tf.uid ~ "</font>; "),
- (tf.fn.empty ? "" : "\"fn: <font size=\"2\" color=\"#004000\">" ~ tf.fn ~ "</font>; "),
- (tf.text.empty ? "" : "text: <font size=\"2\" color=\"#004000\">" ~ tf.text ~ "</font><br>"),
- (tf.title.empty ? "" : "title: <font size=\"2\" color=\"#004000\">" ~ tf.title ~ "</font><br>"),
- (tf.author.empty ? "" : "author: <font size=\"2\" color=\"#004000\">" ~ tf.author ~ "</font><br>"),
- (tf.date.empty ? "" : "date: <font size=\"2\" color=\"#004000\">" ~ tf.date ~ "</font><br>"),
- (tf.uid.empty ? "" : "\"uid: <font size=\"2\" color=\"#004000\">" ~ tf.uid ~ "</font>; "),
- (tf.fn.empty ? "" : "\"fn: <font size=\"2\" color=\"#004000\">" ~ tf.fn ~ "</font>; "),
- );
- }
- return tip;
- }
- form = format(q"┃
-<form action="%%s" id="SubmitForm" method="post" accept-charset="UTF-8">
- <table cellpadding="2">
- <tr><td valign=\"top\">
- <textarea id="find" name="sf" type="text" rows="6" cols="40" maxlength="256" wrap="virtual">%%s</textarea>
- </td>
- <td valign=\"top\">
- %%s
- %%s
- %%s
- </td></tr></table>
- <td valign=\"top\"><tr><td>
- <font size="2" color="#%s">
- <input type="hidden" name="db" value="%%s">
- <input type="submit" value="SiSU search">
- <input type="radio" name="rt" id="results_type_index" value="idx" %%s> index
- <input type="radio" name="rt" id="results_type_text" value="txt" %%s> text / grep;
- match limit:
- <input type="radio" name="sml" id="sql_match_limit_1000" value="1000" %%s> 1,000
- <input type="radio" name="sml" id="sql_match_limit_2500" value="2500" %%s> 2,500
- <br>
- <input type="checkbox" name="ec" %%s> echo query
- <input type="checkbox" name="url" %%s> search url
- <input type="checkbox" name="se" %%s> searched
- <input type="checkbox" name="sql" %%s> sql statement
- <input type="hidden" name="smo" value="0">
- <br>
- </font>
- </td></tr>
- </table>
-</form>
-┃",
- "%s",
- (post_value("ec") == "checked") ? post_value("sf", "field") : "",
- provide_tip,
- search_note,
- the_can(post_value("sf", "field")),
- cv.db_selected,
- post_value("rt", "box", "idx"),
- post_value("rt", "box", "txt"),
- post_value("sml", "box", "1000"),
- post_value("sml", "box", "2500"),
- post_value("ec"),
- post_value("url"),
- post_value("se"),
- post_value("sql"),
- );
- {
- string set_value(string field_name, string default_val) {
- string val;
- if (field_name in cgi.post) {
- val = cgi.post[field_name];
- } else if (field_name in cgi.get) {
- val = cgi.get[field_name];
- } else { val = default_val; }
- return val;
- }
- bool set_bool(string field_name) {
- bool val;
- if (field_name in cgi.post
- && cgi.post[field_name] == "on") {
- val = true;
- } else if (field_name in cgi.get
- && cgi.get[field_name] == "on") {
- val = true;
- } else { val = false; }
- return val;
- }
- cv.db_selected = set_value("selected_db", "%s"); // selected_db_name == db (spine.search.db or whatever)
- cv.sql_match_limit = set_value("sml", "1000");
- cv.sql_match_offset = set_value("smo", "0");
- cv.search_text = set_value("sf", "");
- cv.results_type = set_value("rt", "idx");
- cv.checked_echo = set_bool("ec");
- cv.checked_stats = set_bool("sts");
- cv.checked_url = set_bool("url");
- cv.checked_searched = set_bool("se");
- cv.checked_tip = set_bool("tip");
- cv.checked_sql = set_bool("sql");
- tf = text_fields;
- }
- }
- {
- cgi.write(header);
- cgi.write(table);
- cgi.write(form);
- // cgi.write(previous_next);
- { // debug environment
- // foreach (k, d; environment.toAA) {
- // cgi.write(k ~ ": " ~ d ~ "<br>");
- // }
- }
- { // debug cgi info
- // cgi.write("db_selected: " ~ cv.db_selected ~ "<br>\n");
- // cgi.write("search_text: " ~ cv.search_text ~ "<br>\n");
- // cgi.write("sql_match_limit: " ~ cv.sql_match_limit ~ ";\n");
- // cgi.write("sql_match_offset: " ~ cv.sql_match_offset ~ ";\n");
- // cgi.write("results_type: " ~ cv.results_type ~ "<br>\n");
- // cgi.write("cv.checked_echo: " ~ (cv.checked_echo ? "checked" : "off") ~ "; \n");
- // cgi.write("cv.checked_stats: " ~ (cv.checked_stats ? "checked" : "off") ~ "; \n");
- // cgi.write("cv.checked_url: " ~ (cv.checked_url ? "checked" : "off") ~ "; \n");
- // cgi.write("cv.checked_searched: " ~ (cv.checked_searched ? "checked" : "off") ~ ";<br>\n");
- // cgi.write("cv.checked_tip: " ~ (cv.checked_tip ? "checked" : "off") ~ "; \n");
- // cgi.write("cv.checked_sql: " ~ (cv.checked_sql ? "checked" : "off") ~ "<br>\n");
- }
- }
- auto db = Database(conf.db_path ~ cv.db_selected);
- {
- uint sql_match_offset_counter(T)(T cv) {
- sql_match_offset_count += cv.sql_match_limit.to!uint;
- return sql_match_offset_count;
- }
- void sql_search_query() {
- string highlight_text_matched(string _txt, string search_field) {
- string _mark_open = "┤";
- string _mark_close = "├";
- string _span_match = "<span class=\"match\">";
- string _span_close = "</span>";
- string _sf_str = search_field.strip.split("%%20").join(" ").strip;
- string[] _sf_arr = _sf_str.split(regex(r"\s+AND\s+|\s+OR\s+"));
- auto rgx_url = regex(r"<a href=[^>]+?>");
- foreach (_sf; _sf_arr) {
- auto rgx_matched_text = regex(_sf, "i");
- auto rgx_marked_pair = regex(r"┤(?P<keep>" ~ _sf ~ ")├", "i");
- if (auto m = _txt.matchFirst(rgx_url)) {
- _txt = replaceAll!(m =>
- _mark_open
- ~ m.captures[0]
- ~ _mark_close
- )(_txt, rgx_matched_text);
- _txt = replaceAll!(m =>
- replaceAll!(u =>
- u["keep"]
- )(m.hit, rgx_marked_pair)
- )(_txt, rgx_url);
- _txt = replaceAll!(m =>
- _span_match
- ~ m["keep"]
- ~ _span_close
- )(_txt, rgx_marked_pair);
- } else {
- _txt = replaceAll!(m =>
- _span_match
- ~ m.captures[0]
- ~ _span_close
- )(_txt, rgx_matched_text);
- }
- }
- return _txt;
- }
- string select_field_like(string db_field, string search_field) {
- string where_ = "";
- if (!(search_field.empty)) {
- string _sf = search_field.strip.split("%%20").join(" ");
- if (_sf.match(r" OR ")) {
- _sf = _sf.split(" OR ").join("%%' OR " ~ db_field ~ " LIKE '%%");
- }
- if (_sf.match(r" AND ")) {
- _sf = _sf.split(" AND ").join("%%' AND " ~ db_field ~ " LIKE '%%");
- }
- _sf = "( " ~ db_field ~ " LIKE\n '%%" ~ _sf ~ "%%' )";
- where_ ~= format(q"┃
- %%s
-┃",
- _sf
- );
- }
- return where_;
- }
- string[] _fields;
- _fields ~= select_field_like("doc_objects.clean", tf.text);
- _fields ~= select_field_like("metadata_and_text.title", tf.title);
- _fields ~= select_field_like("metadata_and_text.creator_author", tf.author);
- _fields ~= select_field_like("metadata_and_text.uid", tf.uid);
- _fields ~= select_field_like("metadata_and_text.src_filename_base", tf.fn);
- _fields ~= select_field_like("metadata_and_text.src_filename_base", tf.src_filename_base);
- _fields ~= select_field_like("metadata_and_text.language_document_char", tf.language);
- _fields ~= select_field_like("metadata_and_text.date_published", tf.date);
- _fields ~= select_field_like("metadata_and_text.classify_keywords", tf.keywords);
- _fields ~= select_field_like("metadata_and_text.classify_topic_register", tf.topic_register);
- string[] fields;
- foreach (f; _fields) {
- if (!(f.empty)) { fields ~= f; }
- }
- string fields_str = "";
- fields_str ~= fields.join(" AND ");
- sql_select.the_body ~= format(q"┃
-SELECT
- metadata_and_text.uid,
- metadata_and_text.title,
- metadata_and_text.creator_author_last_first,
- metadata_and_text.creator_author,
- metadata_and_text.src_filename_base,
- metadata_and_text.language_document_char,
- metadata_and_text.date_published,
- metadata_and_text.classify_keywords,
- metadata_and_text.classify_topic_register,
- doc_objects.body,
- doc_objects.seg_name,
- doc_objects.ocn,
- metadata_and_text.uid
-FROM
- doc_objects,
- metadata_and_text
-WHERE (
- %%s
- )
-AND
- doc_objects.uid_metadata_and_text = metadata_and_text.uid
-ORDER BY
- metadata_and_text.creator_author_last_first,
- metadata_and_text.date_published DESC,
- metadata_and_text.title,
- metadata_and_text.language_document_char,
- metadata_and_text.src_filename_base,
- doc_objects.ocn
-LIMIT %%s OFFSET %%s
-;┃",
- fields_str,
- cv.sql_match_limit,
- cv.sql_match_offset,
- );
- (cv.checked_sql)
- ? cgi.write(previous_next
- ~ "<hr><font size=\"2\" color=\"#666666\">"
- ~ sql_select.the_body.strip.split("\n ").join(" ").split("\n").join("<br>")
- ~ "</font>\n"
- )
- : "";
- cgi.write(previous_next);
- auto select_query_results = db.execute(sql_select.the_body).cached;
- string _old_uid = "";
- if (!select_query_results.empty) {
- string _date_published = "0000";
- string _close_para = "";
- string _matched_ocn_open = "";
- foreach (idx, row; select_query_results) {
- if (row["uid"].as!string != _old_uid) {
- _close_para = (idx == 1) ? "" : "</p>";
- _matched_ocn_open = (idx == 1) ? "" : "<p class=\"matched_ocn\">";
- _old_uid = row["uid"].as!string;
- _date_published = (row["date_published"].as!string.match(regex(r"^([0-9]{4})")))
- ? row["date_published"].as!string : "0000"; // used in regex that breaks if no match
- auto m = _date_published.match(regex(r"^([0-9]{4})"));
- string _date = (m.hit == "0000") ? "(year?) " : "(" ~ m.hit ~ ") ";
- cgi.write(
- _close_para
- ~ "<hr><div class=\"publication\">"
- ~ "<p class=\"publication\"><a href=\""
- ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
- ~ row["language_document_char"].as!string ~ "/html/"
- ~ row["src_filename_base"].as!string ~ "/"
- ~ "toc.html"
- ~ "\">\""
- ~ row["title"].as!string ~ "\""
- ~ "</a> "
- ~ _date
- ~ "[" ~ row["language_document_char"].as!string ~ "] "
- ~ row["creator_author_last_first"].as!string
- ~ " "
- ~ show_matched_objects(row["src_filename_base"].as!string)
- ~ "</p>"
- ~ "</div>"
- );
- }
- if (cv.results_type == "txt") {
- if (row["ocn"].as!string != "0") {
- cgi.write(
- "<div class=\"flex-container\">"
- ~ "<div class=\"textview_ocn\" style=\"flex: 0 0 1.2em\">"
- ~ "<p class=\"ocn_is\"><a href=\""
- ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
- ~ row["language_document_char"].as!string ~ "/html/"
- ~ row["src_filename_base"].as!string ~ "/"
- ~ row["seg_name"].as!string ~ ".html#" ~ row["ocn"].as!string
- ~ "\">"
- ~ row["ocn"].as!string
- ~ "</a>:</p>"
- ~ "</div>"
- ~ "<div class=\"textview_found\">"
- ~ highlight_text_matched(row["body"].as!string, tf.text)
- ~ "</div>"
- ~ "</div>"
- );
- } else {
- cgi.write(
- "<div class=\"flex-container\">"
- ~ "<div class=\"textview_ocn\" style=\"flex: 0 0 1.2em\">"
- ~ "<p class=\"ocn_is\"><a href=\""
- ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
- ~ row["language_document_char"].as!string ~ "/html/"
- ~ row["src_filename_base"].as!string ~ "/toc.html"
- ~ "\">"
- ~ row["ocn"].as!string
- ~ "</a>:</p>"
- ~ "</div>"
- ~ "<div class=\"textview_found\">"
- ~ highlight_text_matched(row["body"].as!string, tf.text)
- ~ "</div>"
- ~ "</div>"
- );
- }
- } else {
- if (row["ocn"].as!string != "0") {
- cgi.write(
- _matched_ocn_open
- ~ "<a href=\""
- ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
- ~ row["language_document_char"].as!string ~ "/html/"
- ~ row["src_filename_base"].as!string ~ "/"
- ~ row["seg_name"].as!string ~ ".html#" ~ row["ocn"].as!string
- ~ "\">"
- ~ row["ocn"].as!string
- ~ "</a>, "
- );
- } else {
- cgi.write(
- _matched_ocn_open
- ~ "<a href=\""
- ~ "https://" ~ conf.http_host ~ conf.doc_collection_subroot ~ "/"
- ~ row["language_document_char"].as!string ~ "/html/"
- ~ row["src_filename_base"].as!string ~ "/toc.html"
- ~ "\">"
- ~ row["ocn"].as!string
- ~ "</a>, "
- );
- }
- _matched_ocn_open = "";
- }
- }
- cgi.write( previous_next);
-
- } else { // offset_not_beyond_limit = false;
- cgi.write("select_query_results empty<p>\n");
- }
- cgi.write("<br><p class=\"center\"><a href=\"https://sisudoc.org/\" target=\"_top\">
-<label for=\"find\"><b>≅ SiSU spine</b></label>
-</a> <label for=\"find\">(generated) search form</label>
-<br><a href=\"https://git.sisudoc.org/\" target=\"_top\">
- git</a>
-</p>
-");
- }
- sql_search_query;
- }
- {
- db.close;
- }
- {
- string tail = format(q"┃
-</body>
-┃");
- cgi.write(tail);
- }
-}
-mixin GenericMain!cgi_function_intro;
-≓",
- get_doc_collection_subroot(make_and_meta_struct.conf.output_path),
- make_and_meta_struct.conf.output_path ~ "/sqlite/",
- _sqlite_db_fn,
- (opt_action.cgi_search_title.empty)
- ? make_and_meta_struct.conf.w_srv_cgi_search_form_title
- : opt_action.cgi_search_title,
- (opt_action.css_theme_default) ? "FFFFFF" : "000000",
- (opt_action.css_theme_default) ? "000000" : "CCCCCC",
- (opt_action.css_theme_default) ? "FFFFFF" : "000000",
- (opt_action.css_theme_default) ? "FFFFFF" : "000000",
- (opt_action.css_theme_default) ? "003399" : "FFFFFF",
- (opt_action.css_theme_default) ? "003399" : "999999",
- "000000",
- (opt_action.css_theme_default) ? "F9F9AA" : "555555",
- (opt_action.css_theme_default) ? "777777" : "BBBBBB",
- (opt_action.css_theme_default) ? "32CD32" : "9ACD32",
- (opt_action.css_theme_default) ? "777777" : "BBBBBB",
- (opt_action.css_theme_default) ? "FFFFFF" : "000000",
- (opt_action.css_theme_default) ? "003399" : "888888",
- (opt_action.css_theme_default) ? "000000" : "FFFFFF",
- (opt_action.css_theme_default) ? "FFFFFF" : "777777",
- (opt_action.css_theme_default) ? "000000" : "FFFF48",
- (opt_action.css_theme_default) ? "FFFF48" : "777748",
- (opt_action.cgi_search_title.empty)
- ? make_and_meta_struct.conf.w_srv_cgi_search_form_title
- : opt_action.cgi_search_title,
- (opt_action.css_theme_default) ? "222222" : "AAAAAA",
- _cgi_search_script,
- _sqlite_db_fn,
-).strip;
- string _cgi_path = (opt_action.output_dir_set.length > 0)
- ? opt_action.output_dir_set
- : (make_and_meta_struct.conf.w_srv_data_root_path.length > 0)
- ? make_and_meta_struct.conf.w_srv_data_root_path
- : "";
- auto pth_sqlite_cgi = spinePathsSQLiteCGI!()(_cgi_search_script_raw_fn_d, _cgi_search_script, _cgi_path);
- { // cgi-bin search form src d
- try {
- if (!exists(pth_sqlite_cgi.src)) {
- pth_sqlite_cgi.src.mkdirRecurse;
- }
- if (!exists(pth_sqlite_cgi.cgi_bin)) {
- pth_sqlite_cgi.cgi_bin.mkdirRecurse;
- }
- auto f = File(pth_sqlite_cgi.search_form_path_out, "w");
- f.write(the_cgi_search_form);
- // foreach (o; metadata_) {
- // f.writeln(o);
- // }
- } catch (ErrnoException ex) {
- // Handle error
- }
- // if (!(opt_action.quiet)) {
- // writeln(" ", pth_sqlite_cgi.search_form);
- // }
- }
- string the_dub_sdl = format(q"≓
-name "spine_cgi_sqlite_search"
-description "spine cgi sqlite search"
-authors "Ralph Amissah"
-copyright "Copyright © 2022, Ralph Amissah"
-license "GPL-3.0+"
-dependency "d2sqlite3" version="%s"
-dependency "arsd-official:cgi" version="%s"
- subConfiguration "arsd-official:cgi" "cgi"
-targetType "executable"
-targetPath "./cgi-bin"
-mainSourceFile "%s"
-configuration "default" {
- targetType "executable"
- targetName "%s"
- postGenerateCommands "notify-send -t 0 'D executable ready' 'spine cgi sqlite search d'"
-}
-≓",
- "~>0.18.3", // d2sqlite3 dependency version
- "~>7.2.0", // arsd-official:cgi dependency version
- "src/" ~ _cgi_search_script_raw_fn_d,
- _cgi_search_script
-).strip;
- { // dub.sdl
- try {
- auto f = File(pth_sqlite_cgi.dub_sdl_path_out, "w");
- f.write(the_dub_sdl);
- // foreach (o; metadata_) {
- // f.writeln(o);
- // }
- } catch (ErrnoException ex) {
- // Handle error
- }
- }
- // { // get cgi.d
- // // import std.net.curl, std.stdio;
- // // char[] cgi_d;
- // // if (opt_action.allow_downloads) {
- // // try {
- // // cgi_d = get!HTTP("https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d");
- // // } catch (ErrnoException ex) {
- // // // Handle error
- // // // CurlCode perform(ThrowOnError throwOnError = Yes.throwOnError);
- // // CurlCode perform(ThrowOnError throwOnError = No.throwOnError);
- // // }
- // // if (cgi_d && cgi_d.length > 0) {
- // // try {
- // // auto f = File(pth_sqlite_cgi.cgi_d_path_out, "w");
- // // f.write(cgi_d);
- // // } catch (ErrnoException ex) {
- // // // Handle error
- // // }
- // // }
- // // }
- // }
- }
-}
diff --git a/src/sisudoc/ocda/abstraction/package.d b/src/sisudoc/ocda/abstraction/package.d
new file mode 100644
index 0000000..4b34b3a
--- /dev/null
+++ b/src/sisudoc/ocda/abstraction/package.d
@@ -0,0 +1,86 @@
+/+
+- Name: SisuDoc Spine, Doc Reform [a part of]
+ - Description: documents, structuring, processing, publishing, search
+ - static content generator
+
+ - Author: Ralph Amissah
+ [ralph.amissah@gmail.com]
+
+ - Copyright: (C) 2015 (continuously updated, current 2026) Ralph Amissah, All Rights Reserved.
+
+ - License: AGPL 3 or later:
+
+ Spine (SiSU), a framework for document structuring, publishing and
+ search
+
+ Copyright (C) Ralph Amissah
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU AFERO General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see [https://www.gnu.org/licenses/].
+
+ If you have Internet connection, the latest version of the AGPL should be
+ available at these locations:
+ [https://www.fsf.org/licensing/licenses/agpl.html]
+ [https://www.gnu.org/licenses/agpl.html]
+
+ - Spine (by Doc Reform, related to SiSU) uses standard:
+ - docReform markup syntax
+ - standard SiSU markup syntax with modified headers and minor modifications
+ - docReform object numbering
+ - standard SiSU object citation numbering & system
+
+ - Homepages:
+ [https://www.sisudoc.org]
+ [https://www.doc-reform.org]
+
+ - Git
+ [https://git.sisudoc.org/]
+
++/
+/++
+ sisudoc.ocda.abstraction - public surface of the document-abstraction
+ library.
+
+ Pipeline position: markup -> abstraction -> output.
+ This package is the abstraction stage. The output stage lives in
+ sisudoc.outputs.io_out and consumes the values produced here.
+
+ Entry points:
+ - spineAbstraction!() (from sisudoc.ocda.meta.metadoc) - A-layer:
+ builds the in-memory document object model from a manifest
+ (pod path, .sst path). Reads the document body, parses YAML
+ headers, returns a struct with .abstraction (the object
+ model) and .matters (the conf/meta/src wrapper).
+ - docAbstraction!() (from sisudoc.ocda.meta.metadoc_from_src) -
+ B-layer: builds the abstraction from already-loaded body
+ text plus a pre-built ConfComposite. Pure, no file I/O.
+
+ The A-layer is a thin wrapper over the B-layer; consumers that
+ want a minimal-dependency entry should use docAbstraction!()
+ directly.
+
+ Serialisation:
+ - sisudoc.ocda.abstraction.ssp - PEG-parsable text serialisation of
+ the abstraction (the .ssp format). See specs/doc-abstraction-
+ format/ for the format reference.
+
+ This file is a re-export-only surface. No logic lives here; it
+ exists so external consumers can `import sisudoc.ocda.abstraction;` and
+ reach the entry points without depending on spine's directory
+ layout.
++/
+module sisudoc.ocda.abstraction;
+@safe:
+public import sisudoc.ocda.meta.metadoc; // spineAbstraction (A-layer)
+public import sisudoc.ocda.meta.metadoc_from_src; // docAbstraction (B-layer)
+public import sisudoc.ocda.abstraction.ssp; // spineAbstractionTxt (.ssp)
diff --git a/src/sisudoc/io_out/create_abstraction_txt.d b/src/sisudoc/ocda/abstraction/ssp.d
index af98f61..cb3747b 100644
--- a/src/sisudoc/io_out/create_abstraction_txt.d
+++ b/src/sisudoc/ocda/abstraction/ssp.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.create_abstraction_txt;
+module sisudoc.ocda.abstraction.ssp;
@safe:
/+ ↓ write document abstraction as human-readable .ssp text file +/
@@ -59,7 +59,6 @@ template spineAbstractionTxt() {
import std.stdio;
import std.string;
import std.array;
- import sisudoc.io_out.paths_output;
void spineAbstractionTxt(D)(D doc) {
auto doc_abstraction = doc.abstraction;
@@ -408,9 +407,12 @@ template spineAbstractionTxt() {
}
/+ ↓ write to file +/
- auto out_pth = spineOutPaths!()(doc_matters.output_path, doc_matters.src.language);
- string base_dir = "abstraction";
- string base_pth = ((out_pth.output_base.chainPath(base_dir)).asNormalizedPath).array;
+ /+ path: <output_path>/<language>/abstraction/<doc_uid_out>.ssp +/
+ string out_root = (doc_matters.output_path.length > 0)
+ ? doc_matters.output_path : "";
+ string base_pth = (out_root
+ .chainPath(doc_matters.src.language, "abstraction")
+ .asNormalizedPath).array;
try {
if (!exists(base_pth)) {
base_pth.mkdirRecurse;
diff --git a/src/sisudoc/io_in/paths_source.d b/src/sisudoc/ocda/io_in/paths_source.d
index 41353ed..9cacdf0 100644
--- a/src/sisudoc/io_in/paths_source.d
+++ b/src/sisudoc/ocda/io_in/paths_source.d
@@ -52,7 +52,7 @@
- read config files<BR>
meta_config_files.d
+/
-module sisudoc.io_in.paths_source;
+module sisudoc.ocda.io_in.paths_source;
@safe:
import std.array;
import std.file;
@@ -60,8 +60,8 @@ import std.path;
import std.regex;
import std.stdio;
import std.conv : to;
-import sisudoc.meta.defaults;
-import sisudoc.meta.rgx_files;
+import sisudoc.ocda.meta.defaults;
+import sisudoc.ocda.meta.rgx_files;
template PodManifest() {
mixin spineRgxFiles;
static auto rgx_files = RgxFiles();
diff --git a/src/sisudoc/io_in/read_config_files.d b/src/sisudoc/ocda/io_in/read_config_files.d
index d3a3f45..849705a 100644
--- a/src/sisudoc/io_in/read_config_files.d
+++ b/src/sisudoc/ocda/io_in/read_config_files.d
@@ -52,14 +52,14 @@
- read config files<BR>
meta_config_files.d
+/
-module sisudoc.io_in.read_config_files;
+module sisudoc.ocda.io_in.read_config_files;
@safe:
import std.file;
import std.path;
-import sisudoc.meta;
-import sisudoc.io_in.paths_source;
-import sisudoc.meta.rgx_files;
-import sisudoc.meta.rgx;
+import sisudoc.ocda.meta;
+import sisudoc.ocda.io_in.paths_source;
+import sisudoc.ocda.meta.rgx_files;
+import sisudoc.ocda.meta.rgx;
template readConfigSite() {
@system final auto readConfigSite(Cf,O,Cfg)(Cf _conf_file_details, O _opt_action, Cfg _cfg) {
mixin spineRgxIn;
@@ -190,10 +190,10 @@ webserv:
static template readConfigDoc() {
import std.file;
import std.path;
- import sisudoc.meta;
- import sisudoc.io_in.paths_source;
- import sisudoc.meta.rgx_files;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta;
+ import sisudoc.ocda.io_in.paths_source;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.ocda.meta.rgx;
@system final auto readConfigDoc(M,E)(M _manifested, E _env) {
mixin spineRgxIn;
static auto rgx = RgxI();
@@ -244,10 +244,10 @@ static template readConfigDoc() {
static template configReadSiteYAML() {
import std.file;
import std.path;
- import sisudoc.meta;
- import sisudoc.io_in.paths_source;
- import sisudoc.meta.rgx_files;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta;
+ import sisudoc.ocda.io_in.paths_source;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.ocda.meta.rgx;
final YAMLDocument configReadSiteYAML(M,E)(M _manifested, E _env) {
string _configuration = configReadInSiteYAML!()(_manifested, _env);
auto _conf_file_details = configFilePaths!()(_manifested, _env);
@@ -259,8 +259,8 @@ static template configReadSiteYAML() {
static template configReadDocYAML() {
import std.file;
import std.path;
- import sisudoc.meta;
- import sisudoc.io_in.paths_source;
+ import sisudoc.ocda.meta;
+ import sisudoc.ocda.io_in.paths_source;
final YAMLDocument configReadDocYAML(M,E)(M _manifested, E _env) {
string _configuration = configReadInDocYAML!()(_manifested, _env);
auto _conf_file_details = configFilePaths!()(_manifested, _env);
diff --git a/src/sisudoc/io_in/read_source_files.d b/src/sisudoc/ocda/io_in/read_source_files.d
index 31cbd37..720ee63 100644
--- a/src/sisudoc/io_in/read_source_files.d
+++ b/src/sisudoc/ocda/io_in/read_source_files.d
@@ -52,16 +52,16 @@
- open markup files<BR>
- if master file scan for addional files to import/insert
+/
-module sisudoc.io_in.read_source_files;
+module sisudoc.ocda.io_in.read_source_files;
@safe:
template spineRawMarkupContent() {
import std.digest.sha;
import std.file;
import std.path;
- import sisudoc.meta;
- import sisudoc.io_in.paths_source;
- import sisudoc.meta.rgx_files;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta;
+ import sisudoc.ocda.io_in.paths_source;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.ocda.meta.rgx;
mixin spineRgxIn;
static auto rgx = RgxI();
mixin spineRgxFiles;
diff --git a/src/sisudoc/io_in/read_zip_pod.d b/src/sisudoc/ocda/io_in/read_zip_pod.d
index d228f4e..322382d 100644
--- a/src/sisudoc/io_in/read_zip_pod.d
+++ b/src/sisudoc/ocda/io_in/read_zip_pod.d
@@ -52,7 +52,7 @@
- extract pod zip archives to temp directory for processing<BR>
- validate zip entries for security (path traversal, size limits)
+/
-module sisudoc.io_in.read_zip_pod;
+module sisudoc.ocda.io_in.read_zip_pod;
@safe:
template spineExtractZipPod() {
import std.algorithm : canFind;
diff --git a/src/sisudoc/meta/conf_make_meta_json.d b/src/sisudoc/ocda/meta/conf_make_meta_json.d
index c996b12..19ae4ba 100644
--- a/src/sisudoc/meta/conf_make_meta_json.d
+++ b/src/sisudoc/ocda/meta/conf_make_meta_json.d
@@ -51,7 +51,7 @@
json headers<BR>
extract json header return json
+/
-module sisudoc.meta.conf_make_meta_json;
+module sisudoc.ocda.meta.conf_make_meta_json;
@safe:
static template contentJSONtoSpineStruct() {
import std.algorithm;
@@ -63,10 +63,10 @@ static template contentJSONtoSpineStruct() {
import std.typecons;
import std.utf;
import std.conv : to;
- import sisudoc.meta.conf_make_meta_structs;
- import sisudoc.meta.conf_make_meta_json;
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.conf_make_meta_structs;
+ import sisudoc.ocda.meta.conf_make_meta_json;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
ConfComposite _struct_composite;
auto contentJSONtoSpineStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) {
mixin spineRgxIn;
diff --git a/src/sisudoc/meta/conf_make_meta_structs.d b/src/sisudoc/ocda/meta/conf_make_meta_structs.d
index 6bfd8fb..e442f9a 100644
--- a/src/sisudoc/meta/conf_make_meta_structs.d
+++ b/src/sisudoc/ocda/meta/conf_make_meta_structs.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta.conf_make_meta_structs;
+module sisudoc.ocda.meta.conf_make_meta_structs;
@safe:
import std.exception;
import std.json;
@@ -58,9 +58,9 @@ import std.string;
import std.typecons;
import std.utf;
import std.conv : to;
-import sisudoc.meta.defaults;
-import sisudoc.meta.rgx_yaml;
-import sisudoc.meta.rgx;
+import sisudoc.ocda.meta.defaults;
+import sisudoc.ocda.meta.rgx_yaml;
+import sisudoc.ocda.meta.rgx;
mixin spineRgxIn;
static auto rgx = RgxI();
mixin spineRgxYamlTags;
diff --git a/src/sisudoc/meta/conf_make_meta_yaml.d b/src/sisudoc/ocda/meta/conf_make_meta_yaml.d
index f4ee7d9..e73a843 100644
--- a/src/sisudoc/meta/conf_make_meta_yaml.d
+++ b/src/sisudoc/ocda/meta/conf_make_meta_yaml.d
@@ -51,7 +51,7 @@
yaml headers<BR>
extract yaml header return struct
+/
-module sisudoc.meta.conf_make_meta_yaml;
+module sisudoc.ocda.meta.conf_make_meta_yaml;
@safe:
template contentYAMLtoSpineStruct() {
import std.algorithm;
@@ -64,10 +64,10 @@ template contentYAMLtoSpineStruct() {
import std.typecons;
import std.utf;
import std.conv : to;
- import sisudoc.meta.conf_make_meta_structs;
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx_yaml;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.conf_make_meta_structs;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx_yaml;
+ import sisudoc.ocda.meta.rgx;
ConfComposite _struct_composite;
@system ConfComposite contentYAMLtoSpineStruct(C,Y,M,O,Cfg)(
C _struct_composite,
@@ -894,8 +894,8 @@ template contentYAMLtoSpineStruct() {
}
template configParseYAMLreturnSpineStruct() {
import dyaml;
- import sisudoc.meta.conf_make_meta_structs;
- import sisudoc.meta.conf_make_meta_json;
+ import sisudoc.ocda.meta.conf_make_meta_structs;
+ import sisudoc.ocda.meta.conf_make_meta_json;
mixin contentYAMLtoSpineStruct;
@system ConfComposite configParseYAMLreturnSpineStruct(T,M,O,Cfg)(
T _document_struct,
@@ -933,10 +933,10 @@ template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
import std.utf;
import std.conv : to;
import dyaml;
- import sisudoc.meta.conf_make_meta_structs;
- import sisudoc.meta.conf_make_meta_json;
- import sisudoc.meta.rgx_yaml;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.conf_make_meta_structs;
+ import sisudoc.ocda.meta.conf_make_meta_json;
+ import sisudoc.ocda.meta.rgx_yaml;
+ import sisudoc.ocda.meta.rgx;
mixin spineRgxIn;
mixin contentJSONtoSpineStruct;
static auto rgx = RgxI();
diff --git a/src/sisudoc/meta/defaults.d b/src/sisudoc/ocda/meta/defaults.d
index 53a791e..91df996 100644
--- a/src/sisudoc/meta/defaults.d
+++ b/src/sisudoc/ocda/meta/defaults.d
@@ -50,7 +50,7 @@
/++
default settings
+/
-module sisudoc.meta.defaults;
+module sisudoc.ocda.meta.defaults;
@safe:
template spineNode() {
static string[string] node_metadata_heading_str() {
diff --git a/src/sisudoc/meta/doc_debugs.d b/src/sisudoc/ocda/meta/doc_debugs.d
index 40a0af5..7ff57d7 100644
--- a/src/sisudoc/meta/doc_debugs.d
+++ b/src/sisudoc/ocda/meta/doc_debugs.d
@@ -50,10 +50,10 @@
/++
output debugs
+/
-module sisudoc.meta.doc_debugs;
+module sisudoc.ocda.meta.doc_debugs;
template spineDebugs() {
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx_files;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx_files;
import std.algorithm;
import std.array;
import std.container;
diff --git a/src/sisudoc/meta/metadoc.d b/src/sisudoc/ocda/meta/metadoc.d
index 1ffaca7..624761c 100644
--- a/src/sisudoc/meta/metadoc.d
+++ b/src/sisudoc/ocda/meta/metadoc.d
@@ -47,23 +47,21 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta.metadoc;
+module sisudoc.ocda.meta.metadoc;
@safe:
template spineAbstraction() {
import std.datetime;
import std.digest.crc;
import std.digest.sha;
- import sisudoc.meta;
- import sisudoc.meta.metadoc_from_src;
- import sisudoc.meta.conf_make_meta_structs;
- import sisudoc.meta.conf_make_meta_json;
- import sisudoc.meta.defaults;
- import sisudoc.io_in.paths_source;
- import sisudoc.io_in.read_config_files;
- import sisudoc.io_in.read_source_files;
- import sisudoc.io_out.hub;
+ import sisudoc.ocda.meta;
+ import sisudoc.ocda.meta.metadoc_from_src;
+ import sisudoc.ocda.meta.conf_make_meta_structs;
+ import sisudoc.ocda.meta.conf_make_meta_json;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.io_in.paths_source;
+ import sisudoc.ocda.io_in.read_config_files;
+ import sisudoc.ocda.io_in.read_source_files;
mixin spineBiblio;
- mixin outputHub;
enum makeMeta { make, meta }
enum docAbst { doc_abstract_obj, doc_has }
@system auto spineAbstraction(E,P,O,Cfg,M)(
@@ -76,7 +74,7 @@ template spineAbstraction() {
){
{ /+ document config/make file +/
auto _config_document_struct = readConfigDoc!()(_manifest, _env);
- import sisudoc.meta.conf_make_meta_yaml;
+ import sisudoc.ocda.meta.conf_make_meta_yaml;
_make_and_meta_struct = _config_document_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifest, _opt_action, _cfg);
}
/+ ↓ read file (filename with path) +/
@@ -105,7 +103,7 @@ template spineAbstraction() {
) {
writeln("step2 commence → (read document header (yaml) return struct) [", _manifest.src.filename, "]");
}
- import sisudoc.meta.conf_make_meta_yaml;
+ import sisudoc.ocda.meta.conf_make_meta_yaml;
_make_and_meta_struct =
docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct!()(
_header_body_insertfilelist_imagelist.header_raw,
diff --git a/src/sisudoc/meta/metadoc_from_src.d b/src/sisudoc/ocda/meta/metadoc_from_src.d
index 4967c1f..bc00c49 100644
--- a/src/sisudoc/meta/metadoc_from_src.d
+++ b/src/sisudoc/ocda/meta/metadoc_from_src.d
@@ -50,7 +50,7 @@
// document abstraction:
// abstraction of sisu markup for downstream processing
// metadoc_from_src.d
-module sisudoc.meta.metadoc_from_src;
+module sisudoc.ocda.meta.metadoc_from_src;
@safe:
template docAbstraction() {
// ↓ abstraction imports
@@ -60,12 +60,12 @@ template docAbstraction() {
import std.file;
import std.json;
import std.path;
- import sisudoc.meta;
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
- import sisudoc.meta.metadoc_object_setter;
- import sisudoc.meta.rgx;
- public import sisudoc.meta.metadoc_from_src_functions;
+ import sisudoc.ocda.meta;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
+ import sisudoc.ocda.meta.metadoc_object_setter;
+ import sisudoc.ocda.meta.rgx;
+ public import sisudoc.ocda.meta.metadoc_from_src_functions;
mixin docAbstractionFunctions;
@system auto docAbstraction(CMM,Opt,Mf) (
char[][] markup_sourcefile_content,
diff --git a/src/sisudoc/meta/metadoc_from_src_functions.d b/src/sisudoc/ocda/meta/metadoc_from_src_functions.d
index e633ca1..f5c9bec 100644
--- a/src/sisudoc/meta/metadoc_from_src_functions.d
+++ b/src/sisudoc/ocda/meta/metadoc_from_src_functions.d
@@ -50,7 +50,7 @@
// document abstraction:
// abstraction of sisu markup for downstream processing
// metadoc_from_src.d
-module sisudoc.meta.metadoc_from_src_functions;
+module sisudoc.ocda.meta.metadoc_from_src_functions;
@safe:
template docAbstractionFunctions() {
// ↓ abstraction imports
@@ -1929,7 +1929,6 @@ template docAbstractionFunctions() {
return ret;
}
// ↑ - table
-
@system ST_flow_block_flag_line_empty flow_block_flag_line_empty_(B,CMM,Ts)(
char[] line,
string[string] an_object,
diff --git a/src/sisudoc/meta/metadoc_object_setter.d b/src/sisudoc/ocda/meta/metadoc_object_setter.d
index 018c51b..c5c8b1b 100644
--- a/src/sisudoc/meta/metadoc_object_setter.d
+++ b/src/sisudoc/ocda/meta/metadoc_object_setter.d
@@ -52,7 +52,7 @@
setting of sisu objects for downstream processing
metadoc_object_setter.d
+/
-module sisudoc.meta.metadoc_object_setter;
+module sisudoc.ocda.meta.metadoc_object_setter;
@safe:
template ObjectSetter() {
/+ structs +/
diff --git a/src/sisudoc/meta/metadoc_show_config.d b/src/sisudoc/ocda/meta/metadoc_show_config.d
index c4be08a..771b916 100644
--- a/src/sisudoc/meta/metadoc_show_config.d
+++ b/src/sisudoc/ocda/meta/metadoc_show_config.d
@@ -47,15 +47,15 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta.metadoc_show_config;
+module sisudoc.ocda.meta.metadoc_show_config;
@safe:
template spineShowSiteConfig() {
void spineShowSiteConfig(O,T)(
O opt_action,
T config,
) {
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
import std.array;
import std.digest.crc;
import std.digest.sha;
@@ -138,8 +138,8 @@ template spineShowSiteConfig() {
}
template spineShowConfig() {
void spineShowConfig(T)(T doc_matters) {
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
import std.array;
import std.digest.crc;
import std.digest.sha;
diff --git a/src/sisudoc/meta/metadoc_show_make.d b/src/sisudoc/ocda/meta/metadoc_show_make.d
index 4001e15..d039e9d 100644
--- a/src/sisudoc/meta/metadoc_show_make.d
+++ b/src/sisudoc/ocda/meta/metadoc_show_make.d
@@ -47,12 +47,12 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta.metadoc_show_make;
+module sisudoc.ocda.meta.metadoc_show_make;
@safe:
template spineShowMake() {
void spineShowMake(T)(T doc_matters) {
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
import std.array;
import std.digest.crc;
import std.digest.sha;
diff --git a/src/sisudoc/meta/metadoc_show_metadata.d b/src/sisudoc/ocda/meta/metadoc_show_metadata.d
index 4159bc3..8b15870 100644
--- a/src/sisudoc/meta/metadoc_show_metadata.d
+++ b/src/sisudoc/ocda/meta/metadoc_show_metadata.d
@@ -47,12 +47,12 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta.metadoc_show_metadata;
+module sisudoc.ocda.meta.metadoc_show_metadata;
@safe:
template spineShowMetaData() {
void spineShowMetaData(T)(T doc_matters) {
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
import std.array;
import std.digest.crc;
import std.digest.sha;
diff --git a/src/sisudoc/meta/metadoc_show_summary.d b/src/sisudoc/ocda/meta/metadoc_show_summary.d
index 037b34a..1c52bfa 100644
--- a/src/sisudoc/meta/metadoc_show_summary.d
+++ b/src/sisudoc/ocda/meta/metadoc_show_summary.d
@@ -47,13 +47,13 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta.metadoc_show_summary;
+module sisudoc.ocda.meta.metadoc_show_summary;
@safe:
template spineMetaDocSummary() {
void spineMetaDocSummary(D)(D doc) {
auto doc_matters = doc.matters;
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
import std.array;
import std.digest.crc;
import std.digest.sha;
diff --git a/src/sisudoc/meta/package.d b/src/sisudoc/ocda/meta/package.d
index 99de2f3..5858f9b 100644
--- a/src/sisudoc/meta/package.d
+++ b/src/sisudoc/ocda/meta/package.d
@@ -47,8 +47,8 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta;
-public import sisudoc.meta.defaults;
+module sisudoc.ocda.meta;
+public import sisudoc.ocda.meta.defaults;
/+ std +/
public import std.array;
public import std.exception;
diff --git a/src/sisudoc/meta/rgx.d b/src/sisudoc/ocda/meta/rgx.d
index db485eb..357df25 100644
--- a/src/sisudoc/meta/rgx.d
+++ b/src/sisudoc/ocda/meta/rgx.d
@@ -50,7 +50,7 @@
/++
regex: regular expressions used in sisu document parser
+/
-module sisudoc.meta.rgx;
+module sisudoc.ocda.meta.rgx;
@safe:
static template spineRgxIn() {
static struct RgxI {
diff --git a/src/sisudoc/meta/rgx_files.d b/src/sisudoc/ocda/meta/rgx_files.d
index abf6e46..b26422f 100644
--- a/src/sisudoc/meta/rgx_files.d
+++ b/src/sisudoc/ocda/meta/rgx_files.d
@@ -50,7 +50,7 @@
/++
regex: regular expressions used in sisu document parser
+/
-module sisudoc.meta.rgx_files;
+module sisudoc.ocda.meta.rgx_files;
@safe:
static template spineRgxFiles() {
static struct RgxFiles {
diff --git a/src/sisudoc/meta/rgx_yaml.d b/src/sisudoc/ocda/meta/rgx_yaml.d
index 2d3c20b..2c7cfbb 100644
--- a/src/sisudoc/meta/rgx_yaml.d
+++ b/src/sisudoc/ocda/meta/rgx_yaml.d
@@ -50,7 +50,7 @@
/++
regex: regular expressions used in sisu document parser
+/
-module sisudoc.meta.rgx_yaml;
+module sisudoc.ocda.meta.rgx_yaml;
@safe:
static template spineRgxYamlTags() {
static struct RgxYaml {
diff --git a/src/sisudoc/ocda/package.d b/src/sisudoc/ocda/package.d
new file mode 100644
index 0000000..7f32dfe
--- /dev/null
+++ b/src/sisudoc/ocda/package.d
@@ -0,0 +1,68 @@
+/+
+- Name: SisuDoc Spine, Doc Reform [a part of]
+ - Description: documents, structuring, processing, publishing, search
+ - static content generator
+
+ - Author: Ralph Amissah
+ [ralph.amissah@gmail.com]
+
+ - Copyright: (C) 2015 (continuously updated, current 2026) Ralph Amissah, All Rights Reserved.
+
+ - License: AGPL 3 or later:
+
+ Spine (SiSU), a framework for document structuring, publishing and
+ search
+
+ Copyright (C) Ralph Amissah
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU AFERO General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see [https://www.gnu.org/licenses/].
+
+ If you have Internet connection, the latest version of the AGPL should be
+ available at these locations:
+ [https://www.fsf.org/licensing/licenses/agpl.html]
+ [https://www.gnu.org/licenses/agpl.html]
+
+ - Spine (by Doc Reform, related to SiSU) uses standard:
+ - docReform markup syntax
+ - standard SiSU markup syntax with modified headers and minor modifications
+ - docReform object numbering
+ - standard SiSU object citation numbering & system
+
+ - Homepages:
+ [https://www.sisudoc.org]
+ [https://www.doc-reform.org]
+
+ - Git
+ [https://git.sisudoc.org/]
+
++/
+/++
+ sisudoc.ocda - canonical entry point of the document-abstraction
+ library.
+
+ Pipeline position: markup -> abstraction -> output. This package is
+ the abstraction stage; the output stage lives in
+ sisudoc.outputs.io_out and consumes the values produced here.
+
+ This file re-exports sisudoc.ocda.abstraction (the documented public
+ API surface) so that consumers can write
+ import sisudoc.ocda;
+ and reach the entry points (spineAbstraction!(), docAbstraction!(),
+ spineAbstractionTxt) without depending on spine's directory layout.
+
+ No logic lives here.
++/
+module sisudoc.ocda;
+@safe:
+public import sisudoc.ocda.abstraction;
diff --git a/src/sisudoc/conf/compile_time_info.d b/src/sisudoc/outputs/conf/compile_time_info.d
index e1ae3cf..d7b2d6c 100644
--- a/src/sisudoc/conf/compile_time_info.d
+++ b/src/sisudoc/outputs/conf/compile_time_info.d
@@ -50,7 +50,7 @@
/++
compile_time_info
+/
-module sisudoc.conf.compile_time_info;
+module sisudoc.outputs.conf.compile_time_info;
@safe:
template CompileTimeInfo() {
version(Windows) {
diff --git a/src/sisudoc/io_out/create_abstraction_db.d b/src/sisudoc/outputs/io_out/create_abstraction_db.d
index 20ca074..0b6b633 100644
--- a/src/sisudoc/io_out/create_abstraction_db.d
+++ b/src/sisudoc/outputs/io_out/create_abstraction_db.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.create_abstraction_db;
+module sisudoc.outputs.io_out.create_abstraction_db;
/+ ↓ write document abstraction as per-document sqlite3 database +/
template spineAbstractionDb() {
@@ -58,7 +58,7 @@ template spineAbstractionDb() {
import std.string;
import std.array;
import d2sqlite3;
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
void spineAbstractionDb(D)(D doc) {
auto doc_abstraction = doc.abstraction;
diff --git a/src/sisudoc/io_out/create_zip_file.d b/src/sisudoc/outputs/io_out/create_zip_file.d
index 4063ab5..d0ace54 100644
--- a/src/sisudoc/io_out/create_zip_file.d
+++ b/src/sisudoc/outputs/io_out/create_zip_file.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.create_zip_file;
+module sisudoc.outputs.io_out.create_zip_file;
@safe:
template createZipFile() {
import std.file;
diff --git a/src/sisudoc/meta/metadoc_curate.d b/src/sisudoc/outputs/io_out/curate/metadoc_curate.d
index 32df377..21307f1 100644
--- a/src/sisudoc/meta/metadoc_curate.d
+++ b/src/sisudoc/outputs/io_out/curate/metadoc_curate.d
@@ -47,15 +47,15 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta.metadoc_curate;
+module sisudoc.outputs.io_out.curate.metadoc_curate;
@safe:
template spineMetaDocCurate() {
auto spineMetaDocCurate(T,H)(
T doc_matters,
H hvst,
) {
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
import std.array;
import std.exception;
import std.regex;
@@ -67,7 +67,7 @@ template spineMetaDocCurate() {
import std.conv : to;
mixin InternalMarkup;
static auto mkup = InlineMarkup();
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto pth_html_abs = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
auto pth_html_rel = spineDocRootTreeHTML!()(doc_matters.src.language);
hvst.curate.title = doc_matters.conf_make_meta.meta.title_full;
diff --git a/src/sisudoc/meta/metadoc_curate_authors.d b/src/sisudoc/outputs/io_out/curate/metadoc_curate_authors.d
index e8d44c4..45b6d0b 100644
--- a/src/sisudoc/meta/metadoc_curate_authors.d
+++ b/src/sisudoc/outputs/io_out/curate/metadoc_curate_authors.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta.metadoc_curate_authors;
+module sisudoc.outputs.io_out.curate.metadoc_curate_authors;
@safe:
import std.algorithm;
import std.array;
@@ -56,8 +56,8 @@ module sisudoc.meta.metadoc_curate_authors;
import std.stdio;
import std.string;
import std.conv : to;
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
mixin spineCurateMetadata;
mixin InternalMarkup;
template spineMetaDocCuratesAuthors() {
@@ -509,7 +509,7 @@ string theme_light_1 = format(q"┃
</body>
</html>
┃") ~ "\n";
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");
try {
auto f = File(out_pth.curate("authors.html"), "w");
diff --git a/src/sisudoc/meta/metadoc_curate_topics.d b/src/sisudoc/outputs/io_out/curate/metadoc_curate_topics.d
index 1873666..99ec48d 100644
--- a/src/sisudoc/meta/metadoc_curate_topics.d
+++ b/src/sisudoc/outputs/io_out/curate/metadoc_curate_topics.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.meta.metadoc_curate_topics;
+module sisudoc.outputs.io_out.curate.metadoc_curate_topics;
@safe:
import std.algorithm;
import std.array;
@@ -56,8 +56,8 @@ module sisudoc.meta.metadoc_curate_topics;
import std.stdio;
import std.string;
import std.conv : to;
- import sisudoc.meta.defaults;
- import sisudoc.meta.rgx;
+ import sisudoc.ocda.meta.defaults;
+ import sisudoc.ocda.meta.rgx;
mixin spineCurateMetadata;
mixin InternalMarkup;
template spineMetaDocCuratesTopics() {
@@ -677,7 +677,7 @@ string theme_light_1 = format(q"┃
</body>
</html>
┃") ~ "\n";
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");
try {
auto f = File(out_pth.curate("topics.html"), "w");
diff --git a/src/sisudoc/io_out/defaults.d b/src/sisudoc/outputs/io_out/defaults.d
index 290ca89..73a9af1 100644
--- a/src/sisudoc/io_out/defaults.d
+++ b/src/sisudoc/outputs/io_out/defaults.d
@@ -50,7 +50,7 @@
/++
default settings
+/
-module sisudoc.io_out.defaults;
+module sisudoc.outputs.io_out.defaults;
@safe:
template InternalMarkup() {
diff --git a/src/sisudoc/io_out/epub3.d b/src/sisudoc/outputs/io_out/epub3.d
index c715630..f3b4cd7 100644
--- a/src/sisudoc/io_out/epub3.d
+++ b/src/sisudoc/outputs/io_out/epub3.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.epub3;
+module sisudoc.outputs.io_out.epub3;
@safe:
template outputEPub3() {
import std.file;
@@ -55,12 +55,12 @@ template outputEPub3() {
import std.uri;
import std.zip;
import std.conv : to;
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.io_out.rgx_xhtml;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.outputs.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin InternalMarkup;
mixin outputXHTMLs;
static auto rgx = RgxO();
@@ -634,7 +634,7 @@ template outputEPub3() {
pth_epub3.base.mkdirRecurse;
}
if (!exists(pth_epub3.base ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_epub3.base ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
diff --git a/src/sisudoc/io_out/html.d b/src/sisudoc/outputs/io_out/html.d
index a294f30..efdedf8 100644
--- a/src/sisudoc/io_out/html.d
+++ b/src/sisudoc/outputs/io_out/html.d
@@ -47,20 +47,20 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.html;
+module sisudoc.outputs.io_out.html;
@safe:
template outputHTML() {
import std.file;
import std.outbuffer;
import std.uri;
import std.conv : to;
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.meta.rgx_files;
- import sisudoc.io_out.rgx_xhtml;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.outputs.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin outputXHTMLs;
void scroll(D)(D doc) {
mixin spineRgxOut;
@@ -248,7 +248,7 @@ template outputHTML() {
}
}
if (!exists(pth_html.base ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_html.base ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -563,7 +563,7 @@ template outputHTML() {
f.writeln(css.html_scroll);
}
if (!exists(pth_html.css ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_html.css ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -599,7 +599,7 @@ template outputHTML() {
}
}
if (!exists(pth_html.image ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_html.image ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
diff --git a/src/sisudoc/io_out/html_snippet.d b/src/sisudoc/outputs/io_out/html_snippet.d
index d02cb28..f960cea 100644
--- a/src/sisudoc/io_out/html_snippet.d
+++ b/src/sisudoc/outputs/io_out/html_snippet.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.html_snippet;
+module sisudoc.outputs.io_out.html_snippet;
@safe:
template htmlSnippet() {
import std.file;
@@ -55,9 +55,9 @@ template htmlSnippet() {
import std.format;
import std.uri;
import std.conv : to;
- import sisudoc.io_out.rgx;
- import sisudoc.meta.rgx_files;
- import sisudoc.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.outputs.io_out.rgx_xhtml;
auto format_html_blank_page_guide_home()(
string css_style,
string home_url,
diff --git a/src/sisudoc/io_out/hub.d b/src/sisudoc/outputs/io_out/hub.d
index 6ca047a..0aab81d 100644
--- a/src/sisudoc/io_out/hub.d
+++ b/src/sisudoc/outputs/io_out/hub.d
@@ -51,14 +51,14 @@
output hub<BR>
check & generate output types requested
+/
-module sisudoc.io_out.hub;
+module sisudoc.outputs.io_out.hub;
@safe:
template outputHub() {
- import sisudoc.io_out,
- sisudoc.io_out.metadata,
- sisudoc.io_out.xmls,
- sisudoc.io_out.create_zip_file,
- sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.metadata;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.paths_output;
@system void outputHub(D)(D doc) {
mixin Msg;
auto msg = Msg!()(doc.matters);
@@ -68,14 +68,14 @@ template outputHub() {
if (sched == outTask.source_or_pod) {
msg.v("spine (doc reform) source processing... ");
if (doc.matters.opt.action.pod) { msg.v("spine (doc reform) source pod processing... "); }
- import sisudoc.io_out.source_pod;
+ import sisudoc.outputs.io_out.source_pod;
spinePod!()(doc.matters);
if (doc.matters.opt.action.source) { msg.vv("spine (doc reform) source done"); }
if (doc.matters.opt.action.pod) { msg.vv("spine (doc reform) source pod done"); }
}
if (sched == outTask.epub) {
msg.v("epub3 processing... ");
- import sisudoc.io_out.epub3;
+ import sisudoc.outputs.io_out.epub3;
doc.outputEPub3!();
msg.vv("epub3 done");
}
@@ -85,25 +85,25 @@ template outputHub() {
}
if (sched == outTask.html_scroll) {
msg.v("html scroll processing... ");
- import sisudoc.io_out.html;
+ import sisudoc.outputs.io_out.html;
outputHTML!().scroll(doc);
msg.vv("html scroll done");
}
if (sched == outTask.html_seg) {
msg.v("html seg processing... ");
- import sisudoc.io_out.html;
+ import sisudoc.outputs.io_out.html;
outputHTML!().seg(doc);
msg.vv("html seg done");
}
if (sched == outTask.html_stuff) {
- import sisudoc.io_out.html;
+ import sisudoc.outputs.io_out.html;
outputHTML!().css(doc.matters);
outputHTML!().images_cp(doc.matters);
msg.vv("html css & images done");
}
if (sched == outTask.latex) {
msg.v("latex processing... (available for downstream processing & pdf output");
- import sisudoc.io_out.latex;
+ import sisudoc.outputs.io_out.latex;
import std.file;
if ((isValidPath(doc.matters.output_path ~ "/latex/sty"))
&& (!(exists(doc.matters.output_path ~ "/latex/sty")))
@@ -120,25 +120,25 @@ template outputHub() {
}
if (sched == outTask.text) {
msg.v("text processing... ");
- import sisudoc.io_out.text;
+ import sisudoc.outputs.io_out.text;
outputText!()(doc.abstraction, doc.matters);
msg.vv("text done");
}
if (sched == outTask.odt) {
msg.v("odf:odt processing... ");
- import sisudoc.io_out.odt;
+ import sisudoc.outputs.io_out.odt;
outputODT!()(doc.abstraction, doc.matters);
msg.vv("odf:odt done");
}
if (sched == outTask.sqlite) {
msg.v("sqlite processing... ");
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
doc.SQLiteHubDiscreteBuildTablesAndPopulate!();
msg.vv("sqlite done");
}
if (sched == outTask.skel) {
msg.v("skel processing... ");
- import sisudoc.io_out.skel;
+ import sisudoc.outputs.io_out.skel;
outputSkel!()(doc.abstraction, doc.matters);
msg.vv("skel done");
}
@@ -156,12 +156,12 @@ template outputHub() {
}
if (doc.matters.opt.action.sqlite_update) {
msg.v("sqlite update processing...");
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
doc.SQLiteHubBuildTablesAndPopulate!();
msg.vv("sqlite update done");
} else if (doc.matters.opt.action.sqlite_delete) {
msg.v("sqlite delete processing...");
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
doc.SQLiteHubBuildTablesAndPopulate!();
msg.vv("sqlite delete done");
}
@@ -169,9 +169,9 @@ template outputHub() {
}
template outputHubInitialize() {
import std.file;
- import sisudoc.io_out,
- sisudoc.io_out.metadata,
- sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.metadata;
+ import sisudoc.outputs.io_out.paths_output;
string _bespoke_homepage = "./spine-bespoke-output/html/homepage.index.html";
@system void outputHubInitialize(O,I)(
O opt_action,
@@ -196,7 +196,7 @@ template outputHubInitialize() {
&& opt_action.output_dir_set.length > 0
&& !(isValidPath(opt_action.output_dir_set ~ "/latex/sty")))
) { // .sty need to be produced only once (if unchanged per output-dir of which there usually will be only one)
- import sisudoc.io_out.latex;
+ import sisudoc.outputs.io_out.latex;
outputLaTeXstyInit!()(
opt_action.output_dir_set,
opt_action.generated_by,
@@ -208,17 +208,17 @@ template outputHubInitialize() {
}
}
template outputHubOp() {
- import sisudoc.io_out,
- sisudoc.io_out.metadata,
- sisudoc.io_out.xmls,
- sisudoc.io_out.create_zip_file,
- sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.metadata;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.paths_output;
@system void outputHubOp(E,O,C)(E env, O opt_action, C config) {
if ((opt_action.sqlite_db_drop)) {
if ((opt_action.vox_gt_2)) {
writeln("sqlite drop db...");
}
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
SQLiteDbDrop!()(opt_action, config);
if ((opt_action.vox_gt_3)) {
writeln("sqlite drop db done");
@@ -229,7 +229,7 @@ template outputHubOp() {
auto pth_sqlite_db = spinePathsSQLite!()(opt_action.cgi_sqlite_search_filename, opt_action.output_dir_set);
writeln("sqlite create table...");
}
- import sisudoc.io_out.sqlite;
+ import sisudoc.outputs.io_out.sqlite;
SQLiteTablesCreate!()(env, opt_action, config);
if ((opt_action.vox_gt_3)) {
writeln("sqlite create table done");
diff --git a/src/sisudoc/io_out/latex.d b/src/sisudoc/outputs/io_out/latex.d
index 39dc932..8e7b37c 100644
--- a/src/sisudoc/io_out/latex.d
+++ b/src/sisudoc/outputs/io_out/latex.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.latex;
+module sisudoc.outputs.io_out.latex;
@safe:
template paperLaTeX() {
import std.format;
@@ -322,9 +322,9 @@ template outputLaTeX() {
import std.outbuffer;
import std.uri;
import std.conv : to;
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.io_out.rgx_latex;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.outputs.io_out.rgx_latex;
mixin spineRgxOut;
static auto rgx = RgxO();
mixin spineRgxLSC;
@@ -679,7 +679,7 @@ template outputLaTeX() {
\pagenumbering{alph}
\setcounter{page}{1}
\markboth{%s}{%s}
-\br\linebreak Copyright {\begin{small}{\copyright\end{small}} %s \br\linebreak
+\br\linebreak Copyright \begin{small}\copyright\end{small} %s \br\linebreak
%s
\clearpage┃";
_txt = format(_tex_para,
@@ -1378,7 +1378,7 @@ template outputLaTeX() {
}
}
if (!exists(pth_latex.latex_path_stuff ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_latex.latex_path_stuff ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -1392,7 +1392,7 @@ template outputLaTeX() {
}
// should be in latex init and done just once, doc_matters not passed there though
if (!exists(pth_latex.base ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_latex.base ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -1404,7 +1404,7 @@ template outputLaTeX() {
));
}
if (!exists(pth_latex.base_sty ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_latex.base_sty ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -1438,7 +1438,7 @@ template outputLaTeX() {
}
}
template outputLaTeXstyInit() {
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
auto paper = paperLaTeX;
void writeOutputLaTeXstyStatic(
string latex_sty,
@@ -1518,7 +1518,7 @@ template outputLaTeXstyStatic() {
\usepackage{multicol}
\setlength{\marginparsep}{4mm}
\setlength{\marginparwidth}{8mm}
-\usepackage[scaled]{dejavu}
+\usepackage{dejavu}
\renewcommand*\familydefault{\sfdefault}
\usepackage{inconsolata}
\usepackage[T1]{fontenc}
@@ -1682,8 +1682,8 @@ template outputLaTeXstyStatic() {
}
\newcommand{\spaces}[1]{{\hspace*{#1ex}}}
\newcommand{\s}{\hspace*{1ex}}
-\renewcommand{\hardspace}{\hspace*{1ex}}
-\newcommand{\-}{\hspace*{1ex}}
+\newcommand{\hardspace}{\hspace*{1ex}}
+\renewcommand{\-}{\hspace*{1ex}}
\newcommand{\caret}{{\^{~}}}
\newcommand{\pipe}{{\textbar}}
\newcommand{\curlyOpen}{{}
diff --git a/src/sisudoc/io_out/metadata.d b/src/sisudoc/outputs/io_out/metadata.d
index 92b3bf9..f951dde 100644
--- a/src/sisudoc/io_out/metadata.d
+++ b/src/sisudoc/outputs/io_out/metadata.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.metadata;
+module sisudoc.outputs.io_out.metadata;
// @safe:
template outputMetadata() {
void outputMetadata(T)(T doc_matters) {
@@ -113,7 +113,7 @@ template outputMetadata() {
import std.digest.sha;
import std.file;
import std.format;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
mixin InternalMarkup;
char[] metadata_;
string theme_dark_0 = format(q"┃
@@ -378,7 +378,7 @@ string theme_light_1 = format(q"┃
}
}
if (!exists(pth_html.base ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_html.base ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -395,7 +395,7 @@ string theme_light_1 = format(q"┃
if (doc_matters.opt.action.vox_gt_1) { writeln(" ", pth_html.fn_scroll("metadata." ~ doc_matters.src.filename)); }
}
static auto mkup = InlineMarkup();
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
if (doc_matters.opt.action.debug_do) {
writeln(doc_matters.src.filename_base);
diff --git a/src/sisudoc/io_out/odt.d b/src/sisudoc/outputs/io_out/odt.d
index 1d0e647..ed288cb 100644
--- a/src/sisudoc/io_out/odt.d
+++ b/src/sisudoc/outputs/io_out/odt.d
@@ -47,20 +47,20 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.odt;
+module sisudoc.outputs.io_out.odt;
@safe:
template formatODT() {
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.outputs.io_out.rgx_xhtml;
import std.file;
import std.outbuffer;
import std.uri;
import std.zip;
import std.conv : to;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin spineRgxOut;
mixin spineRgxXHTML;
struct formatODT {
@@ -642,17 +642,17 @@ template formatODT() {
}
}
template outputODT() {
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.outputs.io_out.rgx_xhtml;
import std.file;
import std.outbuffer;
import std.uri;
import std.zip;
import std.conv : to;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin InternalMarkup;
mixin spineRgxOut;
mixin spineRgxXHTML;
@@ -892,7 +892,7 @@ template outputODT() {
}
return doc_odt;
}
-
+ ;
string odt_tail() {
string _odt_tail = format(q"┃<text:p text:style-name="P_normal">spine: &lt;<text:a xl:type="simple" xl:href="https://www.sisudoc.org">www.sisudoc.org</text:a>&gt; and &lt;<text:a xl:type="simple" xl:href="https://www.sisudoc.org">www.sisudoc.org</text:a>&gt;</text:p>
</office:text></office:body></office:document-content>┃",);
@@ -939,7 +939,7 @@ template outputODT() {
auto ref M doc_matters,
) {
{ /+ (copy odt images) +/
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto pth_odt = spinePathsODT!()(doc_matters);
foreach (image; doc_matters.srcs.image_list) {
auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image;
@@ -979,7 +979,7 @@ template outputODT() {
void dirtree(I)(
I doc_matters,
) {
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto pth_odt = spinePathsODT!()(doc_matters);
if (doc_matters.opt.action.debug_do) { /+ (dir tree) +/
if (!exists(pth_odt.meta_inf_dir("fs"))) {
@@ -993,7 +993,7 @@ template outputODT() {
pth_odt.base_pth.mkdirRecurse;
}
if (!exists(pth_odt.base_pth ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_odt.base_pth ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -2098,7 +2098,7 @@ template outputODT() {
}
}
if (!exists(pth_odt.base_pth ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pth_odt.base_pth ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -2117,7 +2117,6 @@ template outputODT() {
pth_odt.manifest_rdf("fs"); /+ (manifest.rdf) +/
pth_odt.settings_xml("fs"); /+ (settings.xml) +/
pth_odt.styles_xml("fs"); /+ (styles_xml) +/
-
pth_odt.content_xml("fs");
pth_odt.manifest_xml("fs");
pth_odt.meta_xml("fs");
diff --git a/src/sisudoc/io_out/package.d b/src/sisudoc/outputs/io_out/package.d
index e0512dc..489137f 100644
--- a/src/sisudoc/io_out/package.d
+++ b/src/sisudoc/outputs/io_out/package.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out;
+module sisudoc.outputs.io_out;
public import std.algorithm;
public import std.array;
public import std.container;
@@ -61,7 +61,7 @@ public import std.string;
public import std.typecons;
// public import std.uni;
public import std.utf;
-public import sisudoc.share.defaults;
-public import sisudoc.io_in.paths_source;
-public import sisudoc.io_out.defaults;
-public import sisudoc.io_out.paths_output;
+public import sisudoc.outputs.share.defaults;
+public import sisudoc.ocda.io_in.paths_source;
+public import sisudoc.outputs.io_out.defaults;
+public import sisudoc.outputs.io_out.paths_output;
diff --git a/src/sisudoc/io_out/paths_output.d b/src/sisudoc/outputs/io_out/paths_output.d
index a9d0928..3d8323d 100644
--- a/src/sisudoc/io_out/paths_output.d
+++ b/src/sisudoc/outputs/io_out/paths_output.d
@@ -50,13 +50,13 @@
/++
default settings
+/
-module sisudoc.io_out.paths_output;
+module sisudoc.outputs.io_out.paths_output;
@safe:
import std.array;
import std.path;
import std.regex;
import std.stdio;
-import sisudoc.meta.rgx_files;
+import sisudoc.ocda.meta.rgx_files;
template spineOutPaths() {
auto spineOutPaths()(
string output_pth_root,
diff --git a/src/sisudoc/io_out/rgx.d b/src/sisudoc/outputs/io_out/rgx.d
index 384222c..c915076 100644
--- a/src/sisudoc/io_out/rgx.d
+++ b/src/sisudoc/outputs/io_out/rgx.d
@@ -50,7 +50,7 @@
/++
regex: regular expressions used in sisu document parser
+/
-module sisudoc.io_out.rgx;
+module sisudoc.outputs.io_out.rgx;
@safe:
static template spineRgxOut() {
static struct RgxO {
diff --git a/src/sisudoc/io_out/rgx_latex.d b/src/sisudoc/outputs/io_out/rgx_latex.d
index 1ae6147..e40a28e 100644
--- a/src/sisudoc/io_out/rgx_latex.d
+++ b/src/sisudoc/outputs/io_out/rgx_latex.d
@@ -50,7 +50,7 @@
/++
regex: regular expressions used in sisu document parser
+/
-module sisudoc.io_out.rgx_latex;
+module sisudoc.outputs.io_out.rgx_latex;
@safe:
static template spineRgxLSC() {
static struct RgxLSC {
diff --git a/src/sisudoc/io_out/rgx_xhtml.d b/src/sisudoc/outputs/io_out/rgx_xhtml.d
index b1b1004..a2bf192 100644
--- a/src/sisudoc/io_out/rgx_xhtml.d
+++ b/src/sisudoc/outputs/io_out/rgx_xhtml.d
@@ -50,7 +50,7 @@
/++
regex: regular expressions used in sisu document parser
+/
-module sisudoc.io_out.rgx_xhtml;
+module sisudoc.outputs.io_out.rgx_xhtml;
@safe:
static template spineRgxXHTML() {
static struct RgxXHTML {
diff --git a/src/sisudoc/io_out/skel.d b/src/sisudoc/outputs/io_out/skel.d
index 92e0d52..5331da3 100644
--- a/src/sisudoc/io_out/skel.d
+++ b/src/sisudoc/outputs/io_out/skel.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.skel;
+module sisudoc.outputs.io_out.skel;
@safe:
template outputSkel() {
template munge() {
@@ -187,7 +187,7 @@ template outputSkel() {
}
template theDocument() {
import std.stdio;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
// static auto rgx = RgxO();
string skel_head(M)(
M doc_matters,
@@ -232,7 +232,7 @@ template outputSkel() {
M doc_matters,
) {
import std.stdio;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
void skel_out(D,M)(
const D doc_abstraction,
M doc_matters,
diff --git a/src/sisudoc/io_out/source_pod.d b/src/sisudoc/outputs/io_out/source_pod.d
index 138f105..f6c73d6 100644
--- a/src/sisudoc/io_out/source_pod.d
+++ b/src/sisudoc/outputs/io_out/source_pod.d
@@ -47,7 +47,7 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.source_pod;
+module sisudoc.outputs.io_out.source_pod;
@system: // is not @safe: use: @system: or @trusted:
template spinePod() {
import std.digest.sha;
@@ -55,10 +55,10 @@ template spinePod() {
import std.outbuffer;
import std.zip;
import std.conv : to;
- import sisudoc.meta.rgx_files;
- import sisudoc.io_out;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
void spinePod(T)(T doc_matters) {
debug(asserts) {
// static assert(is(typeof(doc_matters) == tuple));
@@ -136,7 +136,7 @@ template spinePod() {
}
}
if (!exists(pths_pod.pod_dir_() ~ "/index.html")) {
- import sisudoc.io_out.html_snippet;
+ import sisudoc.outputs.io_out.html_snippet;
mixin htmlSnippet;
auto f = File(pths_pod.pod_dir_() ~"/index.html", "w");
f.writeln(format_html_blank_page_guide_home(
@@ -195,29 +195,38 @@ template spinePod() {
}
} { // bundle abstraction .ssp file (only for --pod2)
if (doc_matters.opt.action.pod2) {
- import sisudoc.io_out.paths_output;
- auto out_pth = spineOutPaths!()(doc_matters.output_path, doc_matters.src.language);
- string abstraction_dir = ((out_pth.output_base.chainPath("abstraction")).asNormalizedPath).array;
- string ssp_filename = doc_matters.src.doc_uid_out ~ ".ssp";
- string fn_src_in = ((abstraction_dir.chainPath(ssp_filename)).asNormalizedPath).array.to!string;
- auto fn_src_out_pod_zip_base
- = pths_pod.abstraction_root(doc_matters.src.filename).zpod.to!string
- ~ "/" ~ ssp_filename;
- auto fn_src_out_filesystem
- = pths_pod.abstraction_root(doc_matters.src.filename).filesystem_open_zpod.to!string
- ~ "/" ~ ssp_filename;
- if (exists(fn_src_in)) {
- debug(io) { writeln("(io debug) src out found: ", fn_src_in); }
- { // take DIGEST write to pod file digests.txt
- auto data = (cast(byte[]) (fn_src_in).read);
- _digests[doc_matters.src.language]["ssp"] ~= data.sha256Of.toHexString
- ~ "::" ~ data.length.to!string ~ " - " ~ ssp_filename ~ "\n";
- }
- fn_src_in.copy(fn_src_out_filesystem);
- zip = podArchive("file_path_text", fn_src_in, fn_src_out_pod_zip_base, zip);
- } else {
- if (doc_matters.opt.action.debug_do_pod && doc_matters.opt.action.vox_gt_2) {
- writeln("WARNING (io) src out NOT found (abstraction): ", fn_src_in);
+ if (doc_matters.src.language == doc_matters.pod.manifest_list_of_languages[$-1]) { // wait until all language versions of .ssp generated
+ import sisudoc.outputs.io_out.paths_output;
+ /+ doc_uid_out for any language follows the same pattern, differing
+ only in the trailing ".{lng}". Strip the current language to
+ reuse the base across all languages. +/
+ string _doc_uid_base
+ = doc_matters.src.doc_uid_out[0 .. $ - doc_matters.src.lng.length];
+ foreach (_lang; doc_matters.pod.manifest_list_of_languages) { // do for all language versions
+ auto out_pth_lng = spineOutPaths!()(doc_matters.output_path, _lang);
+ string abstraction_dir = ((out_pth_lng.output_base.chainPath("abstraction")).asNormalizedPath).array;
+ string ssp_filename = _doc_uid_base ~ _lang ~ ".ssp";
+ string fn_src_in = ((abstraction_dir.chainPath(ssp_filename)).asNormalizedPath).array.to!string;
+ auto fn_src_out_pod_zip_base
+ = pths_pod.abstraction_root(doc_matters.src.filename).zpod.to!string
+ ~ "/" ~ ssp_filename;
+ auto fn_src_out_filesystem
+ = pths_pod.abstraction_root(doc_matters.src.filename).filesystem_open_zpod.to!string
+ ~ "/" ~ ssp_filename;
+ if (exists(fn_src_in)) {
+ debug(io) { writeln("(io debug) src out found: ", fn_src_in); }
+ { // take DIGEST write to pod file digests.txt
+ auto data = (cast(byte[]) (fn_src_in).read);
+ _digests[_lang]["ssp"] ~= data.sha256Of.toHexString
+ ~ "::" ~ data.length.to!string ~ " - " ~ ssp_filename ~ "\n";
+ }
+ fn_src_in.copy(fn_src_out_filesystem);
+ zip = podArchive("file_path_text", fn_src_in, fn_src_out_pod_zip_base, zip);
+ } else {
+ if (doc_matters.opt.action.debug_do_pod && doc_matters.opt.action.vox_gt_2) {
+ writeln("WARNING (io) src out NOT found (abstraction): ", fn_src_in);
+ }
+ }
}
}
}
@@ -476,7 +485,7 @@ template spinePod() {
}
}
void zipArchiveDigest(M,F,D)(M doc_matters, F fn_pod, D _digests) {
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto pths_pod = spinePathsPods!()(doc_matters);
char[] _zip_digest;
try {
diff --git a/src/sisudoc/io_out/sqlite.d b/src/sisudoc/outputs/io_out/sqlite.d
index b5c0f47..2b0b6d5 100644
--- a/src/sisudoc/io_out/sqlite.d
+++ b/src/sisudoc/outputs/io_out/sqlite.d
@@ -47,10 +47,10 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.sqlite;
-import sisudoc.io_out;
-import sisudoc.io_out.rgx;
-import sisudoc.io_out.rgx_xhtml;
+module sisudoc.outputs.io_out.sqlite;
+import sisudoc.outputs.io_out;
+import sisudoc.outputs.io_out.rgx;
+import sisudoc.outputs.io_out.rgx_xhtml;
import std.file;
import std.uri;
// import std.digest.sha;
@@ -71,7 +71,12 @@ template SQLiteHubBuildTablesAndPopulate() {
} else {
try {
pth_sqlite.base.mkdirRecurse;
- } catch (FileException ex) { }
+ } catch (FileException ex) {
+ stderr.writeln("FATAL: cannot create --sqlite-db-path directory: ", pth_sqlite.base);
+ stderr.writeln(" (", ex.msg, ")");
+ import core.runtime;
+ core.runtime.Runtime.terminate();
+ }
}
template SQLiteDbStatementComposite() {
void SQLiteDbStatementComposite(Db,D)(
@@ -85,7 +90,12 @@ template SQLiteHubBuildTablesAndPopulate() {
} else {
try {
pth_sqlite.base.mkdirRecurse;
- } catch (FileException ex) { }
+ } catch (FileException ex) {
+ stderr.writeln("FATAL: cannot create --sqlite-db-path directory: ", pth_sqlite.base);
+ stderr.writeln(" (", ex.msg, ")");
+ import core.runtime;
+ core.runtime.Runtime.terminate();
+ }
}
_db_statement ~= SQLiteTablesReCreate!()();
SQLiteDbRun!()(db, _db_statement, doc.matters.opt.action, "TABLE RE-CREATE");
@@ -154,7 +164,12 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() {
} else {
try {
pth_sqlite.base.mkdirRecurse;
- } catch (FileException ex) { }
+ } catch (FileException ex) {
+ stderr.writeln("FATAL: cannot create --sqlite-db-path directory: ", pth_sqlite.base);
+ stderr.writeln(" (", ex.msg, ")");
+ import core.runtime;
+ core.runtime.Runtime.terminate();
+ }
}
auto db = Database(pth_sqlite.sqlite_file(doc.matters.src.filename));
template SQLiteDiscreteDbStatementComposite() {
@@ -1671,7 +1686,12 @@ template SQLiteTablesCreate() {
} else {
try {
pth_sqlite.base.mkdirRecurse;
- } catch (FileException ex) { }
+ } catch (FileException ex) {
+ stderr.writeln("FATAL: cannot create --sqlite-db-path directory: ", pth_sqlite.base);
+ stderr.writeln(" (", ex.msg, ")");
+ import core.runtime;
+ core.runtime.Runtime.terminate();
+ }
}
auto db = Database(pth_sqlite.sqlite_file);
{
diff --git a/src/sisudoc/io_out/text.d b/src/sisudoc/outputs/io_out/text.d
index 7c4315a..89e85d9 100644
--- a/src/sisudoc/io_out/text.d
+++ b/src/sisudoc/outputs/io_out/text.d
@@ -47,12 +47,12 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.text;
+module sisudoc.outputs.io_out.text;
@safe:
template outputText() {
template munge() {
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
import std.stdio;
import std.conv;
import std.conv : to;
@@ -352,7 +352,7 @@ template outputText() {
}
template theDocument() {
import std.stdio;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
string text_head(M)(
M doc_matters,
) {
@@ -434,7 +434,7 @@ template outputText() {
M doc_matters,
) {
import std.stdio;
- import sisudoc.io_out;
+ import sisudoc.outputs.io_out;
void text_out(D,M)(
const D doc_abstraction,
M doc_matters,
diff --git a/src/sisudoc/io_out/xmls.d b/src/sisudoc/outputs/io_out/xmls.d
index 7b503dd..d63deba 100644
--- a/src/sisudoc/io_out/xmls.d
+++ b/src/sisudoc/outputs/io_out/xmls.d
@@ -47,20 +47,20 @@
[https://git.sisudoc.org/]
+/
-module sisudoc.io_out.xmls;
+module sisudoc.outputs.io_out.xmls;
@safe:
template outputXHTMLs() {
import std.file;
import std.outbuffer;
import std.uri;
import std.conv : to;
- import sisudoc.io_out;
- import sisudoc.io_out.rgx;
- import sisudoc.meta.rgx_files;
- import sisudoc.io_out.rgx_xhtml;
- import sisudoc.io_out.create_zip_file;
- import sisudoc.io_out.xmls;
- import sisudoc.io_out.xmls_css;
+ import sisudoc.outputs.io_out;
+ import sisudoc.outputs.io_out.rgx;
+ import sisudoc.ocda.meta.rgx_files;
+ import sisudoc.outputs.io_out.rgx_xhtml;
+ import sisudoc.outputs.io_out.create_zip_file;
+ import sisudoc.outputs.io_out.xmls;
+ import sisudoc.outputs.io_out.xmls_css;
mixin spineRgxOut;
mixin spineRgxXHTML;
struct outputXHTMLs {
diff --git a/src/sisudoc/io_out/xmls_css.d b/src/sisudoc/outputs/io_out/xmls_css.d
index 2f5c2b1..655b236 100644
--- a/src/sisudoc/io_out/xmls_css.d
+++ b/src/sisudoc/outputs/io_out/xmls_css.d
@@ -50,7 +50,7 @@
/++
default css settings
+/
-module sisudoc.io_out.xmls_css;
+module sisudoc.outputs.io_out.xmls_css;
@safe:
template spineCss() {
import std.format;
@@ -1217,6 +1217,56 @@ p.form {
footer {
background-color : #00704E;
}
+/* ------------------------------------------------------------------ */
+/* Homepage / body-flow HTML5 markup */
+/* <ul>/<li> and <details>/<summary> aligned with <p> and headings. */
+/* Scoped to direct body children to avoid affecting div.toc lists. */
+/* ------------------------------------------------------------------ */
+body > ul,
+body > ol {
+ margin-left : 5%%;
+ margin-right : 2em;
+ margin-top : 0.8em;
+ margin-bottom : 0.8em;
+ padding-left : 1.5em;
+ list-style-position : outside;
+}
+body > ul { list-style-type : disc; }
+body > ol { list-style-type : decimal; }
+body > ul li,
+body > ol li {
+ margin-left : 0;
+ margin-right : 0;
+ margin-top : 0.3em;
+ margin-bottom : 0.3em;
+ line-height : 133%%;
+ background : none;
+ text-align : left;
+ text-indent : 0;
+}
+details {
+ margin-top : 1em;
+ margin-bottom : 0.5em;
+}
+summary {
+ margin-left : 5%%;
+ margin-right : 2em;
+ padding-left : 0.2em;
+ padding-top : 0.4em;
+ padding-bottom : 0.4em;
+ font-size : 1.6rem;
+ line-height : 133%%;
+ cursor : pointer;
+}
+details > ul,
+details > ol {
+ margin-left : 5%%;
+ padding-left : 1.5em;
+}
+details > ul li,
+details > ol li {
+ margin-left : 0;
+}
┃",
_color_ocn_light,
_css_indent,
@@ -1957,6 +2007,56 @@ p.form {
footer {
background-color : #FF704E;
}
+/* ------------------------------------------------------------------ */
+/* Homepage / body-flow HTML5 markup */
+/* <ul>/<li> and <details>/<summary> aligned with <p> and headings. */
+/* Scoped to direct body children to avoid affecting div.toc lists. */
+/* ------------------------------------------------------------------ */
+body > ul,
+body > ol {
+ margin-left : 5%%;
+ margin-right : 2em;
+ margin-top : 0.8em;
+ margin-bottom : 0.8em;
+ padding-left : 1.5em;
+ list-style-position : outside;
+}
+body > ul { list-style-type : disc; }
+body > ol { list-style-type : decimal; }
+body > ul li,
+body > ol li {
+ margin-left : 0;
+ margin-right : 0;
+ margin-top : 0.3em;
+ margin-bottom : 0.3em;
+ line-height : 133%%;
+ background : none;
+ text-align : left;
+ text-indent : 0;
+}
+details {
+ margin-top : 1em;
+ margin-bottom : 0.5em;
+}
+summary {
+ margin-left : 5%%;
+ margin-right : 2em;
+ padding-left : 0.2em;
+ padding-top : 0.4em;
+ padding-bottom : 0.4em;
+ font-size : 1.6rem;
+ line-height : 133%%;
+ cursor : pointer;
+}
+details > ul,
+details > ol {
+ margin-left : 5%%;
+ padding-left : 1.5em;
+}
+details > ul li,
+details > ol li {
+ margin-left : 0;
+}
┃",
_color_ocn_dark,
_css_indent,
@@ -2634,6 +2734,56 @@ p.form {
footer {
background-color : #00704E;
}
+/* ------------------------------------------------------------------ */
+/* Homepage / body-flow HTML5 markup */
+/* <ul>/<li> and <details>/<summary> aligned with <p> and headings. */
+/* Scoped to direct body children to avoid affecting div.toc lists. */
+/* ------------------------------------------------------------------ */
+body > ul,
+body > ol {
+ margin-left : 5%%;
+ margin-right : 2em;
+ margin-top : 0.8em;
+ margin-bottom : 0.8em;
+ padding-left : 1.5em;
+ list-style-position : outside;
+}
+body > ul { list-style-type : disc; }
+body > ol { list-style-type : decimal; }
+body > ul li,
+body > ol li {
+ margin-left : 0;
+ margin-right : 0;
+ margin-top : 0.3em;
+ margin-bottom : 0.3em;
+ line-height : 133%%;
+ background : none;
+ text-align : left;
+ text-indent : 0;
+}
+details {
+ margin-top : 1em;
+ margin-bottom : 0.5em;
+}
+summary {
+ margin-left : 5%%;
+ margin-right : 2em;
+ padding-left : 0.2em;
+ padding-top : 0.4em;
+ padding-bottom : 0.4em;
+ font-size : 1.6rem;
+ line-height : 133%%;
+ cursor : pointer;
+}
+details > ul,
+details > ol {
+ margin-left : 5%%;
+ padding-left : 1.5em;
+}
+details > ul li,
+details > ol li {
+ margin-left : 0;
+}
┃",
_color_ocn_light,
_css_indent,
@@ -3300,6 +3450,56 @@ p.form {
footer {
background-color : #FF704E;
}
+/* ------------------------------------------------------------------ */
+/* Homepage / body-flow HTML5 markup */
+/* <ul>/<li> and <details>/<summary> aligned with <p> and headings. */
+/* Scoped to direct body children to avoid affecting div.toc lists. */
+/* ------------------------------------------------------------------ */
+body > ul,
+body > ol {
+ margin-left : 5%%;
+ margin-right : 2em;
+ margin-top : 0.8em;
+ margin-bottom : 0.8em;
+ padding-left : 1.5em;
+ list-style-position : outside;
+}
+body > ul { list-style-type : disc; }
+body > ol { list-style-type : decimal; }
+body > ul li,
+body > ol li {
+ margin-left : 0;
+ margin-right : 0;
+ margin-top : 0.3em;
+ margin-bottom : 0.3em;
+ line-height : 133%%;
+ background : none;
+ text-align : left;
+ text-indent : 0;
+}
+details {
+ margin-top : 1em;
+ margin-bottom : 0.5em;
+}
+summary {
+ margin-left : 5%%;
+ margin-right : 2em;
+ padding-left : 0.2em;
+ padding-top : 0.4em;
+ padding-bottom : 0.4em;
+ font-size : 1.6rem;
+ line-height : 133%%;
+ cursor : pointer;
+}
+details > ul,
+details > ol {
+ margin-left : 5%%;
+ padding-left : 1.5em;
+}
+details > ul li,
+details > ol li {
+ margin-left : 0;
+}
┃",
_color_ocn_dark,
_css_indent,
diff --git a/src/sisudoc/share/defaults.d b/src/sisudoc/outputs/share/defaults.d
index 4972992..d61a038 100644
--- a/src/sisudoc/share/defaults.d
+++ b/src/sisudoc/outputs/share/defaults.d
@@ -50,7 +50,7 @@
/++
shared default settings
+/
-module sisudoc.share.defaults;
+module sisudoc.outputs.share.defaults;
@safe:
template Msg() {
import std.stdio;
diff --git a/src/sisudoc/spine.d b/src/sisudoc/spine.d
index e710281..c80814e 100755..100644
--- a/src/sisudoc/spine.d
+++ b/src/sisudoc/spine.d
@@ -60,25 +60,25 @@ import std.getopt;
import std.file;
import std.path;
import std.process;
-import sisudoc.conf.compile_time_info;
-import sisudoc.meta;
-import sisudoc.meta.metadoc;
-import sisudoc.meta.metadoc_curate;
-import sisudoc.meta.metadoc_curate_authors;
-import sisudoc.meta.metadoc_curate_topics;
-import sisudoc.meta.metadoc_from_src;
-import sisudoc.meta.conf_make_meta_structs;
-import sisudoc.meta.conf_make_meta_json;
-import sisudoc.meta.defaults;
-import sisudoc.meta.doc_debugs;
-import sisudoc.meta.rgx;
-import sisudoc.meta.rgx_yaml;
-import sisudoc.meta.rgx_files;
-import sisudoc.io_in.paths_source;
-import sisudoc.io_in.read_config_files;
-import sisudoc.io_in.read_source_files;
-import sisudoc.io_in.read_zip_pod;
-import sisudoc.io_out.hub;
+import sisudoc.outputs.conf.compile_time_info;
+import sisudoc.ocda.meta;
+import sisudoc.ocda.meta.metadoc;
+import sisudoc.outputs.io_out.curate.metadoc_curate;
+import sisudoc.outputs.io_out.curate.metadoc_curate_authors;
+import sisudoc.outputs.io_out.curate.metadoc_curate_topics;
+import sisudoc.ocda.meta.metadoc_from_src;
+import sisudoc.ocda.meta.conf_make_meta_structs;
+import sisudoc.ocda.meta.conf_make_meta_json;
+import sisudoc.ocda.meta.defaults;
+import sisudoc.ocda.meta.doc_debugs;
+import sisudoc.ocda.meta.rgx;
+import sisudoc.ocda.meta.rgx_yaml;
+import sisudoc.ocda.meta.rgx_files;
+import sisudoc.ocda.io_in.paths_source;
+import sisudoc.ocda.io_in.read_config_files;
+import sisudoc.ocda.io_in.read_source_files;
+import sisudoc.ocda.io_in.read_zip_pod;
+import sisudoc.outputs.io_out.hub;
mixin(import("version.txt"));
mixin(import("configuration.txt"));
mixin CompileTimeInfo;
@@ -920,7 +920,7 @@ string program_name = "spine";
{ /+ local site config +/
_conf_file_details = configFilePaths!()(_manifested, _env, _opt_action.config_path_set);
auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg);
- import sisudoc.meta.conf_make_meta_yaml;
+ import sisudoc.ocda.meta.conf_make_meta_yaml;
_siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action, _cfg); // - get local site config
break;
}
@@ -928,11 +928,11 @@ string program_name = "spine";
}
} else { /+ local site config +/
auto _config_local_site_struct = readConfigSite!()(_conf_file_details, _opt_action, _cfg);
- import sisudoc.meta.conf_make_meta_yaml;
+ import sisudoc.ocda.meta.conf_make_meta_yaml;
_siteConfig = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_siteConfig, _manifested, _opt_action, _cfg); // - get local site config
}
if (_opt_action.show_config) {
- import sisudoc.meta.metadoc_show_config;
+ import sisudoc.ocda.meta.metadoc_show_config;
spineShowSiteConfig!()(_opt_action, _siteConfig);
}
if (!(_opt_action.skip_output)) {
@@ -1306,32 +1306,32 @@ string program_name = "spine";
}
/+ ↓ debugs +/
if (doc.matters.opt.action.show_summary) {
- import sisudoc.meta.metadoc_show_summary;
+ import sisudoc.ocda.meta.metadoc_show_summary;
spineMetaDocSummary!()(doc);
}
/+ ↓ debugs +/
if (doc.matters.opt.action.show_metadata) {
- import sisudoc.meta.metadoc_show_metadata;
+ import sisudoc.ocda.meta.metadoc_show_metadata;
spineShowMetaData!()(doc.matters);
}
/+ ↓ debugs +/
if (doc.matters.opt.action.show_make) {
- import sisudoc.meta.metadoc_show_make;
+ import sisudoc.ocda.meta.metadoc_show_make;
spineShowMake!()(doc.matters);
}
/+ ↓ debugs +/
if (doc.matters.opt.action.show_config) {
- import sisudoc.meta.metadoc_show_config;
+ import sisudoc.ocda.meta.metadoc_show_config;
spineShowConfig!()(doc.matters);
}
/+ ↓ document abstraction text representation +/
if (doc.matters.opt.action.show_abstraction) {
- import sisudoc.io_out.create_abstraction_txt;
+ import sisudoc.ocda.abstraction.ssp;
spineAbstractionTxt!()(doc);
}
/+ ↓ document abstraction sqlite database +/
if (doc.matters.opt.action.show_abstraction_db) {
- import sisudoc.io_out.create_abstraction_db;
+ import sisudoc.outputs.io_out.create_abstraction_db;
spineAbstractionDb!()(doc);
}
if (doc.matters.opt.action.curate) {
@@ -1415,32 +1415,32 @@ string program_name = "spine";
}
/+ ↓ debugs +/
if (doc.matters.opt.action.show_summary) {
- import sisudoc.meta.metadoc_show_summary;
+ import sisudoc.ocda.meta.metadoc_show_summary;
spineMetaDocSummary!()(doc);
}
/+ ↓ debugs +/
if (doc.matters.opt.action.show_metadata) {
- import sisudoc.meta.metadoc_show_metadata;
+ import sisudoc.ocda.meta.metadoc_show_metadata;
spineShowMetaData!()(doc.matters);
}
/+ ↓ debugs +/
if (doc.matters.opt.action.show_make) {
- import sisudoc.meta.metadoc_show_make;
+ import sisudoc.ocda.meta.metadoc_show_make;
spineShowMake!()(doc.matters);
}
/+ ↓ debugs +/
if (doc.matters.opt.action.show_config) {
- import sisudoc.meta.metadoc_show_config;
+ import sisudoc.ocda.meta.metadoc_show_config;
spineShowConfig!()(doc.matters);
}
/+ ↓ document abstraction text representation +/
if (doc.matters.opt.action.show_abstraction) {
- import sisudoc.io_out.create_abstraction_txt;
+ import sisudoc.ocda.abstraction.ssp;
spineAbstractionTxt!()(doc);
}
/+ ↓ document abstraction sqlite database +/
if (doc.matters.opt.action.show_abstraction_db) {
- import sisudoc.io_out.create_abstraction_db;
+ import sisudoc.outputs.io_out.create_abstraction_db;
spineAbstractionDb!()(doc);
}
if (doc.matters.opt.action.curate) {
@@ -1499,7 +1499,7 @@ string program_name = "spine";
spineMetaDocCuratesAuthors!()(hvst.curates, _make_and_meta_struct, _opt_action);
}
if (_opt_action.vox_gt_1) {
- import sisudoc.io_out.paths_output;
+ import sisudoc.outputs.io_out.paths_output;
auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");
if (_opt_action.curate_authors) {
writeln("- ", out_pth.curate("authors.html"));