From fc2471c91966186fc7bc0a5ac2217496c9e43eea Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 16 Jul 2018 22:39:09 -0400
Subject: 0.26.5 sqlite output, focus

---
 org/default_paths.org | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'org/default_paths.org')

diff --git a/org/default_paths.org b/org/default_paths.org
index 5b7141a..35dee32 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -233,6 +233,19 @@ template PathMatters() {
             } else {_k = "en"; }
             return _k;
           }
+          string doc_uid() {
+            string _uid;
+            if (is_pod && !(pod_name.empty)) {
+              if (pod_name.baseName == filename_base) {
+                _uid = filename_base ~ "." ~ filename_extension ~ _sep ~ lng;
+              } else {
+                _uid = pod_name.baseName ~ _sep ~ filename_base ~ "." ~ filename_extension ~ _sep ~ lng;
+              }
+            } else {
+              _uid = _sep ~ filename_base ~ "." ~ filename_extension ~ _sep ~ lng;
+            }
+            return _uid;
+          }
           string docname_composite_unique_per_src_doc() {
           /+
             z pod name if any + src filename + lng code
@@ -1181,7 +1194,7 @@ template SiSUpathsSQLiteDiscrete() {
         return asNormalizedPath(base.chainPath(base_filename(fn_src))).array;
       }
       string sqlite_file(string fn_src) {
-        return asNormalizedPath(base.chainPath(base_filename(fn_src) ~ ".sqlite")).array;
+        return asNormalizedPath(base.chainPath(base_filename(fn_src) ~ ".sql.db")).array;
       }
     }
     return _PathsStruct();
@@ -1196,7 +1209,8 @@ template SiSUpathsSQLiteDiscrete() {
 template SiSUpathsSQLite() {
   mixin SiSUrgxInit;
   static auto rgx = Rgx();
-  auto SiSUpathsSQLite(Po)(
+  auto SiSUpathsSQLite(DbN, Po)(
+    DbN db_name,
     Po  output_pth_root,
   ) {
     struct _PathsStruct {
@@ -1208,8 +1222,8 @@ template SiSUpathsSQLite() {
         string base_dir = "sqlite";
         return asNormalizedPath((out_pth.output_root).chainPath(base_dir)).array;
       }
-      string sqlite_file(string fn_src = "sdp-niu") {
-        return asNormalizedPath(base.chainPath(base_filename(fn_src) ~ ".sqlite")).array;
+      string sqlite_file() {
+        return asNormalizedPath(base.chainPath(base_filename(db_name) ~ ".sql.db")).array;
       }
     }
     return _PathsStruct();
-- 
cgit v1.2.3