aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/meta_conf_make_meta.org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2019-06-08 14:15:46 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2019-10-17 19:07:20 -0400
commit81a26c19c55a98918cf433da2f867db6b693b6df (patch)
treec0d998d51aa040b450215be5949b716cc49e560f /org/meta_conf_make_meta.org
parent0.7.3 start to look at document harvest (initial stub) (diff)
harvest, document reporting
Diffstat (limited to 'org/meta_conf_make_meta.org')
-rw-r--r--org/meta_conf_make_meta.org23
1 files changed, 9 insertions, 14 deletions
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index 79ee9e7..0f8c8bf 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -304,7 +304,6 @@ struct MetaComposite {
string title_short;
string title_sub;
string title_subtitle;
- string author_date_title;
}
#+END_SRC
@@ -450,7 +449,7 @@ static template contentJSONtoDocReformStruct() {
doc_reform.meta.defaults,
doc_reform.meta.rgx;
ConfCompositePlus _struct_composite;
- auto contentJSONtoDocReformStruct(C,J)(C _struct_composite, J _json, string _identifier) {
+ auto contentJSONtoDocReformStruct(C,J,M)(C _struct_composite, J _json, M _manifest, string _identifier) {
mixin DocReformRgxInit;
static auto rgx = Rgx();
debug (json) {
@@ -996,13 +995,7 @@ if ("date" in _json.object) {
) {
_struct_composite.meta.date_valid = _json.object["date"]["valid"].str;
}
- _struct_composite.meta.author_date_title = format(
- "%s %s \"%s\"",
- _struct_composite.meta.creator_author_surname_fn,
- (_struct_composite.meta.date_published.length > 0)
- ? "(" ~ _struct_composite.meta.date_published ~ ")" : "",
- _struct_composite.meta.title_full,
- );
+ _struct_composite.meta.language_document_char = _manifest.src.language;
}
if ("links" in _json.object) {}
if ("notes" in _json.object) {
@@ -1130,14 +1123,15 @@ static template configParseTOMLreturnDocReformStruct() {
doc_reform.meta.conf_make_meta_structs,
doc_reform.meta.conf_make_meta_json;
mixin contentJSONtoDocReformStruct;
- auto configParseTOMLreturnDocReformStruct(CCm, T)(
+ auto configParseTOMLreturnDocReformStruct(T,CCm,M)(
+ T _document_struct,
CCm _make_and_meta_struct,
- T _document_struct
+ M _manifest
){
TOMLDocument _doc = parseTOML(cast(string)(_document_struct.content));
auto _doc_json = _doc.toJSON;
_make_and_meta_struct
- = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json
+ = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _manifest, _document_struct.filename); // struct from json
return _make_and_meta_struct;
}
}
@@ -1165,9 +1159,10 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
mixin DocReformRgxInit;
mixin contentJSONtoDocReformStruct;
static auto rgx = Rgx();
- auto docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct(CCm, Src)(
+ auto docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct(CCm,Src,M)(
CCm _make_and_meta_struct,
Src header_src,
+ M _manifest,
) {
TOMLDocument _doc;
if (header_src.match(rgx.toml_header_meta_title)) {
@@ -1178,7 +1173,7 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
}
auto _doc_json = _doc.toJSON;
auto _header_and_make_and_meta_struct
- = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, "header");
+ = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _manifest, "header");
return _header_and_make_and_meta_struct;
}
}