scv-bilara 3.175.22 → 3.176.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scv-bilara",
-  "version": "3.175.22",
+  "version": "3.176.2",
   "description": "SuttaCentral bilara-data library",
   "main": "index.js",
   "directories": {
@@ -15,8 +15,8 @@
     "log-instance": "^1.6.0",
     "memo-again": "^0.10.0",
     "merkle-json": "^2.2.0",
-    "scv-esm": "^1.115.566",
-    "suttacentral-api": "^2.17.55",
+    "scv-esm": "^1.115.568",
+    "suttacentral-api": "^2.17.56",
     "tmp": "^0.2.3"
   },
   "devDependencies": {

package/src/defines.cjs

@@ -1,19 +1,24 @@
 module.exports.DBG_BD_INIT    = 0; // BilaraData creation
 module.exports.DBG_EXEC       = 0;
 module.exports.DBG_EXAMPLES   = 0;
-module.exports.DBG_GREP       = 0;
 module.exports.DBG_MLD        = 0;
 module.exports.DBG = {
   FIND: 0,
-  FINDARGS: 0,
   MLD_CTOR: 0,
   MLD_LOAD: 0,
   MLD_TITLES: 0,
-  SEEKER: 0,
+  SEEKER: {
+    CTOR: 0,
+    FINDARGS: 0,
+    GREP: 0,
+    SLOWGREP: 0,
+    SANITIZE_PATTERN: 0,
+    SLOWFIND: 0,
+    SLOWFINDID: 0,
+    SLOWFINDPHRASE: 0,
+    SLOWFINDTRILINGUAL: 0,
+  },
   SEARCH_SCRIPT: 0, 
-  SLOWFIND: 0,
-  SLOWFINDID: 0,
-  SLOWFINDTRILINGUAL: 0,
   SUTTA_UIDSEARCH: 0,
   TRILINGUALDOC: 0,
   VERBOSE: 0,

package/src/seeker.cjs

@@ -25,15 +25,15 @@
 
   const { 
     DBG,
-    DBG_GREP, 
   } = require("./defines.cjs");
+  const { SEEKER } = DBG;
   
   var wscount = 0;
 
   class Seeker {
     constructor(opts = {}) {
       const msg = "Seeker.ctor()";
-      const dbg = DBG.SEEKER;
+      const dbg = SEEKER.CTOR;
       (opts.logger || logger).logInstance(this, opts);
       let bilaraData =
         (this.bilaraData = opts.bilaraData || new BilaraData(opts));
@@ -251,7 +251,7 @@
 
     grep(opts = {}) {
       const msg = "Seeker.grep() ";
-      const dbg = DBG_GREP;
+      const dbg = SEEKER.GREP;
       var {
         author,
         pattern,
@@ -270,6 +270,7 @@
       var reTipCat = this.tipitakaRegExp(tipitakaCategories);
       lang = lang || language || this.lang;
       var root = this.root.replace(`${Files.APP_DIR}/`, "");
+      dbg && console.log(msg, {root});
       var slowOpts = {
         author,
         pattern,
@@ -314,7 +315,7 @@
 
     static async slowGrep(opts) {
       const msg = "Seeker.slowGrep ";
-      const dbg = DBG_GREP;
+      const dbg = SEEKER.SLOWGREP;
       try {
         var {
           author,
@@ -327,6 +328,7 @@
           root,
           patPrimary,
         } = opts;
+        dbg && console.log(msg, JSON.stringify(opts, null, 2));
         if (!root.startsWith("/")) {
           root = `${Files.APP_DIR}/${root}`;
         }
@@ -379,7 +381,7 @@
         dbg && console.log(msg, {cmd, execOpts, lines, paths});
         return paths;
       } catch (e) {
-        logger.warn(`slowGrep()`, JSON.stringify(opts), e.message, cmd);
+        logger.warn(msg, JSON.stringify(opts), e.message, cmd);
         throw e;
       }
     }
@@ -531,7 +533,7 @@
 
     findArgs(args) {
       const msg = "Seeker.findArgs() ";
-      const dbg = DBG.SEEKER || DBG.FINDARGS;
+      const dbg = SEEKER.FINDARGS;
       const dbgv = DBG.VERBOSE;
       if (!(args instanceof Array)) {
         throw new Error("findArgs(?ARRAY-OF-ARGS?)");
@@ -803,7 +805,7 @@
 
     slowFindId(opts={}) {
       const msg = "Seeker.slowFindId() ";
-      const dbg = DBG.SEEKER || DBG.SLOWFIND || DBG.SLOWFINDID;
+      const dbg = SEEKER.SLOWFINDID;
       const dbgv = DBG.VERBOSE && dbg;
       let { 
         lang='en', 
@@ -870,7 +872,7 @@
 
     async slowFind(findArgs) {
       const msg = "Seeker.slowFind() ";
-      const dbg = DBG.SLOWFIND;
+      const dbg = SEEKER.SLOWFIND;
       try {
         var msStart = Date.now();
         let result;
@@ -893,7 +895,7 @@
 
     async slowFindLegacy(findArgs) {
       const msg = "Seeker.slowFindLegacy() ";
-      const dbg = DBG.SEEKER || DBG.SLOWFIND;
+      const dbg = SEEKER.SLOWFIND;
       var msStart = Date.now();
       var {
         author,
@@ -1069,7 +1071,7 @@
 
     async slowFindTrilingual(findArgs) {
       const msg = "Seeker.slowFindTrilingual()";
-      const dbg = DBG.SEEKER || DBG.SLOWFIND || DBG.SLOWFINDID;
+      const dbg = SEEKER.SLOWFIND || SEEKER.SLOWFINDID;
       const dbgv = DBG.VERBOSE && dbg;
       var msStart = Date.now();
       var {
@@ -1259,8 +1261,8 @@
     }
 
     async slowFindPhrase(args = {}) {
-      const msg = "Seeker.slowFindPhrase() ";
-      const dbg = DBG.SEEKER;
+      const msg = "S4R.slowFindPhrase:";
+      const dbg = SEEKER.SLOWFINDPHRASE;
       let {
         author,
         lang,
@@ -1275,6 +1277,7 @@
       author = author || AuthorsV2.langAuthor(searchLang, {
         category: tipitakaCategories,
       });
+      let phrasePat = pattern.replaceAll(/\s/mg, '\\s');
       try {
         let msStart = Date.now();
         let bd = this.bilaraData;
@@ -1285,7 +1288,7 @@
         let uids, suttaRefs;
         let searchOpts = {
           author,
-          pattern,
+          pattern: phrasePat,
           searchLang,
           maxResults,
           lang,
@@ -1297,11 +1300,13 @@
           searchOpts
         );
         if (lines.length) {
-          dbg && console.log(msg, {resultPattern, lines});
+          dbg && console.log(msg+'1.1', {resultPattern, lines});
           this.debug(msg, `phrase`, { 
             resultPattern, lines: lines.length });
         } else {
           method = "keywords";
+          searchOpts.pattern = pattern;
+          dbg && console.log(msg+'1.2', {resultPattern, lines});
           let data = await this.keywordSearch(searchOpts);
           var { lines, resultPattern } = data;
           this.debug(msg, `keywords`, {
@@ -1312,7 +1317,7 @@
         sortLines && lines.sort(sortLines);
         suttaRefs = 
           lines.map((line) => BilaraPath.pathParts(line).suttaRef);
-        dbg && console.log(msg, `suttaRefs`, suttaRefs);
+        dbg && console.log(msg+9, `suttaRefs`, suttaRefs);
         return {
           method,
           resultPattern,