aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sdp/output/sqlite.d
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2018-06-20 11:42:14 -0400
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:15 -0400
commitb86c91d6136476de3a35e0077db28caccacd816e (patch)
tree4aad808156bb045eadfc9191d593732832e5de2f /src/sdp/output/sqlite.d
parentnaming is_of_ (is_ of_) (diff)
doc object metainfo consolidation
Diffstat (limited to 'src/sdp/output/sqlite.d')
-rw-r--r--src/sdp/output/sqlite.d78
1 files changed, 39 insertions, 39 deletions
diff --git a/src/sdp/output/sqlite.d b/src/sdp/output/sqlite.d
index b4be286..1aa578d 100644
--- a/src/sdp/output/sqlite.d
+++ b/src/sdp/output/sqlite.d
@@ -246,7 +246,7 @@ template SQLiteFormatAndLoadObject() {
string o = format(q"¶<p class="%s"><b>
%s
</b></p>¶",
- obj.typeinfo.is_a,
+ obj.metainfo.is_a,
_txt,
);
return o;
@@ -259,7 +259,7 @@ template SQLiteFormatAndLoadObject() {
string o = format(q"¶<p class="%s" indent="h%si%s">
%s
</p>¶",
- obj.typeinfo.is_a,
+ obj.metainfo.is_a,
obj.attrib.indent_hang,
obj.attrib.indent_base,
_txt
@@ -273,7 +273,7 @@ template SQLiteFormatAndLoadObject() {
string o = format(q"¶<p class="%s">
%s
</p>¶",
- obj.typeinfo.is_a,
+ obj.metainfo.is_a,
_txt
);
return o;
@@ -285,7 +285,7 @@ template SQLiteFormatAndLoadObject() {
string o = format(q"¶<p class="%s">
%s
</p>¶",
- obj.typeinfo.is_a,
+ obj.metainfo.is_a,
_txt
);
return o;
@@ -296,7 +296,7 @@ template SQLiteFormatAndLoadObject() {
string _txt = munge_html(obj);
string o = format(q"¶
<p class="%s">%s</p>¶",
- obj.typeinfo.is_a,
+ obj.metainfo.is_a,
_txt.stripRight
);
return o;
@@ -306,7 +306,7 @@ template SQLiteFormatAndLoadObject() {
) {
string _txt = munge_html(obj);
string o = format(q"¶<p class="%s">%s</p>¶",
- obj.typeinfo.is_a,
+ obj.metainfo.is_a,
_txt
);
return o;
@@ -316,7 +316,7 @@ template SQLiteFormatAndLoadObject() {
) {
string _txt = html_special_characters_code(obj.text);
string o = format(q"¶<p class="%s">%s</p>¶",
- obj.typeinfo.is_a,
+ obj.metainfo.is_a,
_txt
);
return o;
@@ -375,7 +375,7 @@ template SQLiteFormatAndLoadObject() {
</table>
%s
</p>¶",
- obj.typeinfo.is_a,
+ obj.metainfo.is_a,
_txt,
_note
);
@@ -888,12 +888,12 @@ template SQLiteInsertDocObjectsLoop() {
);
¶",
_metadata_tid,
- obj.node.ocn,
+ obj.metainfo.ocn,
SQLinsertDelimiter!()(obj_txt["text"]),
SQLinsertDelimiter!()(obj_txt["html"]),
- obj.node.heading_lev_markup,
- obj.typeinfo.is_of_type,
- obj.typeinfo.is_a,
+ obj.metainfo.heading_lev_markup,
+ obj.metainfo.is_of_type,
+ obj.metainfo.is_a,
);
return _insert_doc_objects_row;
}
@@ -903,32 +903,32 @@ template SQLiteInsertDocObjectsLoop() {
string[] _insert_doc_objects;
foreach (part; doc_matters.xml.keys_seq.sql) {
foreach (obj; doc_abstraction[part]) {
- switch (obj.typeinfo.is_of_part) {
+ switch (obj.metainfo.is_of_part) {
case "frontmatter": assert(part == "head", part);
- switch (obj.typeinfo.is_of_type) {
+ switch (obj.metainfo.is_of_type) {
case "para":
- switch (obj.typeinfo.is_a) {
+ switch (obj.metainfo.is_a) {
case "heading":
obj_txt = format_and_sqlite_load.heading(obj);
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
}
break;
}
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
}
break;
}
break;
case "body": // assert(part == "body", part); // TODO broken
- switch (obj.typeinfo.is_of_type) {
+ switch (obj.metainfo.is_of_type) {
case "para":
- switch (obj.typeinfo.is_a) {
+ switch (obj.metainfo.is_a) {
case "heading":
debug (asserts) { // TODO consider and fix or remove
if (part != "body") {
@@ -942,13 +942,13 @@ template SQLiteInsertDocObjectsLoop() {
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
}
break;
}
break;
case "block":
- switch (obj.typeinfo.is_a) {
+ switch (obj.metainfo.is_a) {
case "quote":
obj_txt = format_and_sqlite_load.quote(obj);
break;
@@ -971,23 +971,23 @@ template SQLiteInsertDocObjectsLoop() {
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
}
break;
}
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
}
break;
}
break;
case "backmatter":
assert(part == "glossary" || "bibliography" || "bookindex_seg" || "blurb" || "tail", part);
- switch (obj.typeinfo.is_of_type) {
+ switch (obj.metainfo.is_of_type) {
case "para":
- switch (obj.typeinfo.is_a) {
+ switch (obj.metainfo.is_a) {
case "heading":
obj_txt = format_and_sqlite_load.heading(obj);
break;
@@ -1005,14 +1005,14 @@ template SQLiteInsertDocObjectsLoop() {
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
}
break;
}
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_type);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type);
}
break;
}
@@ -1021,28 +1021,28 @@ template SQLiteInsertDocObjectsLoop() {
break;
default:
if ((doc_matters.opt.action.debug_do)) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_of_part); // check where empty value could come from
- writeln(__FILE__, ":", __LINE__, ": ", obj.typeinfo.is_a);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part); // check where empty value could come from
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
writeln(__FILE__, ":", __LINE__, ": ", obj.text); // check where empty value could come from
}
break;
}
- if (obj.typeinfo.is_a == "heading") {
+ if (obj.metainfo.is_a == "heading") {
if ((doc_matters.opt.action.verbose)) {
writeln(
- "markup: ", obj.node.heading_lev_markup,
- "> ", obj.node.dom_markedup,
- "; collapsed: ", obj.node.heading_lev_collapsed,
- "> ", obj.node.dom_collapsed,
- "; ocn: ", obj.node.ocn,
- " node: ", obj.node.node,
- "; parent: ", obj.node.parent_lev_markup,
- "; ocn: ", obj.node.parent_ocn,
+ "markup: ", obj.metainfo.heading_lev_markup,
+ "> ", obj.metainfo.dom_markedup,
+ "; collapsed: ", obj.metainfo.heading_lev_collapsed,
+ "> ", obj.metainfo.dom_collapsed,
+ "; ocn: ", obj.metainfo.ocn,
+ " node: ", obj.metainfo.node,
+ "; parent: ", obj.metainfo.parent_lev_markup,
+ "; ocn: ", obj.metainfo.parent_ocn,
"; ",
);
}
}
- if (!(obj.typeinfo.is_a == "comment")) {
+ if (!(obj.metainfo.is_a == "comment")) {
_insert_doc_objects ~= insertDocObjectsRow(obj);
}
} // loop closes