#197 Use >< rather than LIKE for first-letter search (#198)

* #197 Use >< rather than LIKE for first-letter search * Fix anywhere query
KhalisFoundation · Jul 13, 2018 · f3596bd · f3596bd
1 parent 686db4e
commit f3596bd
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/www/js/search-database.js b/www/js/search-database.js
@@ -23,17 +23,27 @@ module.exports = {
           }
           dbQuery += `,${charCode}`;
         }
-        // Add trailing wildcard
-        dbQuery += '%';
-        if (searchType === 1) {
-          dbQuery = `%${dbQuery}`;
-        }
+
         // Replace kh with kh pair bindi
-        let bindiQuery = '';
+        let replaced = '';
         if (dbQuery.includes('075')) {
-          bindiQuery = `OR ${searchCol} LIKE '${dbQuery.replace(/075/g, '094')}'`;
+          replaced = dbQuery.replace(/075/g, '094');
+        }
+
+        // Use LIKE if anywhere, otherwise use operators
+        if (searchType === CONSTS.SEARCH_TYPES.FIRST_LETTERS_ANYWHERE) {
+          condition = `${searchCol} LIKE '%${dbQuery}%'`;
+          if (replaced) {
+            condition += ` OR ${searchCol} LIKE '%${replaced}%'`;
+          }
+        } else {
+          condition = `(${searchCol} > '${dbQuery}' AND ${searchCol} < '${dbQuery},z')`;
+          if (replaced) {
+            condition += ` OR (${searchCol} > '${replaced}' AND ${searchCol} < '${replaced},z')`;
+          }
         }
-        condition = `${searchCol} LIKE '${dbQuery}' ${bindiQuery}`;
+
+        // Give preference to shorter lines if searching for 1 or 2 words
         if (searchQuery.length < 3) {
           order.push('v.FirstLetterLen');
         }