summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-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
-rw-r--r--gleam/src/ocda/dump.gleam6
-rw-r--r--gleam/src/ocda/load_db.gleam28
-rw-r--r--gleam/src/ocda/load_ssp.gleam8
-rw-r--r--gleam/src/ocda/model.gleam4
8 files changed, 56 insertions, 3 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;
diff --git a/gleam/src/ocda/dump.gleam b/gleam/src/ocda/dump.gleam
index 1ab37a6..2b05751 100644
--- a/gleam/src/ocda/dump.gleam
+++ b/gleam/src/ocda/dump.gleam
@@ -165,6 +165,7 @@ fn object(
|> 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)
@@ -174,6 +175,7 @@ fn object(
|> kv("heading_ancestors_text", obj.heading_ancestors_text)
|> kv("sha256", obj.sha256)
|> links(obj)
+ |> anchor_tags(obj)
|> images(obj)
|> text(obj)
}
@@ -182,6 +184,10 @@ fn links(acc: List(String), obj: Object) -> List(String) {
list.fold(obj.stow_link, acc, fn(lines, url) { kv(lines, "stow_link", url) })
}
+fn anchor_tags(acc: List(String), obj: Object) -> List(String) {
+ list.fold(obj.anchor_tags, acc, fn(lines, a) { kv(lines, "anchor_tag", a) })
+}
+
fn images(acc: List(String), obj: Object) -> List(String) {
list.fold(obj.images, acc, fn(lines, img) {
// the name last, because a filename may hold a space where none of the
diff --git a/gleam/src/ocda/load_db.gleam b/gleam/src/ocda/load_db.gleam
index bcd65d8..e919615 100644
--- a/gleam/src/ocda/load_db.gleam
+++ b/gleam/src/ocda/load_db.gleam
@@ -242,6 +242,7 @@ fn objects(
use sha256 <- decode.field(34, decode.string)
use text <- decode.field(35, decode.string)
use id <- decode.field(36, decode.int)
+ use hla <- decode.field(37, decode.string)
decode.success(#(
id,
Object(
@@ -259,6 +260,7 @@ fn objects(
segment_html_is: segment_html_is,
table_aligns: json_words(table_aligns),
stow_link: [],
+ anchor_tags: [],
parent_ocn: parent,
last_descendant_ocn: last_descendant,
children: json_ints(children),
@@ -277,6 +279,7 @@ fn objects(
segment_prev: segment_prev,
segment_next: segment_next,
anchor: anchor,
+ heading_lev_anchor: hla,
table_cols: table_cols,
table_widths: json_words(table_widths),
table_header: table_header != 0,
@@ -303,7 +306,12 @@ fn objects(
// the four repeatable properties of the text form are child tables
// here, one query each
let object =
- Object(..object, images: images(conn, id), stow_link: links(conn, id))
+ Object(
+ ..object,
+ images: images(conn, id),
+ stow_link: links(conn, id),
+ anchor_tags: anchors(conn, id),
+ )
case model.is_section(object.section) {
False -> acc
True ->
@@ -337,7 +345,7 @@ fn object_sql(doc_id: Int) -> String {
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 = " <> int.to_string(doc_id) <> "
order by case section
when 'head' then 1 when 'toc' then 2 when 'body' then 3
@@ -393,6 +401,22 @@ fn links(conn: sqlight.Connection, object_id: Int) -> List(String) {
|> result.unwrap([])
}
+fn anchors(conn: sqlight.Connection, object_id: Int) -> List(String) {
+ let d = {
+ use anchor <- decode.field(0, decode.string)
+ decode.success(anchor)
+ }
+ sqlight.query(
+ "select anchor from object_anchors where object_id = "
+ <> int.to_string(object_id)
+ <> " order by seq",
+ on: conn,
+ with: [],
+ expecting: d,
+ )
+ |> result.unwrap([])
+}
+
fn one(conn: sqlight.Connection, sql: String) -> String {
let d = {
use v <- decode.field(0, decode.string)
diff --git a/gleam/src/ocda/load_ssp.gleam b/gleam/src/ocda/load_ssp.gleam
index 6dcc38a..83af6e2 100644
--- a/gleam/src/ocda/load_ssp.gleam
+++ b/gleam/src/ocda/load_ssp.gleam
@@ -267,6 +267,10 @@ fn apply_property(
Object(..object, stow_link: list.append(object.stow_link, [value])),
True,
)
+ "anchor_tag" -> #(
+ Object(..object, anchor_tags: list.append(object.anchor_tags, [value])),
+ True,
+ )
"parent" -> #(Object(..object, parent_ocn: parse_int(value)), True)
"last_descendant" -> #(
Object(..object, last_descendant_ocn: parse_int(value)),
@@ -295,6 +299,10 @@ fn apply_property(
"segment_prev" -> #(Object(..object, segment_prev: value), True)
"segment_next" -> #(Object(..object, segment_next: value), True)
"anchor" -> #(Object(..object, anchor: value), True)
+ "heading_lev_anchor" -> #(
+ Object(..object, heading_lev_anchor: value),
+ True,
+ )
"table_cols" -> #(Object(..object, table_cols: parse_int(value)), True)
"table_widths" -> #(Object(..object, table_widths: value), True)
"table_header" -> #(Object(..object, table_header: value == "true"), True)
diff --git a/gleam/src/ocda/model.gleam b/gleam/src/ocda/model.gleam
index 20d7fba..a45cf6e 100644
--- a/gleam/src/ocda/model.gleam
+++ b/gleam/src/ocda/model.gleam
@@ -87,6 +87,7 @@ pub type Object {
segment_html_is: String,
table_aligns: String,
stow_link: List(String),
+ anchor_tags: List(String),
parent_ocn: Int,
last_descendant_ocn: Int,
children: List(Int),
@@ -105,6 +106,7 @@ pub type Object {
segment_prev: String,
segment_next: String,
anchor: String,
+ heading_lev_anchor: String,
table_cols: Int,
table_widths: String,
table_header: Bool,
@@ -130,6 +132,7 @@ pub fn new_object() -> Object {
segment_html_is: "",
table_aligns: "",
stow_link: [],
+ anchor_tags: [],
parent_ocn: 0,
last_descendant_ocn: 0,
children: [],
@@ -148,6 +151,7 @@ pub fn new_object() -> Object {
segment_prev: "",
segment_next: "",
anchor: "",
+ heading_lev_anchor: "",
table_cols: 0,
table_widths: "",
table_header: False,