diff options
Diffstat (limited to 'src/doc_reform')
| -rw-r--r-- | src/doc_reform/io_out/metadata.d | 28 | ||||
| -rw-r--r-- | src/doc_reform/io_out/paths_output.d | 8 | ||||
| -rw-r--r-- | src/doc_reform/io_out/xmls.d | 2 | ||||
| -rw-r--r-- | src/doc_reform/meta/defaults.d | 16 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_curate.d (renamed from src/doc_reform/meta/metadoc_harvest.d) | 38 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_curate_authors.d (renamed from src/doc_reform/meta/metadoc_harvests_authors.d) | 82 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_curate_topics.d (renamed from src/doc_reform/meta/metadoc_harvests_topics.d) | 48 | ||||
| -rwxr-xr-x | src/doc_reform/spine.d | 82 | 
8 files changed, 152 insertions, 152 deletions
| diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d index 58d8b33..89e82bd 100644 --- a/src/doc_reform/io_out/metadata.d +++ b/src/doc_reform/io_out/metadata.d @@ -163,26 +163,26 @@ string theme_dark_1 = format(q"┃  string theme_light_1 = format(q"┃    h1 {      color                    : #FFFFFF; -    background               : #000088; +    background               : #1A3A7A;    }    p.letter {      color                    : #FFFFFF; -    background               : #880000; +    background               : #1A3A7A;    }  ┃");        metadata_ ~= format(q"┃<!DOCTYPE html>  <html>  <head>  <meta charset="utf-8"> -<title>Metadata Harvest - Topics</title> +<title>Curated metadata - Topics</title>  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="dc.title" content= "metadata harvest, Authors & Topics - information Structuring Universe, Structured information Serialised Units" /> +<meta name="dc.title" content= "metadata curate, Authors & Topics - information Structuring Universe, Structured information Serialised Units" />  <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />  <meta name="generator" content="spine" />  <link rel="generator" href="https://sisudoc.org" /> -<link href="./css/harvest.css" rel="stylesheet"> +<link href="./css/curate.css" rel="stylesheet">  <style TYPE="text/css"> -/* spine harvest css default stylesheet */%s +/* spine curate css default stylesheet */%s    .norm, .bold {      line-height              : 150%%;      margin-left              : 1em; @@ -351,8 +351,8 @@ string theme_light_1 = format(q"┃      <a name="start" id="start"></a>      ┃");      metadata_ ~= "<div class=\"flex-menu-bar\"><div class=\"flex-menu-option\">"; -    if (doc_matters.opt.action.html_harvest_link) { -      metadata_ ~= format(q"┃<p>[<a href="../../index.html"> HOME </a>] Metadata Harvest +    if (doc_matters.opt.action.html_curate_link) { +      metadata_ ~= format(q"┃<p>[<a href="../../index.html"> HOME </a>] Curated metadata         [<a href="../../authors.html"> Authors </a>]         [<a href="../../topics.html"> Topics </a>]</p>      ┃"); @@ -367,7 +367,7 @@ string theme_light_1 = format(q"┃        writeln("ERROR no Title information provided in document header ", doc_matters.src.filename_base);      }      if (!(doc_matters.conf_make_meta.meta.creator_author.empty)) { -      if (doc_matters.opt.action.html_harvest_link) { +      if (doc_matters.opt.action.html_curate_link) {          metadata_ ~= "<p class=\"lev1\">Author: <b><a href=\"../../authors.html#" ~ doc_matters.conf_make_meta.meta.creator_author_surname.translate([' ' : "_"]) ~ "\">"                                                     ~ doc_matters.conf_make_meta.meta.creator_author   ~ "</a></b></p>";        } else { @@ -412,7 +412,7 @@ string theme_light_1 = format(q"┃          if (subject_tree.length > 0) {            if (subject_tree[0] != _top[0]) {              _top[0] = subject_tree[0]; -            if (doc_matters.opt.action.html_harvest_link) { +            if (doc_matters.opt.action.html_curate_link) {                metadata_ ~=                  "<p class=\"lev1\"><a href=\"../../topics.html#"                    ~ subject_tree[0].translate([' ' : "_"]) ~ "\">" @@ -427,7 +427,7 @@ string theme_light_1 = format(q"┃              if (subject_tree[1] != _top[1]) {                _top[1] = subject_tree[1];                _top[2] = ""; _top[3] = ""; _top[4] = ""; -              if (doc_matters.opt.action.html_harvest_link) { +              if (doc_matters.opt.action.html_curate_link) {                  metadata_ ~=                    "<p class=\"lev2\"><a href=\"../../topics.html#"                      ~ subject_tree[0].translate([' ' : "_"]) ~ "." @@ -443,7 +443,7 @@ string theme_light_1 = format(q"┃                if (subject_tree[2] != _top[2]) {                  _top[2] = subject_tree[2];                  _top[3] = ""; _top[4] = ""; -                if (doc_matters.opt.action.html_harvest_link) { +                if (doc_matters.opt.action.html_curate_link) {                    metadata_ ~=                      "<p class=\"lev3\"><a href=\"../../topics.html#"                        ~ subject_tree[0].translate([' ' : "_"]) ~ "." @@ -460,7 +460,7 @@ string theme_light_1 = format(q"┃                  if (subject_tree[3] != _top[3]) {                    _top[3] = subject_tree[3];                    _top[4] = ""; -                  if (doc_matters.opt.action.html_harvest_link) { +                  if (doc_matters.opt.action.html_curate_link) {                      metadata_ ~=                        "<p class=\"lev4\"><a href=\"../../topics.html#"                          ~ subject_tree[0].translate([' ' : "_"]) ~ "." @@ -477,7 +477,7 @@ string theme_light_1 = format(q"┃                  if (subject_tree.length > 4) {                    if (subject_tree[4] != _top[4]) {                      _top[4] = subject_tree[4]; -                    if (doc_matters.opt.action.html_harvest_link) { +                    if (doc_matters.opt.action.html_curate_link) {                        metadata_ ~=                          "<p class=\"lev5\"><a href=\"../../topics.html#"                            ~ subject_tree[0].translate([' ' : "_"]) ~ "." diff --git a/src/doc_reform/io_out/paths_output.d b/src/doc_reform/io_out/paths_output.d index 86f418a..2fe7c50 100644 --- a/src/doc_reform/io_out/paths_output.d +++ b/src/doc_reform/io_out/paths_output.d @@ -222,8 +222,8 @@ template spinePathsHTML() {        string doc_root() {          return ((output_path_root.chainPath(doc_tree.doc_root)).asNormalizedPath).array;        } -      string harvest(string fn_harvest) { -        return doc_root ~ "/" ~ fn_harvest; +      string curate(string fn_curate) { +        return doc_root ~ "/" ~ fn_curate;        }        string internal_base() {          return ((doc_tree.base).asNormalizedPath).array; @@ -283,10 +283,10 @@ template spineUrlsHTML() {        string doc_root() {          return url_doc_root ~ ((doc_tree.doc_root).asNormalizedPath).array;        } -      string harvest(string fn_harvest) { +      string curate(string fn_curate) {          return format(q"┃%s/%s┃",            doc_root, -          fn_harvest, +          fn_curate,          );        }        string base() { diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index ab80a09..3857969 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -236,7 +236,7 @@ template outputXHTMLs() {        string type,      ) {        string o; -      string metadata_links = ((doc_matters.opt.action.html_harvest_link) +      string metadata_links = ((doc_matters.opt.action.html_curate_link)          ? format(q"┃<p class="tiny">[<a href="%smetadata.%s.html"> m </a>|<a href="%s../../authors.html"> A </a>|<a href="%s../../topics.html"> T </a>]</p>┃",              (type == "seg") ? "../" : "",              doc_matters.src.filename_base, diff --git a/src/doc_reform/meta/defaults.d b/src/doc_reform/meta/defaults.d index 4429f80..ec6ba49 100644 --- a/src/doc_reform/meta/defaults.d +++ b/src/doc_reform/meta/defaults.d @@ -95,10 +95,10 @@ template spineNode() {      return _node;    }  } -template spineHarvest() { -  @safe auto spineHarvest() { -    struct _Harvest { -      struct Harvest { +template spineCurateMetadata() { +  @safe auto spineCurateMetadata() { +    struct _Curate { +      struct Curate {          string   title                = "";          string[] author_arr           = [];          string   author               = ""; @@ -120,11 +120,11 @@ template spineHarvest() {          string   url_html_scroll      = "";          string   url_epub             = "";        } -      Harvest harvest; -      Harvest[] harvests; -      Harvest[][string][string][string][string] subject_trees; +      Curate curate; +      Curate[] curates; +      Curate[][string][string][string][string] subject_trees;      } -    return _Harvest(); +    return _Curate();    }  }  template spineBiblio() { diff --git a/src/doc_reform/meta/metadoc_harvest.d b/src/doc_reform/meta/metadoc_curate.d index 3135323..8190a9d 100644 --- a/src/doc_reform/meta/metadoc_harvest.d +++ b/src/doc_reform/meta/metadoc_curate.d @@ -48,9 +48,9 @@      [https://git.sisudoc.org/projects/?p=software/spine.git;a=summary]  +/ -module doc_reform.meta.metadoc_harvest; -template spineMetaDocHarvest() { -  @safe auto spineMetaDocHarvest(T,H)( +module doc_reform.meta.metadoc_curate; +template spineMetaDocCurate() { +  @safe auto spineMetaDocCurate(T,H)(      T  doc_matters,      H  hvst,    ) { @@ -72,21 +72,21 @@ template spineMetaDocHarvest() {      import doc_reform.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.harvest.title                 = doc_matters.conf_make_meta.meta.title_full; -    hvst.harvest.author                = doc_matters.conf_make_meta.meta.creator_author; -    hvst.harvest.author_surname        = doc_matters.conf_make_meta.meta.creator_author_surname; -    hvst.harvest.author_surname_fn     = doc_matters.conf_make_meta.meta.creator_author_surname_fn; -    hvst.harvest.author_arr            = doc_matters.conf_make_meta.meta.creator_author_arr; -    hvst.harvest.language_original     = doc_matters.conf_make_meta.meta.original_language; -    hvst.harvest.language              = doc_matters.src.language; -    hvst.harvest.uid                   = doc_matters.src.doc_uid; -    hvst.harvest.date_published        = doc_matters.conf_make_meta.meta.date_published; -    hvst.harvest.topic_register_arr    = doc_matters.conf_make_meta.meta.classify_topic_register_arr; -    hvst.harvest.path_html_metadata    = pth_html_rel.fn_metadata(doc_matters.src.filename); -    hvst.harvest.path_html_scroll      = pth_html_rel.fn_scroll(doc_matters.src.filename); -    hvst.harvest.path_html_segtoc      = pth_html_rel.fn_seg(doc_matters.src.filename, "toc"); -    hvst.harvest.path_abs_html_scroll  = pth_html_abs.fn_scroll(doc_matters.src.filename); -    hvst.harvest.path_abs_html_segtoc  = pth_html_abs.fn_seg(doc_matters.src.filename, "toc"); -    return hvst.harvest; +    hvst.curate.title                 = doc_matters.conf_make_meta.meta.title_full; +    hvst.curate.author                = doc_matters.conf_make_meta.meta.creator_author; +    hvst.curate.author_surname        = doc_matters.conf_make_meta.meta.creator_author_surname; +    hvst.curate.author_surname_fn     = doc_matters.conf_make_meta.meta.creator_author_surname_fn; +    hvst.curate.author_arr            = doc_matters.conf_make_meta.meta.creator_author_arr; +    hvst.curate.language_original     = doc_matters.conf_make_meta.meta.original_language; +    hvst.curate.language              = doc_matters.src.language; +    hvst.curate.uid                   = doc_matters.src.doc_uid; +    hvst.curate.date_published        = doc_matters.conf_make_meta.meta.date_published; +    hvst.curate.topic_register_arr    = doc_matters.conf_make_meta.meta.classify_topic_register_arr; +    hvst.curate.path_html_metadata    = pth_html_rel.fn_metadata(doc_matters.src.filename); +    hvst.curate.path_html_scroll      = pth_html_rel.fn_scroll(doc_matters.src.filename); +    hvst.curate.path_html_segtoc      = pth_html_rel.fn_seg(doc_matters.src.filename, "toc"); +    hvst.curate.path_abs_html_scroll  = pth_html_abs.fn_scroll(doc_matters.src.filename); +    hvst.curate.path_abs_html_segtoc  = pth_html_abs.fn_seg(doc_matters.src.filename, "toc"); +    return hvst.curate;    }  } diff --git a/src/doc_reform/meta/metadoc_harvests_authors.d b/src/doc_reform/meta/metadoc_curate_authors.d index 182b1cd..8c64f0c 100644 --- a/src/doc_reform/meta/metadoc_harvests_authors.d +++ b/src/doc_reform/meta/metadoc_curate_authors.d @@ -48,7 +48,7 @@      [https://git.sisudoc.org/projects/?p=software/spine.git;a=summary]  +/ -module doc_reform.meta.metadoc_harvests_authors; +module doc_reform.meta.metadoc_curate_authors;    import      std.algorithm,      std.array, @@ -60,12 +60,12 @@ module doc_reform.meta.metadoc_harvests_authors;    import      doc_reform.meta.defaults,      doc_reform.meta.rgx; -  mixin spineHarvest; +  mixin spineCurateMetadata;    mixin InternalMarkup; -template spineMetaDocHarvestsAuthors() { +template spineMetaDocCuratesAuthors() {    static auto mkup = InlineMarkup(); -  void spineMetaDocHarvestsAuthors(H,M,O)( -    H  harvests, +  void spineMetaDocCuratesAuthors(H,M,O)( +    H  curates,      M  _make_and_meta_struct,      O  _opt_action,    ) { @@ -222,11 +222,11 @@ string theme_dark_1 = format(q"┃  string theme_light_1 = format(q"┃    h1 {      color                    : #FFFFFF; -    background               : #000088; +    background               : #1A3A7A;    }    p.letter {      color                    : #FFFFFF; -    background               : #880000; +    background               : #1A3A7A;    }    p.lev0 {      color                    : #FFFFFF; @@ -254,15 +254,15 @@ string theme_light_1 = format(q"┃  <html>  <head>  <meta charset="utf-8"> -<title>Metadata Harvest - Authors</title> +<title>Curated metadata - Authors</title>  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> -<meta name="dc.title" content= "metadata harvest, Authors & Topics - information Structuring Universe, Structured information Serialised Units" /> +<meta name="dc.title" content= "metadata curate, Authors & Topics - information Structuring Universe, Structured information Serialised Units" />  <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />  <meta name="generator" content="spine" />  <link rel="generator" href="https://sisudoc.org" /> -<link href="./css/harvest.css" rel="stylesheet"> +<link href="./css/curate.css" rel="stylesheet">  <style TYPE="text/css"> -/* spine harvest css default stylesheet */%s +/* spine curate css default stylesheet */%s    .norm, .bold {      line-height              : 150%%;      margin-left              : 1em; @@ -386,11 +386,11 @@ string theme_light_1 = format(q"┃  <a name="top" id="top"></a>  <a name="up" id="up"></a>  <a name="start" id="start"></a> -<h1>Metadata Harvest - Authors (output organised by language & filetype)</h1> +<h1>Curated metadata - Authors (output organised by language & filetype)</h1>  <div class="flex-menu-bar">  <div class="flex-menu-option">  <p>[<a href="../../index.html"> HOME </a>] - [<a href="topics.html"> Metadata Harvest - Topics </a>] + [<a href="topics.html"> Curated metadata - Topics </a>]  </p>  </div>  %s @@ -408,8 +408,8 @@ string theme_light_1 = format(q"┃        string[] _author_date_title;        string _prev_auth = "";        char _prev_k = "_".to!char; -      foreach(doc_harvest; -        harvests +      foreach(doc_curate; +        curates          .multiSort!(            "toUpper(a.author_surname_fn) < toUpper(b.author_surname_fn)",            "a.date_published < b.date_published", @@ -417,38 +417,38 @@ string theme_light_1 = format(q"┃            SwapStrategy.unstable          )        ) { -        if (doc_harvest.author_surname_fn != _prev_auth) { -          _au[doc_harvest.author_surname_fn] +        if (doc_curate.author_surname_fn != _prev_auth) { +          _au[doc_curate.author_surname_fn]            = format(q"┃<p class="author"><a name="%s" class="lev0">%s</a></p> <p class="publication">%s "<a href="%s">%s</a>" [<a href="%s"> %s </a>]</p>┃", -            doc_harvest.author_surname.translate([' ' : "_"]), -            doc_harvest.author_surname_fn, -            (doc_harvest.date_published.length > 0) -              ? doc_harvest.date_published : "", -            doc_harvest.path_html_segtoc, -            doc_harvest.title, -            doc_harvest.path_html_metadata, -            doc_harvest.language, +            doc_curate.author_surname.translate([' ' : "_"]), +            doc_curate.author_surname_fn, +            (doc_curate.date_published.length > 0) +              ? doc_curate.date_published : "", +            doc_curate.path_html_segtoc, +            doc_curate.title, +            doc_curate.path_html_metadata, +            doc_curate.language,            ); -          _prev_auth = doc_harvest.author_surname_fn; +          _prev_auth = doc_curate.author_surname_fn;          } else { -          _au[doc_harvest.author_surname_fn] +          _au[doc_curate.author_surname_fn]            ~= format(q"┃<p class="publication">%s "<a href="%s">%s</a>" [<a href="%s"> %s </a>]</p>┃", -            (doc_harvest.date_published.length > 0) -              ? doc_harvest.date_published : "", -            doc_harvest.path_html_segtoc, -            doc_harvest.title, -            doc_harvest.path_html_metadata, -            doc_harvest.language, +            (doc_curate.date_published.length > 0) +              ? doc_curate.date_published : "", +            doc_curate.path_html_segtoc, +            doc_curate.title, +            doc_curate.path_html_metadata, +            doc_curate.language,            );          }          _author_date_title ~= format(q"┃%s %s "%s" [<a href="%s"> %s </a>]%s┃", -          doc_harvest.author_surname_fn, -          (doc_harvest.date_published.length > 0) -            ? "(" ~ doc_harvest.date_published ~ ")" : "", -          doc_harvest.title, -          doc_harvest.path_html_metadata, -          doc_harvest.language, -          (_opt_action.very_verbose) ? "\n  " ~ doc_harvest.path_abs_html_scroll : "", +          doc_curate.author_surname_fn, +          (doc_curate.date_published.length > 0) +            ? "(" ~ doc_curate.date_published ~ ")" : "", +          doc_curate.title, +          doc_curate.path_html_metadata, +          doc_curate.language, +          (_opt_action.very_verbose) ? "\n  " ~ doc_curate.path_abs_html_scroll : "",          );        }        foreach (k; _au.keys.sort) { @@ -476,7 +476,7 @@ string theme_light_1 = format(q"┃      import doc_reform.io_out.paths_output;      auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");      try { -      auto f       = File(out_pth.harvest("authors.html"), "w"); +      auto f       = File(out_pth.curate("authors.html"), "w");        foreach (o; authors) {          f.writeln(o);        } diff --git a/src/doc_reform/meta/metadoc_harvests_topics.d b/src/doc_reform/meta/metadoc_curate_topics.d index 5848723..1fdc760 100644 --- a/src/doc_reform/meta/metadoc_harvests_topics.d +++ b/src/doc_reform/meta/metadoc_curate_topics.d @@ -48,7 +48,7 @@      [https://git.sisudoc.org/projects/?p=software/spine.git;a=summary]  +/ -module doc_reform.meta.metadoc_harvests_topics; +module doc_reform.meta.metadoc_curate_topics;    import      std.algorithm,      std.array, @@ -60,11 +60,11 @@ module doc_reform.meta.metadoc_harvests_topics;    import      doc_reform.meta.defaults,      doc_reform.meta.rgx; -  mixin spineHarvest; +  mixin spineCurateMetadata;    mixin InternalMarkup; -template spineMetaDocHarvestsTopics() { +template spineMetaDocCuratesTopics() {    static auto mkup = InlineMarkup(); -  void spineMetaDocHarvestsTopics(H,M,O)( +  void spineMetaDocCuratesTopics(H,M,O)(      H  hvst,      M  _make_and_meta_struct,      O  _opt_action, @@ -106,40 +106,40 @@ template spineMetaDocHarvestsTopics() {        string[] _sub_topic_register;        string[] topics = [];        string _auth = ""; -      foreach(k, doc_harvest; hvst.harvests) { +      foreach(k, doc_curate; hvst.curates) {          _topic_register = []; -        foreach(topic; doc_harvest.topic_register_arr.sort) { +        foreach(topic; doc_curate.topic_register_arr.sort) {            _sub_topic_register = [];            string _spaces;            string[] subject_tree = topic.split(mkup.sep);            switch (subject_tree.length) {            case 1: -            hvst.subject_trees[subject_tree[0]]["_a"]["_a"]["_a"] ~= doc_harvest; +            hvst.subject_trees[subject_tree[0]]["_a"]["_a"]["_a"] ~= doc_curate;              break;            case 2: -            hvst.subject_trees[subject_tree[0]][subject_tree[1]]["_a"]["_a"] ~= doc_harvest; +            hvst.subject_trees[subject_tree[0]][subject_tree[1]]["_a"]["_a"] ~= doc_curate;              break;            case 3: -            hvst.subject_trees[subject_tree[0]][subject_tree[1]][subject_tree[2]]["_a"] ~= doc_harvest; +            hvst.subject_trees[subject_tree[0]][subject_tree[1]][subject_tree[2]]["_a"] ~= doc_curate;              break;            case 4: -            hvst.subject_trees[subject_tree[0]][subject_tree[1]][subject_tree[2]][subject_tree[3]] ~= doc_harvest; +            hvst.subject_trees[subject_tree[0]][subject_tree[1]][subject_tree[2]][subject_tree[3]] ~= doc_curate;              break;            default:              break;            }            _topic_register ~= _sub_topic_register.join("\n");          } -        auto char_repeat_number = (doc_harvest.title.length -          + doc_harvest.author.length + 16); +        auto char_repeat_number = (doc_curate.title.length +          + doc_curate.author.length + 16);          char_repeat_number = (char_repeat_number > min_repeat_number)          ? char_repeat_number          : min_repeat_number;          _document_topic_register ~= format(            "\"%s\", %s%s\n%s", -          doc_harvest.title, -          doc_harvest.author, -          (doc_harvest.date_published.length > 0) ? " (" ~ doc_harvest.date_published ~ ")" : "", +          doc_curate.title, +          doc_curate.author, +          (doc_curate.date_published.length > 0) ? " (" ~ doc_curate.date_published ~ ")" : "",            _topic_register.sort!("toUpper(a) < toUpper(b)", SwapStrategy.unstable).release.join("\n"),          );        } @@ -265,11 +265,11 @@ string theme_dark_1 = format(q"┃  string theme_light_1 = format(q"┃    h1 {      color                    : #FFFFFF; -    background               : #000088; +    background               : #1A3A7A;    }    p.letter {      color                    : #FFFFFF; -    background               : #880000; +    background               : #1A3A7A;    }    p.lev0 {      color                    : #FFFFFF; @@ -295,15 +295,15 @@ string theme_light_1 = format(q"┃  <html>  <head>  <meta charset="utf-8"> -<title>Metadata Harvest - Topics</title> +<title>Curated metadata - Topics</title>  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> -<meta name="dc.title" content= "metadata harvest, Authors & Topics - information Structuring Universe, Structured information Serialised Units" /> +<meta name="dc.title" content= "metadata curate, Authors & Topics - information Structuring Universe, Structured information Serialised Units" />  <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />  <meta name="generator" content="spine" />  <link rel="generator" href="https://sisudoc.org" /> -<link href="./css/harvest.css" rel="stylesheet"> +<link href="./css/curate.css" rel="stylesheet">  <style TYPE="text/css"> -/* spine harvest css default stylesheet */%s +/* spine curate css default stylesheet */%s    .norm, .bold {      line-height              : 150%%;      margin-left              : 1em; @@ -427,11 +427,11 @@ string theme_light_1 = format(q"┃  <a name="top" id="top"></a>  <a name="up" id="up"></a>  <a name="start" id="start"></a> -<h1>Metadata Harvest - Topics (output organised by language & filetype)</h1> +<h1>Curated metadata - Topics (output organised by language & filetype)</h1>  <div class="flex-menu-bar">  <div class="flex-menu-option">  <p>[<a href="../../index.html"> HOME </a>] - [<a href="authors.html"> Metadata Harvest - Authors </a>] + [<a href="authors.html"> Curated metadata - Authors </a>]  </p>  </div>   %s @@ -643,7 +643,7 @@ string theme_light_1 = format(q"┃      import doc_reform.io_out.paths_output;      auto out_pth = spinePathsHTML!()(_make_and_meta_struct.conf.output_path, "");      try { -      auto f       = File(out_pth.harvest("topics.html"), "w"); +      auto f       = File(out_pth.curate("topics.html"), "w");        foreach (o; topics) {          f.writeln(o);        } 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"); } | 
