associated array instead of json

1 files changed, 16 insertions, 15 deletions

diff --git a/src/sdp.d b/src/sdp.d
index c032607..c8be571 100755
--- a/src/sdp.d
+++ b/src/sdp.d
@@ -72,7 +72,7 @@ struct SDPoutput {
       auto html=SDPoutputHTML();
       html.css_write;
       html.scroll(contents, bookindex_unordered_hashes, biblio, fn_src, opt_action_bool);
-      // html.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make_json, dochead_meta_json, fn_src, opt_action_bool);
+      // html.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make_aa, dochead_meta_aa, fn_src, opt_action_bool);
     }
     if (opt_action_bool["epub"]) {
       writeln("epub processing");
@@ -116,8 +116,8 @@ void main(string[] args) {
   /+
   struct DocumentParts {
     string[string][] contents;
-    JSONValue[string] meta_json;
-    JSONValue[string] make_json;
+    string[string][string] meta_aa;
+    string[string][string] make_aa;
     string[][string][string] bookindex_unordered_hashes;
     JSONValue[] biblio;
   }
@@ -208,9 +208,10 @@ void main(string[] args) {
   }
   auto conf = ConfigHub();
   auto sdl_root_configuration = conf.configSDLang("conf.sdl");
-  auto sdl_root_document_make = conf.configSDLang("sisu_document_make");
+  auto sdl_root_doc_make = conf.configSDLang("sisu_document_make");
   auto confsdl = HeaderExtractSDL();
-  auto conf_doc_make_json = confsdl.documentMakeSDLangToJSONmake(sdl_root_document_make);
+  auto conf_settings_aa = confsdl.configSettingsSDLangToAAmake(sdl_root_configuration);
+  auto conf_doc_make_aa = confsdl.documentMakeSDLangToAAmake(sdl_root_doc_make);
   foreach(fn_src; fns_src) {
   // foreach(fn_src; fns_src) {
     if (!empty(fn_src)) {
@@ -245,12 +246,12 @@ void main(string[] args) {
         writeln(header_and_content_tuple.length);
         writeln(sourcefile_content[0]);
       }
-      auto header_make_and_meta_tuple = head.headerContentJSON(header, conf_doc_make_json);
+      auto header_make_and_meta_tuple = head.headerContentAA(header, conf_doc_make_aa);
       static assert(!isTypeTuple!(header_make_and_meta_tuple));
-      JSONValue[string] dochead_make_json = header_make_and_meta_tuple[0];
-      JSONValue[string] dochead_meta_json = header_make_and_meta_tuple[1];
+      string[string][string] dochead_make_aa = header_make_and_meta_tuple[0];
+      string[string][string] dochead_meta_aa = header_make_and_meta_tuple[1];
       /+ ↓ process document, return abstraction as tuple +/
-      auto t = abs.abstract_doc_source(sourcefile_content, dochead_make_json, dochead_meta_json);
+      auto t = abs.abstract_doc_source(sourcefile_content, dochead_make_aa, dochead_meta_aa);
       static assert(!isTypeTuple!(t));
       auto doc_ao_contents = t[0]; // contents ~ endnotes ~ bookindex;
       // static assert(!isIterable!(doc_ao_contents));
@@ -263,8 +264,8 @@ void main(string[] args) {
           doc_ao_contents,
           doc_ao_bookindex_unordered_hashes,
           doc_ao_biblio,
-          dochead_make_json,
-          dochead_meta_json,
+          dochead_make_aa,
+          dochead_meta_aa,
           fn_src,
           opt_action_bool
         );
@@ -274,8 +275,8 @@ void main(string[] args) {
         doc_ao_contents,
         doc_ao_bookindex_unordered_hashes,
         doc_ao_biblio,
-        // doc_ao_make_json,
-        // doc_ao_meta_json,
+        // doc_ao_make_aa,
+        // doc_ao_meta_aa,
         fn_src,
         opt_action_bool
       );
@@ -289,8 +290,8 @@ void main(string[] args) {
         destroy(sourcefile_content);
         destroy(t);
         destroy(doc_ao_contents);
-        // destroy(doc_ao_make_json);
-        // destroy(doc_ao_meta_json);
+        // destroy(doc_ao_make_aa);
+        // destroy(doc_ao_meta_aa);
         // destroy(doc_ao_bookindex_unordered_hashes);
         destroy(doc_ao_biblio);
         destroy(fn_src);