All tests pass again.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
(ns auto-ap.search
|
||||
(:require [config.core :refer [env]])
|
||||
(:import
|
||||
(java.nio.file Paths)
|
||||
(org.apache.lucene.analysis.standard StandardAnalyzer)
|
||||
@@ -9,7 +10,7 @@
|
||||
(org.apache.lucene.store FSDirectory)))
|
||||
|
||||
(defn full-index-query [results index-name]
|
||||
(let [directory (FSDirectory/open (Paths/get (java.net.URI. (str "file:///tmp/" index-name))))
|
||||
(let [directory (FSDirectory/open (Paths/get (java.net.URI. (str "file:///tmp/search" (:dd-env env) "/" index-name))))
|
||||
analyzer (StandardAnalyzer.)
|
||||
index-writer-config (IndexWriterConfig. analyzer)
|
||||
index-writer (IndexWriter. directory index-writer-config)]
|
||||
@@ -52,20 +53,21 @@
|
||||
([n index-name]
|
||||
(search n index-name []))
|
||||
([n index-name other-keys]
|
||||
(let [directory (FSDirectory/open (Paths/get (java.net.URI. (str "file:///tmp/" index-name))))
|
||||
(let [directory (FSDirectory/open (Paths/get (java.net.URI. (str "file:///tmp/search" (:dd-env env) "/" index-name))))
|
||||
index-reader (DirectoryReader/open directory)
|
||||
index-searcher (IndexSearcher. index-reader)]
|
||||
(for [x (seq (.scoreDocs (.search index-searcher (make-query n) 10)))]
|
||||
(into
|
||||
[(.get (.doc index-searcher (.-doc x)) "id")
|
||||
(.get (.doc index-searcher (.-doc x)) "name")]
|
||||
[(Long/parseLong (.get (.doc index-searcher (.-doc x)) "id"))
|
||||
(.get (.doc index-searcher (.-doc x)) "name")
|
||||
(.-score x)]
|
||||
(map (fn [o]
|
||||
(.get (.doc index-searcher (.-doc x)) o))
|
||||
other-keys)))))
|
||||
)
|
||||
|
||||
(defn search-ids [n index-name]
|
||||
(let [directory (FSDirectory/open (Paths/get (java.net.URI. (str "file:///tmp/" index-name))))
|
||||
(let [directory (FSDirectory/open (Paths/get (java.net.URI. (str "file:///tmp/search" (:dd-env env) "/" index-name))))
|
||||
index-reader (DirectoryReader/open directory)
|
||||
index-searcher (IndexSearcher. index-reader)]
|
||||
(for [x (seq (.scoreDocs (.search index-searcher (make-query n) 100)))]
|
||||
|
||||
Reference in New Issue
Block a user