From e280a374991a3a6db3c40fd1fa03a2d9c6fa66eb Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 6 Jun 2017 17:58:10 -0400
Subject: naming mostly

---
 src/sdp/ao/conf_make_meta_sdlang.d | 73 ++++++++++++++++++++++++++------------
 1 file changed, 51 insertions(+), 22 deletions(-)

(limited to 'src/sdp/ao/conf_make_meta_sdlang.d')

diff --git a/src/sdp/ao/conf_make_meta_sdlang.d b/src/sdp/ao/conf_make_meta_sdlang.d
index 567853e..7e7dd62 100644
--- a/src/sdp/ao/conf_make_meta_sdlang.d
+++ b/src/sdp/ao/conf_make_meta_sdlang.d
@@ -20,20 +20,35 @@ template SiSUheaderExtractSDLang() {
     mixin SiSUregisters;
     mixin SiSUrgxInit;
     auto rgx = Rgx();
-    private auto sdlangToAAmake(C,Tag)(C conf, Tag conf_sdlang) {
+    private auto sdlangToAAheaderMakeMeta(C,Tag)(C conf, Tag conf_sdlang) {
       debug(asserts){
         static assert(is(typeof(conf) == string[string][string]));
       }
       foreach (maintag, subtags; conf) {
         foreach (subtag, content; subtags) {
-          if (!(conf_sdlang.maybe.tags[maintag].empty)) {
-            if (!(conf_sdlang.tags[maintag][0].maybe.attributes[subtag].empty)
-            && (conf_sdlang.tags[maintag][0].attributes[subtag][0].value.length > 0)) {
+          if (maintag in conf_sdlang.maybe.tags) {
+            Tag _maintag = conf_sdlang.getTag(maintag);
+            if ((subtag in _maintag.maybe.tags)
+            && (_maintag.getTagValues(subtag).length > 0)) {
               debug(headersdlang) {
-                writeln(conf_sdlang.tags[maintag][0].attributes[subtag][0].value);
+                writeln(__LINE__, ": ", maintag, ":", subtag, ": ", _maintag.getTagValues(subtag)[0]);
+              }
+              if (_maintag.getTagValues(subtag).length == 1) {
+                conf[maintag][subtag] =
+                  (_maintag.getTagValues(subtag)[0]).to!string;
+              } else if (_maintag.getTagValues(subtag).length > 1) {
+                foreach (st; _maintag.getTagValues(subtag)) {
+                  conf[maintag][subtag] ~=
+                    st.to!string ~ ";";
+                }
+              }
+            } else if ((subtag in _maintag.maybe.attributes)
+            && (_maintag.maybe.attributes[subtag][0].value.length > 0)) {
+              debug(headersdlang) {
+                writeln(__LINE__, ": ", maintag, ":", subtag, ": ", conf_sdlang.tags[maintag][0].attributes[subtag][0].value);
               }
               conf[maintag][subtag] =
-                to!string(conf_sdlang.tags[maintag][0].attributes[subtag][0].value);
+                (conf_sdlang.tags[maintag][0].attributes[subtag][0].value).to!string;
             }
           }
         }
@@ -41,11 +56,11 @@ template SiSUheaderExtractSDLang() {
       return conf;
     }
     private auto configSettingsSDLangToAAmake(Tag)(Tag conf_sdlang) {
-      auto conf = sdlangToAAmake(conf_aa, conf_sdlang);
+      auto conf = sdlangToAAheaderMakeMeta(conf_aa_empty, conf_sdlang);
       return conf;
     }
     private auto documentMakeSDLangToAAmake(Tag)(Tag document_make_sdlang) {
-      auto dochead_make = sdlangToAAmake(make_aa, document_make_sdlang);
+      auto dochead_make = sdlangToAAheaderMakeMeta(conf_aa_empty, document_make_sdlang);
       return dochead_make;
     }
     final private auto headerMakeSDLang(Hs)(Hs src_header) {
@@ -73,7 +88,19 @@ template SiSUheaderExtractSDLang() {
       }
       debug(sdlang) {
         writeln("header SDL:");
-        writeln(sdl_root_header.toSDLDocument());
+        writeln(__LINE__, ": ",  sdl_root_header.toSDLDocument());
+        writeln(__LINE__, ": ",  sdl_root_header.maybe.namespaces);
+        writeln("header make sdlang: ", sdl_root_header.toSDLDocument());
+        writeln(__LINE__, ": ", sdl_root_header.getTagValues("title"));
+        writeln(__LINE__, ": ", sdl_root_header.getTagValues("creator"));
+        Tag creator = sdl_root_header.getTag("creator");
+        if (creator !is null) {
+          if ("author" in creator.maybe.tags) {
+            writeln(__LINE__, ": ", creator.getTagValues("author"));
+          } else if ("author" in creator.maybe.attributes) {
+            writeln(__LINE__, ": ", creator.maybe.attributes["author"][0].value);
+          }
+        }
       }
       return sdl_root_header;
     }
@@ -91,26 +118,28 @@ template SiSUheaderExtractSDLang() {
       }
       /+ get sdlang tags +/
       auto header_sdlang=headerMakeSDLang(to!string(header_clean));
-      debug(sdlang) {
-        writeln("--------------");
-        stdout.rawWrite( header_sdlang.toSDLDocument() );
-        writeln("--------------");
-        Value test = header_sdlang.tags["title"][0].values[0];
-        assert(test == typeid(string));
-        // writeln(header_sdlang.maybe.tags["title"]);
-        // writeln(header_sdlang.maybe.tags["title"][0].maybe.attributes["subtitle"]);
-      }
       return header_sdlang; // sdlang.ast.Tag
     }
     private auto headerSDLangToAAmake(Tag,Ma)(Tag header_sdlang, Ma dochead_make) {
       debug(asserts){
         static assert(is(typeof(dochead_make) == string[string][string]));
       }
-      dochead_make = sdlangToAAmake(dochead_make, header_sdlang);
-      auto dochead_meta = sdlangToAAmake(meta_aa, header_sdlang);
+      dochead_make = sdlangToAAheaderMakeMeta(dochead_make, header_sdlang);
+      auto dochead_meta = sdlangToAAheaderMakeMeta(meta_aa_empty, header_sdlang);
       if (dochead_meta["title"]["main"].empty) {
-        dochead_meta["title"]["main"] =
-          to!string(header_sdlang.maybe.tags["title"][0].values[0]);
+        {
+          Tag _maintag = header_sdlang.getTag("title");
+          if (_maintag !is null) {
+            if ("main" in _maintag.maybe.tags) {
+              dochead_meta["title"]["main"] =
+                to!string(_maintag.getTagValues("main"));
+            } else if ("main" !in _maintag.maybe.attributes) {
+              writeln(__LINE__, ": ", _maintag.values[0]);
+              dochead_meta["title"]["main"] =
+                (_maintag.values[0]).to!string; // test that this exists
+            }
+          }
+        }
       }
       if (!(dochead_meta["title"]["subtitle"].empty)
       && (dochead_meta["title"]["sub"].empty)) {
-- 
cgit v1.2.3