Browse Source

fix: disable full-text search in queries temporally

Tienson Qin 4 years ago
parent
commit
3f4c9df5d4
2 changed files with 8 additions and 7 deletions
  1. 7 6
      src/main/frontend/components/block.cljs
  2. 1 1
      src/main/frontend/db/query_dsl.cljs

+ 7 - 6
src/main/frontend/components/block.cljs

@@ -1820,12 +1820,13 @@
         query-atom (if (:dsl-query? config)
                      (let [result (query-dsl/query (state/get-current-repo) (:query query))]
                        (if (string? result) ; full-text search
-                         (atom
-                          (if (string/blank? result)
-                            []
-                            (let [blocks (search/block-search result 50)]
-                              (when (seq blocks)
-                                (db/pull-many (state/get-current-repo) '[*] (map (fn [b] [:block/uuid (uuid (:block/uuid b))]) blocks))))))
+                         (atom nil)
+                         ;; (atom
+                         ;;  (if (string/blank? result)
+                         ;;    []
+                         ;;    (let [blocks (search/block-search result 50)]
+                         ;;      (when (seq blocks)
+                         ;;        (db/pull-many (state/get-current-repo) '[*] (map (fn [b] [:block/uuid (uuid (:block/uuid b))]) blocks))))))
                          result))
                      (db/custom-query query))]
     (assoc state :query-atom query-atom)))

+ 1 - 1
src/main/frontend/db/query_dsl.cljs

@@ -387,7 +387,7 @@
     (let [query-string (template/resolve-dynamic-template! query-string)]
       (when-not (string/blank? query-string)
         (let [{:keys [query sort-by blocks?] :as result} (parse repo query-string)]
-          (if (string? result)
+          (if (and (string? result) (not (string/includes? result " ")))
             (if (= "\"" (first result) (last result))
               (subs result 1 (dec (count result)))
               result)