aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--org/ocda_obj_setter.org9
-rw-r--r--org/out_sqlite.org3
-rw-r--r--org/out_src_abstraction_ocda_peg_ssp.org18
-rw-r--r--org/out_src_abstraction_sqlite_db.org2
-rw-r--r--src/sisudoc/ocda/abstraction/ssp.d18
-rw-r--r--src/sisudoc/ocda/meta/metadoc_object_setter.d9
-rw-r--r--src/sisudoc/outputs/io_out/create_abstraction_db.d2
-rw-r--r--src/sisudoc/outputs/io_out/sqlite.d5
8 files changed, 31 insertions, 35 deletions
diff --git a/org/ocda_obj_setter.org b/org/ocda_obj_setter.org
index 60d138e..d410960 100644
--- a/org/ocda_obj_setter.org
+++ b/org/ocda_obj_setter.org
@@ -119,11 +119,10 @@ struct DocObj_MetaInfo_ {
bool object_number_off = false;
bool visible_object_number = false;
int object_number_type = 0; // { ocn, non, bkidx }
- /+ node +/
- string[string][string] node;
+ // string[string][string] node;
int ocn = 0;
string identifier = "";
- int o_n_type = 0;
+ // int o_n_type = 0;
int heading_lev_markup = 9;
int heading_lev_collapsed = 9;
bool dummy_heading = false;
@@ -161,10 +160,10 @@ struct DocObj_Table_ {
double[] column_widths = [];
string[] column_aligns = [];
bool heading = false;
- bool walls = false;
+ // bool walls = false;
}
struct DocObj_CodeBlock_ {
- string syntax = "";
+ // string syntax = "";
bool linenumbers = false;
}
struct DocObj_Stow_ {
diff --git a/org/out_sqlite.org b/org/out_sqlite.org
index fb19908..e4499ce 100644
--- a/org/out_sqlite.org
+++ b/org/out_sqlite.org
@@ -1691,7 +1691,6 @@ foreach (part; doc.matters.has.keys_seq.sql) {
"; collapsed: ", obj.metainfo.heading_lev_collapsed,
"> ", obj.metainfo.dom_structure_collapsed_tags_status,
"; ocn: ", obj.metainfo.ocn,
- " node: ", obj.metainfo.node,
"; parent: ", obj.metainfo.parent_lev_markup,
"; ocn: ", obj.metainfo.parent_ocn,
"; ",
@@ -1878,7 +1877,7 @@ CREATE TABLE IF NOT EXISTS doc_objects (
is_of_type VARCHAR(16),
is_a VARCHAR(16),
lev SMALLINT NULL,
- node VARCHAR(16) NULL,
+ node VARCHAR(16) NULL, -- not written to
parent VARCHAR(16) NULL,
last_descendant VARCHAR(16) NULL, -- headings only
digest_clean CHAR(256),
diff --git a/org/out_src_abstraction_ocda_peg_ssp.org b/org/out_src_abstraction_ocda_peg_ssp.org
index 099d81f..0156b89 100644
--- a/org/out_src_abstraction_ocda_peg_ssp.org
+++ b/org/out_src_abstraction_ocda_peg_ssp.org
@@ -297,9 +297,9 @@ template spineAbstractionTxt() {
if (obj.metainfo.object_number_off) {
output ~= ".ocn_off: true";
}
- if (obj.metainfo.o_n_type != 0) {
- output ~= ".o_n_type: " ~ obj.metainfo.o_n_type.to!string;
- }
+ // if (obj.metainfo.o_n_type != 0) {
+ // output ~= ".o_n_type: " ~ obj.metainfo.o_n_type.to!string;
+ // }
if (obj.metainfo.is_of_type.length > 0) {
output ~= ".is_of_type: " ~ obj.metainfo.is_of_type;
}
@@ -385,15 +385,15 @@ template spineAbstractionTxt() {
if (obj.table.heading) {
output ~= ".table_header: true";
}
- if (obj.table.walls) {
- output ~= ".table_walls: true";
- }
+ // if (obj.table.walls) {
+ // output ~= ".table_walls: true";
+ // }
}
/+ ↓ code block properties +/
if (obj.metainfo.is_a == "code") {
- if (obj.code_block.syntax.length > 0) {
- output ~= ".code_syntax: " ~ obj.code_block.syntax;
- }
+ // if (obj.code_block.syntax.length > 0) {
+ // output ~= ".code_syntax: " ~ obj.code_block.syntax;
+ // }
if (obj.code_block.linenumbers) {
output ~= ".code_linenumbers: true";
}
diff --git a/org/out_src_abstraction_sqlite_db.org b/org/out_src_abstraction_sqlite_db.org
index daf4fb0..31bb7ab 100644
--- a/org/out_src_abstraction_sqlite_db.org
+++ b/org/out_src_abstraction_sqlite_db.org
@@ -315,7 +315,7 @@ template spineAbstractionDb() {
{
import std.typecons : Nullable;
if (obj.metainfo.is_a == "code") {
- bindStr(":code_syntax", obj.code_block.syntax);
+ bindStr(":code_syntax", obj.metainfo.syntax);
obj_stmt.bind(":code_linenumbers", obj.code_block.linenumbers ? 1 : 0);
} else {
obj_stmt.bind(":code_syntax", Nullable!string());
diff --git a/src/sisudoc/ocda/abstraction/ssp.d b/src/sisudoc/ocda/abstraction/ssp.d
index 5f510f3..fc7dbd3 100644
--- a/src/sisudoc/ocda/abstraction/ssp.d
+++ b/src/sisudoc/ocda/abstraction/ssp.d
@@ -315,9 +315,9 @@ template spineAbstractionTxt() {
if (obj.metainfo.object_number_off) {
output ~= ".ocn_off: true";
}
- if (obj.metainfo.o_n_type != 0) {
- output ~= ".o_n_type: " ~ obj.metainfo.o_n_type.to!string;
- }
+ // if (obj.metainfo.o_n_type != 0) {
+ // output ~= ".o_n_type: " ~ obj.metainfo.o_n_type.to!string;
+ // }
if (obj.metainfo.is_of_type.length > 0) {
output ~= ".is_of_type: " ~ obj.metainfo.is_of_type;
}
@@ -403,15 +403,15 @@ template spineAbstractionTxt() {
if (obj.table.heading) {
output ~= ".table_header: true";
}
- if (obj.table.walls) {
- output ~= ".table_walls: true";
- }
+ // if (obj.table.walls) {
+ // output ~= ".table_walls: true";
+ // }
}
/+ ↓ code block properties +/
if (obj.metainfo.is_a == "code") {
- if (obj.code_block.syntax.length > 0) {
- output ~= ".code_syntax: " ~ obj.code_block.syntax;
- }
+ // if (obj.code_block.syntax.length > 0) {
+ // output ~= ".code_syntax: " ~ obj.code_block.syntax;
+ // }
if (obj.code_block.linenumbers) {
output ~= ".code_linenumbers: true";
}
diff --git a/src/sisudoc/ocda/meta/metadoc_object_setter.d b/src/sisudoc/ocda/meta/metadoc_object_setter.d
index a1f6a86..e7ff88b 100644
--- a/src/sisudoc/ocda/meta/metadoc_object_setter.d
+++ b/src/sisudoc/ocda/meta/metadoc_object_setter.d
@@ -74,10 +74,10 @@ template ObjectSetter() {
double[] column_widths = [];
string[] column_aligns = [];
bool heading = false;
- bool walls = false;
+ // bool walls = false;
}
struct DocObj_CodeBlock_ {
- string syntax = "";
+ // string syntax = "";
bool linenumbers = false;
}
struct DocObj_Stow_ {
@@ -171,11 +171,10 @@ template ObjectSetter() {
bool object_number_off = false;
bool visible_object_number = false;
int object_number_type = 0; // { ocn, non, bkidx }
- /+ node +/
- string[string][string] node;
+ // string[string][string] node;
int ocn = 0;
string identifier = "";
- int o_n_type = 0;
+ // int o_n_type = 0;
int heading_lev_markup = 9;
int heading_lev_collapsed = 9;
bool dummy_heading = false;
diff --git a/src/sisudoc/outputs/io_out/create_abstraction_db.d b/src/sisudoc/outputs/io_out/create_abstraction_db.d
index 0b6b633..ba83736 100644
--- a/src/sisudoc/outputs/io_out/create_abstraction_db.d
+++ b/src/sisudoc/outputs/io_out/create_abstraction_db.d
@@ -333,7 +333,7 @@ template spineAbstractionDb() {
{
import std.typecons : Nullable;
if (obj.metainfo.is_a == "code") {
- bindStr(":code_syntax", obj.code_block.syntax);
+ bindStr(":code_syntax", obj.metainfo.syntax);
obj_stmt.bind(":code_linenumbers", obj.code_block.linenumbers ? 1 : 0);
} else {
obj_stmt.bind(":code_syntax", Nullable!string());
diff --git a/src/sisudoc/outputs/io_out/sqlite.d b/src/sisudoc/outputs/io_out/sqlite.d
index 2b0b6d5..f96846d 100644
--- a/src/sisudoc/outputs/io_out/sqlite.d
+++ b/src/sisudoc/outputs/io_out/sqlite.d
@@ -1123,7 +1123,7 @@ template SQLiteTablesReCreate() {
is_of_type VARCHAR(16),
is_a VARCHAR(16),
lev SMALLINT NULL,
- node VARCHAR(16) NULL,
+ node VARCHAR(16) NULL, -- not written to
parent VARCHAR(16) NULL,
last_descendant VARCHAR(16) NULL, -- headings only
digest_clean CHAR(256),
@@ -1488,7 +1488,6 @@ template SQLiteInsertDocObjectsLoop() {
"; collapsed: ", obj.metainfo.heading_lev_collapsed,
"> ", obj.metainfo.dom_structure_collapsed_tags_status,
"; ocn: ", obj.metainfo.ocn,
- " node: ", obj.metainfo.node,
"; parent: ", obj.metainfo.parent_lev_markup,
"; ocn: ", obj.metainfo.parent_ocn,
"; ",
@@ -1636,7 +1635,7 @@ template SQLiteTablesCreate() {
is_of_type VARCHAR(16),
is_a VARCHAR(16),
lev SMALLINT NULL,
- node VARCHAR(16) NULL,
+ node VARCHAR(16) NULL, -- not written to
parent VARCHAR(16) NULL,
last_descendant VARCHAR(16) NULL, -- headings only
digest_clean CHAR(256),
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-30 08:47:41 +0000