From 4c6bf7aced578b4f6908c9eddb06cac36efa4b06 Mon Sep 17 00:00:00 2001 From: Junyi Du Date: Wed, 30 Nov 2022 13:29:27 +0800 Subject: [PATCH] fix: search-block-aux typo --- src/electron/electron/search.cljs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/electron/electron/search.cljs b/src/electron/electron/search.cljs index 0b98c6342..12f042d5b 100644 --- a/src/electron/electron/search.cljs +++ b/src/electron/electron/search.cljs @@ -273,17 +273,23 @@ (->> (concat matched-result (search-blocks-aux database non-match-sql non-match-input page limit)) - (distinct-by :id) + (distinct-by :rowid) (take limit) (vec)))))) +(defn- snippet-by + [content length] + (str (subs content 0 length) "...")) + (defn- search-pages-res-unpack [arr] (let [[rowid uuid content snippet] arr] {:id rowid :uuid uuid :content content - :snippet snippet})) + :snippet (if (string/includes? snippet "$pfts_2lqh>$ ") + snippet + (snippet-by snippet 250))})) (defn- search-pages-aux [database sql input limit] @@ -317,7 +323,8 @@ match-inputs) (apply concat))] (->> - matched-result + (concat matched-result + (search-pages-aux database non-match-sql non-match-input limit)) (distinct-by :id) (take limit) (vec))))))