diff options
Diffstat (limited to 'src/doc_reform/meta')
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_json.d | 2 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_yaml.d | 16 | 
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;      }  | 
