From 313ddb0ac605838eaca89054ff80a0402a8c6313 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 2 Dec 2016 14:44:39 -0500 Subject: 0.9.3 start work on node pointers, a way to go --- src/sdp/ao_output_debugs.d | 85 +++++++++++----------------------------------- 1 file changed, 20 insertions(+), 65 deletions(-) (limited to 'src/sdp/ao_output_debugs.d') diff --git a/src/sdp/ao_output_debugs.d b/src/sdp/ao_output_debugs.d index 3c3b101..c6e8ac7 100644 --- a/src/sdp/ao_output_debugs.d +++ b/src/sdp/ao_output_debugs.d @@ -6,8 +6,7 @@ template SiSUoutputDebugs() { auto abstract_doc_source_debugs(S)( auto ref const S contents, string[][string] document_section_keys_sequenced, - string[][string][string] bookindex_unordered_hashes, // redundant, consider - JSONValue[] biblio, // redundant, consider + string[] html_segnames, string[string][string] dochead_make, string[string][string] dochead_meta, string fn_src, @@ -18,30 +17,7 @@ template SiSUoutputDebugs() { auto rgx = Rgx(); auto markup = InlineMarkup(); string key; - struct BookIndexReport { - int mkn, skn; - auto bookindex_report_sorted( - string[][string][string] bookindex_unordered_hashes - ) { - auto mainkeys=bookindex_unordered_hashes.byKey.array. - sort!("toLower(a) < toLower(b)", SwapStrategy.stable).release; - foreach (mainkey; mainkeys) { - auto subkeys=bookindex_unordered_hashes[mainkey].byKey.array. - sort!("toLower(a) < toLower(b)", SwapStrategy.stable).release; - foreach (subkey; subkeys) { - debug(bookindex) { - writeln( - mainkey, ": ", - subkey, ": ", - to!string(bookindex_unordered_hashes[mainkey][subkey]) - ); - } - ++skn; - } - ++mkn; - } - } - } + debug(parent) { writefln( "%s:%s", @@ -56,7 +32,7 @@ template SiSUoutputDebugs() { "%s node: %s heading: %s %s", obj.obj_cite_number, obj.node, - obj.lev_markup_number, + obj.lev_int_markup, obj.object, ); } @@ -251,12 +227,12 @@ template SiSUoutputDebugs() { "%s\n%s\n%s", "document header, metadata & make instructions:", dochead_meta, - pointer_head_main, + ptr_head_main, ); - foreach (main_header; pointer_head_main) { + foreach (main_header; ptr_head_main) { switch (main_header) { case "make": - foreach (sub_header; pointer_head_sub_make) { + foreach (sub_header; ptr_head_sub_make) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -277,12 +253,12 @@ template SiSUoutputDebugs() { "%s\n%s\n%s", "document header, metadata & make instructions:", dochead_meta, - pointer_head_main, + ptr_head_main, ); - foreach (main_header; pointer_head_main) { + foreach (main_header; ptr_head_main) { switch (main_header) { case "creator": - foreach (sub_header; pointer_head_sub_creator) { + foreach (sub_header; ptr_head_sub_creator) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -294,7 +270,7 @@ template SiSUoutputDebugs() { } break; case "title": - foreach (sub_header; pointer_head_sub_title) { + foreach (sub_header; ptr_head_sub_title) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -306,7 +282,7 @@ template SiSUoutputDebugs() { } break; case "rights": - foreach (sub_header; pointer_head_sub_rights) { + foreach (sub_header; ptr_head_sub_rights) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -318,7 +294,7 @@ template SiSUoutputDebugs() { } break; case "date": - foreach (sub_header; pointer_head_sub_date) { + foreach (sub_header; ptr_head_sub_date) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -330,7 +306,7 @@ template SiSUoutputDebugs() { } break; case "original": - foreach (sub_header; pointer_head_sub_original) { + foreach (sub_header; ptr_head_sub_original) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -342,7 +318,7 @@ template SiSUoutputDebugs() { } break; case "classify": - foreach (sub_header; pointer_head_sub_classify) { + foreach (sub_header; ptr_head_sub_classify) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -354,7 +330,7 @@ template SiSUoutputDebugs() { } break; case "identifier": - foreach (sub_header; pointer_head_sub_identifier) { + foreach (sub_header; ptr_head_sub_identifier) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -366,7 +342,7 @@ template SiSUoutputDebugs() { } break; case "notes": - foreach (sub_header; pointer_head_sub_notes) { + foreach (sub_header; ptr_head_sub_notes) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -378,7 +354,7 @@ template SiSUoutputDebugs() { } break; case "publisher": - foreach (sub_header; pointer_head_sub_publisher) { + foreach (sub_header; ptr_head_sub_publisher) { if (to!string(dochead_meta[main_header][sub_header]).length > 2) { writefln( "%s:%s: %s", @@ -394,27 +370,6 @@ template SiSUoutputDebugs() { } } } - debug(bookindex) { - writefln( - "%s\n%s:%s", - "-------------------------------", - __FILE__, - __LINE__, - ); - auto bookindex = BookIndexReport(); - bookindex.bookindex_report_sorted(bookindex_unordered_hashes); - } - - debug(biblio) { - foreach (entry; biblio) { - writefln( - "%s; (%s)", - entry["sortby_deemed_author_year_title"], - entry["author"], - ); - } - } - debug(anchor) { writefln( "%s\n%s:%s", @@ -442,7 +397,7 @@ template SiSUoutputDebugs() { foreach (k; document_section_keys_sequenced["seg"]) { foreach (o; contents[k]) { if (o.is_a == "heading") { - switch (o.heading_attrib.lev_markup_number) { + switch (o.heading_attrib.lev_int_markup) { case 0: spc=""; break; @@ -478,8 +433,8 @@ template SiSUoutputDebugs() { "%s* %s\n (markup level: %s; collapsed level: %s)", spc, strip(o.object), - o.heading_attrib.lev_markup_number, - o.heading_attrib.lev_collapsed_number + o.heading_attrib.lev_int_markup, + o.heading_attrib.lev_int_collapsed ); } } -- cgit v1.2.3