From e486d139e0768d95d258c44fc32c052fb6139a1a Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Sun, 19 Mar 2017 14:31:37 -0400 Subject: [PATCH] Full-text search: Use mustache templates for html updates --- .../mgrs/gflucenes/Xofulltext_searcher__lucene.java | 1 + .../searchers/specials/Xofulltext_searcher_html.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 41171e6d0..899a60fb9 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 @@ -64,6 +64,7 @@ public class Xofulltext_searcher__lucene implements Xofulltext_searcher { Xofulltext_searcher_page page = new Xofulltext_searcher_page(args.query_id, wiki.Domain_str(), doc_data.page_id, String_.new_u8(doc_data.page_full_db), args.expand_matches_section); ui.Send_page_add(page); } + ui.Send_wiki_update(wiki.Domain_bry(), len + List_adp_.Base1, -1); // create highlighter thread and launch it Xofulltext_highlighter_mgr highlighter_mgr = new Xofulltext_highlighter_mgr(ui, wiki, args, analyzer_data, searcher_data, list); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/specials/Xofulltext_searcher_html.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/specials/Xofulltext_searcher_html.java index 9b104be79..e1182e31e 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/specials/Xofulltext_searcher_html.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/specials/Xofulltext_searcher_html.java @@ -37,7 +37,7 @@ class Xofulltext_searcher_html extends Xow_special_wtr__base { this.namespaces = namespaces; } @Override protected Io_url Get_addon_dir(Xoa_app app) {return Addon_dir(app);} - @Override protected Io_url Get_mustache_fil(Io_url addon_dir) {return addon_dir.GenSubFil_nest("bin", "xofulltext_searcher.template.html");} + @Override protected Io_url Get_mustache_fil(Io_url addon_dir) {return addon_dir.GenSubFil_nest("bin", "xofulltext_searcher.main.template.html");} @Override protected Mustache_doc_itm Bld_mustache_root(Xoa_app app) { return new Xofulltext_searcher_doc ( query, case_match, auto_wildcard_bgn, auto_wildcard_end @@ -51,12 +51,17 @@ class Xofulltext_searcher_html extends Xow_special_wtr__base { Xopg_tag_wtr_.Add__xohelp (head_tags, app.Fsys_mgr().Http_root()); Xopg_tag_wtr_.Add__xolog (head_tags, app.Fsys_mgr().Http_root()); Xopg_tag_wtr_.Add__xoajax (head_tags, app.Fsys_mgr().Http_root(), app); + Xopg_tag_wtr_.Add__xotmpl (head_tags, app.Fsys_mgr().Http_root()); Xopg_tag_wtr_.Add__jquery (head_tags, app.Fsys_mgr().Http_root()); Xopg_tag_wtr_.Add__xonotify (head_tags, app.Fsys_mgr().Http_root()); + Xopg_tag_wtr_.Add__mustache (head_tags, app.Fsys_mgr().Http_root()); Xopg_alertify_.Add_tags (head_tags, app.Fsys_mgr().Http_root()); head_tags.Add(Xopg_tag_itm.New_css_file(addon_dir.GenSubFil_nest("bin", "xofulltext_searcher.css"))); head_tags.Add(Xopg_tag_itm.New_js_file(addon_dir.GenSubFil_nest("bin", "xofulltext_searcher.js"))); + head_tags.Add(Xopg_tag_itm.New_htm_frag(addon_dir.GenSubFil_nest("bin", "xofulltext_searcher.wiki.template.html"), "xofts.wiki")); + head_tags.Add(Xopg_tag_itm.New_htm_frag(addon_dir.GenSubFil_nest("bin", "xofulltext_searcher.page.template.html"), "xofts.page")); + head_tags.Add(Xopg_tag_itm.New_htm_frag(addon_dir.GenSubFil_nest("bin", "xofulltext_searcher.line.template.html"), "xofts.line")); page_data.Js_enabled_y_(); }