diff options
Diffstat (limited to 'src/doc_reform/spine.d')
-rwxr-xr-x | src/doc_reform/spine.d | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d index 752d3ee..0893572 100755 --- a/src/doc_reform/spine.d +++ b/src/doc_reform/spine.d @@ -66,9 +66,9 @@ import doc_reform.conf.compile_time_info, doc_reform.meta, doc_reform.meta.metadoc, - doc_reform.meta.metadoc_harvest, - doc_reform.meta.metadoc_harvests_authors, - doc_reform.meta.metadoc_harvests_topics, + doc_reform.meta.metadoc_curate, + doc_reform.meta.metadoc_curate_authors, + doc_reform.meta.metadoc_curate_topics, doc_reform.meta.metadoc_from_src, doc_reform.meta.conf_make_meta_structs, doc_reform.meta.conf_make_meta_json, @@ -88,7 +88,7 @@ string program_name = "spine"; mixin spineRgxIn; mixin spineBiblio; mixin outputHub; - auto hvst = spineHarvest!(); + auto hvst = spineCurateMetadata!(); string flag_action; string arg_unrecognized; enum dAM { abstraction, matters } @@ -119,11 +119,11 @@ string program_name = "spine"; "debug" : false, "digest" : false, "epub" : false, - "harvest" : false, - "harvest-authors" : false, - "harvest-topics" : false, + "curate" : false, + "curate-authors" : false, + "curate-topics" : false, "html" : false, - "html-link-harvest" : false, + "html-link-curate" : false, "html-link-search" : false, "html-seg" : false, "html-scroll" : false, @@ -202,16 +202,16 @@ string program_name = "spine"; "cgi-url-action", "url to post to cgi-bin search form", &settings["cgi-url-action"], "cgi-search-title", "title for cgi-bin search form", &settings["cgi-search-title"], "concordance", "file for document", &opts["concordance"], + "curate", "extract info on authors & topics from document header metadata", &opts["curate"], + "curate-authors", "extract info on authors from document header metadata", &opts["curate-authors"], + "curate-topics", "extract info on topics from document header metadata", &opts["curate-topics"], "dark", "alternative dark theme", &opts["dark"], "debug", "debug", &opts["debug"], "digest", "hash digest for each object", &opts["digest"], "epub", "process epub output", &opts["epub"], - "harvest", "extract info on authors & topics from document header metadata", &opts["harvest"], - "harvest-authors", "extract info on authors from document header metadata", &opts["harvest-authors"], - "harvest-topics", "extract info on topics from document header metadata", &opts["harvest-topics"], "hide-ocn", "object cite numbers", &opts["hide-ocn"], "html", "process html output", &opts["html"], - "html-link-harvest", "place links back to harvest in segmented html", &opts["html-link-harvest"], + "html-link-curate", "place links back to curate in segmented html", &opts["html-link-curate"], "html-link-search", "html embedded search submission", &opts["html-link-search"], "html-seg", "process html output", &opts["html-seg"], "html-scroll", "process html output", &opts["html-scroll"], @@ -314,20 +314,20 @@ string program_name = "spine"; @trusted bool epub() { return opts["epub"]; } - @trusted bool html_harvest_link() { - return (opts["html-link-harvest"]) ? true : false; + @trusted bool html_curate_link() { + return (opts["html-link-curate"]) ? true : false; } @trusted bool html_search_link() { return (opts["html-link-search"]) ? true : false; } - @trusted bool harvest() { - return (opts["harvest"] || opts["harvest-authors"] || opts["harvest-topics"]) ? true : false; + @trusted bool curate() { + return (opts["curate"] || opts["curate-authors"] || opts["curate-topics"]) ? true : false; } - @trusted bool harvest_authors() { - return (opts["harvest"] || opts["harvest-authors"]) ? true : false; + @trusted bool curate_authors() { + return (opts["curate"] || opts["curate-authors"]) ? true : false; } - @trusted bool harvest_topics() { - return (opts["harvest"] || opts["harvest-topics"]) ? true : false; + @trusted bool curate_topics() { + return (opts["curate"] || opts["curate-topics"]) ? true : false; } @trusted bool html() { return (opts["html"] || opts["html-seg"] || opts["html-scroll"]) ? true : false; @@ -520,7 +520,7 @@ string program_name = "spine"; } else if ( opts["abstraction"] || concordance - || harvest + || curate || html || epub || odt @@ -569,7 +569,7 @@ string program_name = "spine"; opts["abstraction"] || concordance || source_or_pod - || harvest + || curate || html || epub || odt @@ -584,7 +584,7 @@ string program_name = "spine"; return ( opts["abstraction"] || epub - || harvest + || curate || html || html_seg || html_scroll @@ -604,7 +604,7 @@ string program_name = "spine"; @trusted bool meta_processing_general() { return ( opts["abstraction"] - || harvest + || curate || html || epub || odt @@ -921,18 +921,18 @@ string program_name = "spine"; import doc_reform.meta.metadoc_show_config; spineShowConfig!()(doc_matters); } - if (doc_matters.opt.action.harvest) { - auto _hvst = spineMetaDocHarvest!()(doc_matters, hvst); + if (doc_matters.opt.action.curate) { + auto _hvst = spineMetaDocCurate!()(doc_matters, hvst); if ( _hvst.title.length > 0 && _hvst.author_surname_fn.length > 0 ) { - hvst.harvests ~= _hvst; + hvst.curates ~= _hvst; } else { if ((doc_matters.opt.action.debug_do) || (doc_matters.opt.action.very_verbose) ) { - writeln("WARNING harvest: document header yaml does not contain information related to: title or author: ", _hvst.path_html_segtoc); + writeln("WARNING curate: document header yaml does not contain information related to: title or author: ", _hvst.path_html_segtoc); } } } @@ -1035,18 +1035,18 @@ string program_name = "spine"; import doc_reform.meta.metadoc_show_config; spineShowConfig!()(doc_matters); } - if (doc_matters.opt.action.harvest) { - auto _hvst = spineMetaDocHarvest!()(doc_matters, hvst); + if (doc_matters.opt.action.curate) { + auto _hvst = spineMetaDocCurate!()(doc_matters, hvst); if ( _hvst.title.length > 0 && _hvst.author_surname_fn.length > 0 ) { - hvst.harvests ~= _hvst; + hvst.curates ~= _hvst; } else { if ((doc_matters.opt.action.debug_do) || (doc_matters.opt.action.very_verbose) ) { - writeln("WARNING harvest: document header yaml does not contain information related to: title or author: ", _hvst.path_html_segtoc); + writeln("WARNING curate: document header yaml does not contain information related to: title or author: ", _hvst.path_html_segtoc); } } } @@ -1086,21 +1086,21 @@ string program_name = "spine"; } } } - if (hvst.harvests.length > 0) { - if (_opt_action.harvest_topics) { - spineMetaDocHarvestsTopics!()(hvst, _make_and_meta_struct, _opt_action); + if (hvst.curates.length > 0) { + if (_opt_action.curate_topics) { + spineMetaDocCuratesTopics!()(hvst, _make_and_meta_struct, _opt_action); } - if (_opt_action.harvest_authors) { - spineMetaDocHarvestsAuthors!()(hvst.harvests, _make_and_meta_struct, _opt_action); + if (_opt_action.curate_authors) { + spineMetaDocCuratesAuthors!()(hvst.curates, _make_and_meta_struct, _opt_action); } if (!(_opt_action.quiet)) { import doc_reform.io_out.paths_output; auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, ""); - if (_opt_action.harvest_authors) { - writeln("- ", out_pth.harvest("authors.html")); + if (_opt_action.curate_authors) { + writeln("- ", out_pth.curate("authors.html")); } - if (_opt_action.harvest_topics) { - writeln("- ", out_pth.harvest("topics.html")); + if (_opt_action.curate_topics) { + writeln("- ", out_pth.curate("topics.html")); } } } else { writeln("NO HARVESTS"); } |