From 1d30d4b2225be7f152de94b007d81a5d7b7a1c3a Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 29 Jun 2016 22:28:53 -0400
Subject: associated array instead of json

---
 org/sdp.org | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'org/sdp.org')

diff --git a/org/sdp.org b/org/sdp.org
index 014cb0c..73882c6 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -28,7 +28,7 @@ struct Version {
   int minor;
   int patch;
 }
-enum ver = Version(0, 6, 0);
+enum ver = Version(0, 6, 1);
 #+END_SRC
 
 ** pre loop init
@@ -140,7 +140,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");
@@ -198,8 +198,8 @@ auto output = SDPoutput();
 /+
 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;
 }
@@ -312,9 +312,10 @@ foreach(arg; args) {
 #+BEGIN_SRC d
 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);
 #+END_SRC
 
 ** each file (loop) [+2]                                         :loop:files:
@@ -365,17 +366,17 @@ debug(header_and_content) {
 **** [#A] read doc header: metadata & make         :doc:header:metadata:make:
 #+NAME: sdp_each_file_do
 #+BEGIN_SRC d
-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];
 #+END_SRC
 
 **** [#A] processing: document abstraction, tuple                :processing:
 #+NAME: sdp_each_file_do
 #+BEGIN_SRC d
 /+ ↓ 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));
@@ -394,8 +395,8 @@ debug(checkdoc) { // checkbook & dumpdoc
     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
   );
@@ -411,8 +412,8 @@ output.hub(
   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
 );
@@ -431,8 +432,8 @@ scope(exit) {
   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);
-- 
cgit v1.2.3