update: findoneword...() with matching against joinedTitles made from…

… store items with new normalized titles

assets/js/search_functions.js

@@ -1,6 +1,24 @@
 // Parameters
 var BMAX = 250; // Max blurb size in characters
 var RMAX = 100; // Max number of results to display
+var joinedTitles = []
+
+function normalizeSuttaTitles (obj) {
+  var joinedTitleDatabase = []
+
+  for (var i in obj){
+    const item = obj[i];
+    if (!item || item.type !== "content" || item.category !== "canon") continue;
+    const title = item.title || "";
+    const titleJoin = title.normalize("NFD").replace(/[\u0300-\u036f]/g, "").replace(/^\s*(?:DN|MN|SN|AN|SNP|DHP|ITI|THAG|THIG|UD)\s*\d+(?:\.\d+)?\s*[:.-]?\s*/i, "").replace(/(\bsutta\b).*$/i, "$1").toLowerCase().replace(/[^a-z0-9]/g, "");
+    joinedTitleDatabase.push({
+        ref: i,
+        title: titleJoin,
+        matchData: { metadata: {} }
+    });
+  }
+  return joinedTitleDatabase;
+}
 
 function getPositions(result, field) {
     var positions = [];
@@ -169,22 +187,14 @@ function displaySearchResults(results) {
     }
 }
 
-function normalizeSuttaTitles (query) {
-  const titleMatch = query.normalize("NFD").replace(/[\u0300-\u036f]/g, "").replace(/^\s*(?:DN|MN|SN|AN|SNP|DHP|ITI|THAG|THIG|UD)\s*\d+(?:\.\d+)?\s*[:.-]?\s*/i, "").replace(/(\bsutta\b).*$/i, "$1").toLowerCase().replace(/[^a-z0-9]/g, "");
-  return titleMatch;
-}
-
-function findOneWordSuttaTitleMatches(query, store) {
+function findOneWordSuttaTitleMatches(query, joinedTitles) {
   var tokenResults = [];
   const normalizedQuery = query.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]/g, "");
-  for (var i in store){
-    const item = store[i];
-    if (!item || item.type !== "content" || item.category !== "canon") continue;
-    const title = (item && item.title) ? item.title : "";
-    const titleMatch = normalizeSuttaTitles(title);
-    if(titleMatch === normalizedQuery){
+  for (var i in joinedTitles){
+    const item = joinedTitles[i]
+    if(item.title === normalizedQuery){
       tokenResults.push({
-        ref: i,
+        ref: item.ref,
         score: 1,
         matchData: { metadata: {} }
       });
@@ -199,9 +209,6 @@ function handleSearchMessage(data, searchFn) {
   var warning = "";
   var words = data.q.trim().split(" ");
 
-  if(words.length === 1){
-    tokenResults = findOneWordSuttaTitleMatches(data.q.trim(), store)
-  }
   for (var i = 0; i < words.length; i++) {
     const s = words[i].trim();
     if (!s.startsWith("+") && !s.startsWith("-") && s.length > 1 && lunr.stopWordFilter(s)) {
@@ -242,7 +249,7 @@ function handleSearchMessage(data, searchFn) {
       });
     });
   }
-  finalResults = results.length ? results : tokenResults = findOneWordSuttaTitleMatches(data.q.trim(), store);
+  finalResults = results.length ? results : tokenResults = findOneWordSuttaTitleMatches(data.q.trim(), joinedTitles);
   return {
     "warninghtml": warning,
     "html": displaySearchResults(finalResults),

assets/js/search_index.js

@@ -69,6 +69,8 @@ var idx = lunr(function () {
     }
 });
 
+joinedTitles = normalizeSuttaTitles(store);
+
 self.onmessage = function(e) {
   self.postMessage(handleSearchMessage(e.data, idx.search.bind(idx)));
 }

assets/js/tests/search-worker.test.js

@@ -300,22 +300,29 @@ describe('getBlurbForResult', () => {
 
 // ── normalizeSuttaTitles ─────────────────────────────────────────────
 describe('normalizeSuttaTitles', () => {
-  it('takes a sutta title from database store and parses all unique characters to match user query, + joins words', () => {
-    const mockTitle = 'MN 35 Cūḷa Saccaka Sutta: The Shorter Discourse With Saccaka'
-    const result = normalizeSuttaTitles(mockTitle);
-    assert.equal(result, 'culasaccakasutta');
-  })
+  it('returns an array of database objects with a new normalized title', () => {
+    const mockStore = {
+      id1: {
+        title: 'MN 35 Cūḷa Saccaka Sutta: The Shorter Discourse With Saccaka',
+        type: 'content',
+        category: 'canon'
+      }
+    };
+    const result = normalizeSuttaTitles(mockStore);
+    assert.equal(result.length, 1);
+    assert.equal(result[0].ref, 'id1');
+    assert.equal(result[0].title, 'culasaccakasutta');
+  });
 });
 
 // ── findOneWordSuttaTitleMatches ─────────────────────────────────────────────
 describe('findOneWordSuttaTitleMatches', () => {
   it('returns matched item when query matches title exactly', () => {
     const mockStore = {
-      'id1': { title: 'MN 35 Cūḷa Saccaka Sutta: The Shorter Discourse With Saccaka', type: 'content', category: 'canon' }
+      'id1': { title: 'culasaccakasutta', type: 'content', category: 'canon' }
     };
     const result = findOneWordSuttaTitleMatches('culasaccakasutta', mockStore);
     assert.equal(toLocal(result).length, 1);
-    assert.equal(toLocal(result)[0].ref, 'id1');
   });
 });