aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc_reform/meta
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2020-05-18 14:23:58 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2020-05-21 11:52:00 -0400
commit1e1e6f56d24a0cd6a3b270dc794374df6c3c832f (patch)
treed21bade8f0a178316ba5f1660687c30a352b6d0c /src/doc_reform/meta
parentmeson using subproject directory, not dub directly (diff)
catching
Diffstat (limited to 'src/doc_reform/meta')
-rw-r--r--src/doc_reform/meta/conf_make_meta_json.d2
-rw-r--r--src/doc_reform/meta/conf_make_meta_yaml.d16
2 files changed, 11 insertions, 7 deletions
diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d
index 5f36fb1..9befaaa 100644
--- a/src/doc_reform/meta/conf_make_meta_json.d
+++ b/src/doc_reform/meta/conf_make_meta_json.d
@@ -410,7 +410,7 @@ static template contentJSONtoSpineStruct() {
}
_struct_composite.meta.creator_author_arr = author_arr;
_struct_composite.meta.creator_author = author_arr.join(", ").chomp.chomp;
- _struct_composite.meta.creator_author_surname = authors_hash_arr["last"][0];
+ _struct_composite.meta.creator_author_surname = (authors_hash_arr["last"].length > 0) ? authors_hash_arr["last"][0] : "";
string _author_name_last_first = authors_hash_arr["last_first"].join("; ").chomp.chomp;
_struct_composite.meta.creator_author_surname_fn = (_author_name_last_first.length > 0)
? _author_name_last_first
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index 9dac231..1f22dc8 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -680,7 +680,7 @@ template contentYAMLtoSpineStruct() {
}
_struct_composite.meta.creator_author_arr = author_arr;
_struct_composite.meta.creator_author = author_arr.join(", ").chomp.chomp;
- _struct_composite.meta.creator_author_surname = authors_hash_arr["last"][0];
+ _struct_composite.meta.creator_author_surname = (authors_hash_arr["last"].length > 0) ? authors_hash_arr["last"][0] : "";
string _author_name_last_first = authors_hash_arr["last_first"].join("; ").chomp.chomp;
_struct_composite.meta.creator_author_surname_fn = (_author_name_last_first.length > 0)
? _author_name_last_first
@@ -1008,13 +1008,18 @@ template configParseYAMLreturnSpineStruct() {
if (_document_struct.content.length > 0) {
try {
_yaml = Loader.fromString(_document_struct.content).load();
- _make_and_meta_struct
- = contentYAMLtoSpineStruct!()(_make_and_meta_struct, _yaml, _manifested, _opt_action, _document_struct.filename);
- } catch {
+ } catch (Throwable) {
import std.stdio;
writeln("ERROR failed to parse content as yaml: ", _document_struct.filename);
// writeln(_document_struct.content);
}
+ try {
+ _make_and_meta_struct
+ = contentYAMLtoSpineStruct!()(_make_and_meta_struct, _yaml, _manifested, _opt_action, _document_struct.filename);
+ } catch (Throwable) {
+ import std.stdio;
+ writeln("ERROR failed to convert yaml to struct: ", _document_struct.filename);
+ }
}
return _make_and_meta_struct;
}
@@ -1050,8 +1055,7 @@ template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
writeln("ERROR failed to read document header, yaml header does not contain essential information related to title and author");
}
return contentYAMLtoSpineStruct!()(_make_and_meta_struct, _yaml, _manifested, _opt_action, "header");
- } catch {
- import std.stdio;
+ } catch (Throwable) {
writeln("ERROR failed to read document header, header not parsed as yaml: ", _manifested.src.filename);
return _make_and_meta_struct;
}