From f7a56d241065cac08e6fba20cb9b658a8f073ad5 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Thu, 15 Nov 2018 18:57:53 -0500
Subject: 0.4.0 sqlite related

---
 org/output_sqlite.org | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'org/output_sqlite.org')

diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index 61390a3..b1c9cf4 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -205,6 +205,7 @@ template SQLiteInsertDocObjectsLoop() {
     D    doc_abstraction,
   ) {
     string _uid = SQLinsertDelimiter!()(doc_matters.src.doc_uid);
+    auto site_url = DocReformPathsUrl!()(doc_matters);
     string insertDocObjectsRow(O)(O obj) {
       <<sqlite_formatted_insertions_doc_objects>>
       return _insert_doc_objects_row;
@@ -1508,8 +1509,7 @@ CREATE TABLE metadata_and_text (
   pod_name                         VARCHAR(256)      NULL, /* zipped pod, work to be done here */
   pod_fingerprint                  VARCHAR(256)      NULL, /* zipped pod, work to be done here */
   pod_size                         VARCHAR(10)       NULL, /* zipped pod, work to be done here */
-  src_text                         TEXT              NULL,
-  fulltext                         TEXT              NULL,
+  site_url_doc_root                VARCHAR(256)      NULL, /* url path to doc root */
   links                            TEXT              NULL
 );
 #+END_SRC
@@ -1522,20 +1522,20 @@ CREATE TABLE doc_objects (
   lid                              BIGINT            PRIMARY KEY,
   uid_metadata_and_text            VARCHAR(256)      REFERENCES metadata_and_text(uid) ON DELETE CASCADE,
   ocn                              SMALLINT,
-  ocnd                             VARCHAR(6),
-  ocns                             VARCHAR(6),
+  obj_id                           VARCHAR(6)        NULL,
   clean                            TEXT              NULL,
   body                             TEXT              NULL,
   seg                              VARCHAR(256)      NULL,
   lev_an                           VARCHAR(1),
-  lev                              SMALLINT          NULL,
   is_of_type                       VARCHAR(16),
   is_a                             VARCHAR(16),
+  lev                              SMALLINT          NULL,
   node                             VARCHAR(16)       NULL,
   parent                           VARCHAR(16)       NULL,
   last_decendant                   VARCHAR(16)       NULL, /* headings only */
   digest_clean                     CHAR(256),
   digest_all                       CHAR(256),
+  html_seg_url                     CHAR(256),
   types                            CHAR(1)           NULL
 );
 #+END_SRC
@@ -1612,11 +1612,13 @@ string _insert_doc_objects_row = format(q"¶
   INSERT INTO doc_objects (
     uid_metadata_and_text,
     ocn,
+    obj_id,
     clean,
     body,
     lev,
     is_of_type,
-    is_a
+    is_a,
+    html_seg_url
   )
 #+END_SRC
 
@@ -1629,8 +1631,10 @@ string _insert_doc_objects_row = format(q"¶
     %s,
     '%s',
     '%s',
+    '%s',
     %s,
     '%s',
+    '%s',
     '%s'
   );
 #+END_SRC
@@ -1642,11 +1646,13 @@ string _insert_doc_objects_row = format(q"¶
 ¶",
   _uid,
   obj.metainfo.ocn,
+  obj.metainfo.identifier,
   SQLinsertDelimiter!()(obj_txt["text"]),
   SQLinsertDelimiter!()(obj_txt["html"]),
   obj.metainfo.heading_lev_markup,
   obj.metainfo.is_of_type,
   obj.metainfo.is_a,
+  site_url.html_seg(obj.tags.html_segment_anchor_tag_is, obj.metainfo.identifier),
 );
 #+END_SRC
 
@@ -1710,7 +1716,8 @@ string _insert_metadata = format(q"¶
     rights_copyright_text,
     rights_copyright_translation,
     rights_copyright_video,
-    rights_license
+    rights_license,
+    site_url_doc_root
   )
 #+END_SRC
 
@@ -1765,6 +1772,7 @@ string _insert_metadata = format(q"¶
     '%s',
     '%s',
     '%s',
+    '%s',
     '%s'
   );
 #+END_SRC
@@ -1820,7 +1828,8 @@ string _insert_metadata = format(q"¶
   SQLinsertDelimiter!()(doc_matters.conf_make_meta.meta.rights_copyright_text),
   SQLinsertDelimiter!()(doc_matters.conf_make_meta.meta.rights_copyright_translation),
   SQLinsertDelimiter!()(doc_matters.conf_make_meta.meta.rights_copyright_video),
-  SQLinsertDelimiter!()(doc_matters.conf_make_meta.meta.rights_license)
+  SQLinsertDelimiter!()(doc_matters.conf_make_meta.meta.rights_license),
+  SQLinsertDelimiter!()(doc_matters.conf_make_meta.conf.webserv_url_doc_root)
 );
 #+END_SRC
 
-- 
cgit v1.2.3