diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/Xofulltext_searcher.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/Xofulltext_searcher.java index 0cd354cf2..31b174888 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/Xofulltext_searcher.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/Xofulltext_searcher.java @@ -17,5 +17,6 @@ package gplx.xowa.addons.wikis.fulltexts.searchers.mgrs; import gplx.*; import g import gplx.xowa.addons.wikis.fulltexts.searchers.caches.*; import gplx.xowa.addons.wikis.fulltexts.searchers.mgrs.uis.*; public interface Xofulltext_searcher { + boolean Type_is_lucene(); void Search(Xofulltext_searcher_ui ui, Xow_wiki wiki, Xofulltext_cache_qry qry, Xofulltext_args_qry qry_args, Xofulltext_args_wiki wiki_args); } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/brutes/Xofulltext_searcher__brute.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/brutes/Xofulltext_searcher__brute.java index 994605c32..5c5950121 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/brutes/Xofulltext_searcher__brute.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/brutes/Xofulltext_searcher__brute.java @@ -23,6 +23,7 @@ public class Xofulltext_searcher__brute implements Xofulltext_searcher { private final Xofulltext_finder_mgr finder = new Xofulltext_finder_mgr(); private final Xofulltext_finder_cbk__eval cbk_eval = new Xofulltext_finder_cbk__eval(); private final Xofulltext_finder_cbk__highlight cbk_highlight = new Xofulltext_finder_cbk__highlight(); + public boolean Type_is_lucene() {return false;} public void Search(Xofulltext_searcher_ui ui, Xow_wiki wiki, Xofulltext_cache_qry qry, Xofulltext_args_qry args, Xofulltext_args_wiki wiki_args) { // get pages from db Db_conn page_conn = wiki.Data__core_mgr().Tbl__page().Conn(); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/gflucenes/Xofulltext_searcher__lucene.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/gflucenes/Xofulltext_searcher__lucene.java index c68bb26e3..34716aa40 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/gflucenes/Xofulltext_searcher__lucene.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/gflucenes/Xofulltext_searcher__lucene.java @@ -24,6 +24,7 @@ import gplx.xowa.addons.wikis.fulltexts.searchers.mgrs.uis.*; import gplx.xowa.addons.wikis.fulltexts.searchers.caches.*; public class Xofulltext_searcher__lucene implements Xofulltext_searcher { private final Gflucene_searcher_mgr searcher = new Gflucene_searcher_mgr(); + public boolean Type_is_lucene() {return true;} public void Search(Xofulltext_searcher_ui ui, Xow_wiki wiki, Xofulltext_cache_qry qry, Xofulltext_args_qry args, Xofulltext_args_wiki wiki_args) { // create lists Ordered_hash full_list = Ordered_hash_.New(); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/uis/Xofulltext_searcher_ui.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/uis/Xofulltext_searcher_ui.java index c0cf29e33..a5e9bf2ed 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/uis/Xofulltext_searcher_ui.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/uis/Xofulltext_searcher_ui.java @@ -25,9 +25,10 @@ public class Xofulltext_searcher_ui { this.cbk_mgr = cbk_mgr; this.cbk_trg = cbk_trg; } - public void Send_wiki_add(byte[] wiki, int rng_bgn, int rng_end) { + public void Send_wiki_add(boolean type_is_lucene, byte[] wiki, int rng_bgn, int rng_end) { cbk_mgr.Send_json(cbk_trg, "xo.fulltext_searcher.results__wiki__add__recv", gplx.core.gfobjs.Gfobj_nde.New() .Add_bry("wiki", wiki) + .Add_bool("type_is_lucene", type_is_lucene) .Add_int("rng_bgn", rng_bgn + List_adp_.Base1) .Add_int("rng_end", rng_end) ); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/svcs/Xofulltext_searcher_svc.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/svcs/Xofulltext_searcher_svc.java index 478c9ee91..f01992e40 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/svcs/Xofulltext_searcher_svc.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/svcs/Xofulltext_searcher_svc.java @@ -84,7 +84,8 @@ class Xofulltext_searcher_svc implements Gfo_invk { // get wiki and notify byte[] wiki_domain = wiki_args.wiki; Xow_wiki wiki = app.Wiki_mgri().Get_by_or_make_init_y(wiki_domain); - ui.Send_wiki_add(wiki_domain, wiki_args.bgn, wiki_args.end()); + Xofulltext_searcher searcher = Get_searcher(wiki); + ui.Send_wiki_add(searcher.Type_is_lucene(), wiki_domain, wiki_args.bgn, wiki_args.end()); // try to get from cache byte[] qry_key = args.Qry_key(wiki_domain, wiki_args.ns_ids); @@ -107,8 +108,6 @@ class Xofulltext_searcher_svc implements Gfo_invk { } args.qry_id = qry_id; - // do search - Xofulltext_searcher searcher = Get_searcher(wiki); searcher.Search(ui, wiki, qry, args, wiki_args); ui.Send_done(); }