summaryrefslogtreecommitdiffhomepage
path: root/dlang/src
diff options
context:
space:
mode:
Diffstat (limited to 'dlang/src')
-rw-r--r--dlang/src/ocda/dump.d2
-rw-r--r--dlang/src/ocda/load_db.d7
-rw-r--r--dlang/src/ocda/load_ssp.d2
-rw-r--r--dlang/src/ocda/model.d2
4 files changed, 12 insertions, 1 deletions
diff --git a/dlang/src/ocda/dump.d b/dlang/src/ocda/dump.d
index e308db2..b16a209 100644
--- a/dlang/src/ocda/dump.d
+++ b/dlang/src/ocda/dump.d
@@ -97,6 +97,7 @@ string dumpDocument(ref OcdaDocument doc) {
kv("segment_prev", obj.segment_prev);
kv("segment_next", obj.segment_next);
kv("anchor", obj.anchor);
+ kv("heading_lev_anchor", obj.heading_lev_anchor);
kn("table_cols", obj.table_cols);
kv("table_widths", obj.table_widths);
kv("table_aligns", obj.table_aligns);
@@ -106,6 +107,7 @@ string dumpDocument(ref OcdaDocument doc) {
kv("heading_ancestors_text", obj.heading_ancestors_text);
kv("sha256", obj.sha256);
foreach (url; obj.stow_link) { kv("stow_link", url); }
+ foreach (a; obj.anchor_tags) { kv("anchor_tag", a); }
foreach (img; obj.images) {
/+ ↓ the name last, because a filename may hold a space where
none of the other fields can +/
diff --git a/dlang/src/ocda/load_db.d b/dlang/src/ocda/load_db.d
index f602da9..f81112a 100644
--- a/dlang/src/ocda/load_db.d
+++ b/dlang/src/ocda/load_db.d
@@ -151,7 +151,7 @@ OcdaDocument loadDbFile(string path, string lang = "", bool any_version = false)
coalesce(table_aligns,''), coalesce(table_header,0),
coalesce(code_linenumbers,0),
coalesce(heading_ancestors_text,''), coalesce(sha256,''),
- coalesce(text,''), id
+ coalesce(text,''), id, coalesce(heading_lev_anchor,'')
FROM objects WHERE doc_id = " ~ chosen.doc_id.to!string
~ " ORDER BY CASE section
WHEN 'head' THEN 1 WHEN 'toc' THEN 2 WHEN 'body' THEN 3
@@ -188,6 +188,7 @@ OcdaDocument loadDbFile(string path, string lang = "", bool any_version = false)
obj.segment_next = r[25];
obj.anchor = r[26];
obj.segment_html_is = r[27];
+ obj.heading_lev_anchor = r[37];
obj.table_cols = r[28].to!int;
obj.table_widths = jsonWords(r[29]);
obj.table_aligns = jsonWords(r[30]);
@@ -218,6 +219,10 @@ OcdaDocument loadDbFile(string path, string lang = "", bool any_version = false)
~ object_id ~ " ORDER BY seq")) {
obj.stow_link ~= l[0];
}
+ foreach (a; db.rows("SELECT anchor FROM object_anchors WHERE object_id = "
+ ~ object_id ~ " ORDER BY seq")) {
+ obj.anchor_tags ~= a[0];
+ }
auto section = doc.sectionByName(r[0]);
if (section !is null) { *section ~= obj; }
diff --git a/dlang/src/ocda/load_ssp.d b/dlang/src/ocda/load_ssp.d
index 37872ea..962e8f6 100644
--- a/dlang/src/ocda/load_ssp.d
+++ b/dlang/src/ocda/load_ssp.d
@@ -200,6 +200,7 @@ private void parseProperty(string line, ref OcdaObject obj, ref OcdaUnknown unkn
case "segment_html_is": obj.segment_html_is = value; break;
case "table_aligns": obj.table_aligns = value; break;
case "stow_link": obj.stow_link ~= value; break;
+ case "anchor_tag": obj.anchor_tags ~= value; break;
case "parent": obj.parent_ocn = toIntSafe(value); break;
case "last_descendant": obj.last_descendant_ocn = toIntSafe(value); break;
case "children": obj.children = parseIntArray(value); break;
@@ -228,6 +229,7 @@ private void parseProperty(string line, ref OcdaObject obj, ref OcdaUnknown unkn
case "segment_prev": obj.segment_prev = value; break;
case "segment_next": obj.segment_next = value; break;
case "anchor": obj.anchor = value; break;
+ case "heading_lev_anchor": obj.heading_lev_anchor = value; break;
case "table_cols": obj.table_cols = toIntSafe(value); break;
case "table_widths": obj.table_widths = value; break;
case "table_header": obj.table_header = (value == "true"); break;
diff --git a/dlang/src/ocda/model.d b/dlang/src/ocda/model.d
index 0ddefa1..8ee0043 100644
--- a/dlang/src/ocda/model.d
+++ b/dlang/src/ocda/model.d
@@ -22,6 +22,7 @@ struct OcdaObject {
string segment_html_is;// the html segment this object sits in
string table_aligns; // l c r per column
string[] stow_link; // links extracted from the object
+ string[] anchor_tags; // named targets the markup placed on this object
int parent_ocn;
int last_descendant_ocn;
int[] children; // direct child heading OCNs
@@ -40,6 +41,7 @@ struct OcdaObject {
string segment_prev;
string segment_next;
string anchor;
+ string heading_lev_anchor; // a heading's own named target
int table_cols;
string table_widths;
bool table_header;