improve synonyms

1 files changed, 7 insertions, 34 deletions

diff --git a/bin/serve.fnl b/bin/serve.fnl
index 4f77416..18909a9 100644
--- a/bin/serve.fnl
+++ b/bin/serve.fnl
@@ -2,16 +2,17 @@
 
 (tset package :path (.. package.path ";./vendor/lpeglj/?.lua"))
 
-(local math (require :math))
+(local array (require :lib.array))
+(local cache (require :lib.cache))
 (local fennel (require :vendor.fennel))
+(local fs (require :lib.fs))
 (local html (require :vendor.html))
 (local libhtml (require :lib.html))
-(local array (require :lib.array))
+(local math (require :math))
+(local spellfix (require :lib.spellfix))
 (local str (require :lib.string))
+(local synonyms (require :lib.synonyms))
 (local texts (require :texts))
-(local fs (require :lib.fs))
-(local spellfix (require :lib.spellfix))
-(local cache (require :lib.cache))
 (local {: must} (require :lib.utils))
 
 (when _G.unpack
@@ -38,26 +39,6 @@
 (local db
   (must (luna.db.open "file:var/db.sqlite?_journal=WAL&_sync=NORMAL&_txlock=immediate")))
 
-(local query-synonyms {
-  "шэн" "шен"
-  "шен" "шэн"
-  "дянь" "дань"
-  "дань" "дянь"
-  "чжень" "чжэнь"
-  "чжэнь" "чжень"
-  "хун" "цун"
-  "цун" "хун"
-  "доска" "чабань"
-  "лунцзин" "лун цзин"
-  "лун цзин" "лунцзин"
-  "билочунь" "би ло чунь"
-  "би ло чунь" "билочунь"
-  "чахай" "сливник"
-  "сливник" "чахай"
-  "чабань" "доска"
-  "термос" "бутылка"
-  "бутылка" "термос"})
-
 (fn sanitize-input [input]
   (if input
     (str.trim (input:gsub "[=()<>']" "") " ")
@@ -249,15 +230,7 @@
       (table.insert query-args tag)))
   (when (and query (< 0 (# query)))
     (table.insert where-conds "search.title MATCH ?")
-    (table.insert query-args
-      (array.join
-        (map (fn [_ q]
-               (local lower-q (must (luna.utf8.lower q)))
-               (if (. query-synonyms lower-q)
-                 (.. "(" q "* OR " (. query-synonyms lower-q) "*)")
-                 (.. q "*")))
-             (str.split query " "))
-        " AND ")))
+    (table.insert query-args (synonyms.replace query)))
   (when (not (str.empty? site))
     (table.insert where-conds "products.site = ?")
     (table.insert query-args site))