diff options
Diffstat (limited to 'src/sdp/meta/conf_make_meta_json.d')
| -rw-r--r-- | src/sdp/meta/conf_make_meta_json.d | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/src/sdp/meta/conf_make_meta_json.d b/src/sdp/meta/conf_make_meta_json.d index bf67c62..dbba9af 100644 --- a/src/sdp/meta/conf_make_meta_json.d +++ b/src/sdp/meta/conf_make_meta_json.d @@ -190,21 +190,21 @@ static template contentJSONtoSiSUstruct() { ) { _struct_composite.make_str.texpdf_font = _json.object["make"]["texpdf_font"].str; } - _struct_composite.make.bold = _mk.bold(_struct_composite.make_str.bold); - _struct_composite.make.breaks = _mk.breaks(_struct_composite.make_str.breaks); - _struct_composite.make.cover_image = _mk.cover_image(_struct_composite.make_str.cover_image); - _struct_composite.make.css = _mk.css(_struct_composite.make_str.css); - _struct_composite.make.emphasis = _mk.emphasis(_struct_composite.make_str.emphasis); - _struct_composite.make.footer = _mk.footer(_struct_composite.make_str.footer); - _struct_composite.make.headings = _mk.headings(_struct_composite.make_str.headings); - _struct_composite.make.home_button_image = _mk.home_button_image(_struct_composite.make_str.home_button_image); - _struct_composite.make.home_button_text = _mk.home_button_text(_struct_composite.make_str.home_button_text); - _struct_composite.make.italics = _mk.italics(_struct_composite.make_str.italics); - _struct_composite.make.auto_num_top_at_level = _mk.auto_num_top_at_level(_struct_composite.make_str.auto_num_top_at_level); - _struct_composite.make.auto_num_top_lv = _mk.auto_num_top_lv(_struct_composite.make_str.auto_num_top_lv); - _struct_composite.make.auto_num_depth = _mk.auto_num_depth(_struct_composite.make_str.auto_num_depth); - _struct_composite.make.substitute = _mk.substitute(_struct_composite.make_str.substitute); - _struct_composite.make.texpdf_font = _mk.texpdf_font(_struct_composite.make_str.texpdf_font); + _struct_composite.make.bold = _mk.bold(_struct_composite.make_str.bold); + _struct_composite.make.breaks = _mk.breaks(_struct_composite.make_str.breaks); + _struct_composite.make.cover_image = _mk.cover_image(_struct_composite.make_str.cover_image); + _struct_composite.make.css = _mk.css(_struct_composite.make_str.css); + _struct_composite.make.emphasis = _mk.emphasis(_struct_composite.make_str.emphasis); + _struct_composite.make.footer = _mk.footer(_struct_composite.make_str.footer); + _struct_composite.make.headings = _mk.headings(_struct_composite.make_str.headings); + _struct_composite.make.home_button_image = _mk.home_button_image(_struct_composite.make_str.home_button_image); + _struct_composite.make.home_button_text = _mk.home_button_text(_struct_composite.make_str.home_button_text); + _struct_composite.make.italics = _mk.italics(_struct_composite.make_str.italics); + _struct_composite.make.auto_num_top_at_level = _mk.auto_num_top_at_level(_struct_composite.make_str.auto_num_top_at_level); + _struct_composite.make.auto_num_top_lv = _mk.auto_num_top_lv(_struct_composite.make_str.auto_num_top_lv); + _struct_composite.make.auto_num_depth = _mk.auto_num_depth(_struct_composite.make_str.auto_num_depth); + _struct_composite.make.substitute = _mk.substitute(_struct_composite.make_str.substitute); + _struct_composite.make.texpdf_font = _mk.texpdf_font(_struct_composite.make_str.texpdf_font); } /+ conf ------------------------------------------------------------------- +/ if ("webserv" in _json.object) { @@ -254,7 +254,7 @@ static template contentJSONtoSiSUstruct() { _struct_composite.conf.webserv_cgi_file_links = _json.object["webserv"]["cgi_file_links"].str; } } - if ("processing" in _json.object) { // TODO check & match logic with sdlang + if ("processing" in _json.object) { if ("path" in _json.object["processing"] && (_json.object["processing"]["path"].type().to!string == "STRING") ) { @@ -437,11 +437,7 @@ static template contentJSONtoSiSUstruct() { _struct_composite.meta.date_valid = _json.object["date"]["valid"].str; } } - if ("links" in _json.object) { - // if ("" in _json.object["links"]) { - // _struct_composite.meta.links_ = _json.object["links"][""].str; - // } - } + if ("links" in _json.object) {} if ("notes" in _json.object) { if ("abstract" in _json.object["notes"] && (_json.object["notes"]["abstract"].type().to!string == "STRING") @@ -476,11 +472,7 @@ static template contentJSONtoSiSUstruct() { _struct_composite.meta.original_title = _json.object["original"]["title"].str; } } - if ("publisher" in _json.object) { - // if ("" in _json.object["publisher"]) { - // _struct_composite.meta.publisher = _json.object["publisher"][""].str; - // } - } + if ("publisher" in _json.object) {} if ("rights" in _json.object) { if ("copyright" in _json.object["rights"] && (_json.object["rights"]["copyright"].type().to!string == "STRING") @@ -551,7 +543,6 @@ static template contentJSONtoSiSUstruct() { _struct_composite.meta.creator_translator = _json.object["creator"]["translator"].str; } } - // dochead_meta["creator"]["author_raw"] = dochead_meta["creator"]["author"]; string[] authors_arr; auto authors_raw_arr = _struct_composite.meta.creator_author.split(_rgx.arr_delimiter); foreach (author_raw; authors_raw_arr) { @@ -571,9 +562,7 @@ static template contentJSONtoSiSUstruct() { } if ("full" in _json.object["title"] && (_json.object["title"]["full"].type().to!string == "STRING") - ) { - // _struct_composite.meta.title_full = _json.object["title"]["full"].str; - } + ) {} if ("language" in _json.object["title"] && (_json.object["title"]["language"].type().to!string == "STRING") ) { |