From 1d509aa232a25cad57e177cb69498dda01372ee0 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Thu, 2 Mar 2017 10:12:40 -0500 Subject: [PATCH] Full-text search: Send page_id and encode page_titles --- .../searchs/fulltexts/cbks/Xosearch_fulltext_svc.java | 5 +++-- .../finders/Xosearch_finder_cbk__highlight.java | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/fulltexts/cbks/Xosearch_fulltext_svc.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/fulltexts/cbks/Xosearch_fulltext_svc.java index 4984ba9cd..691cf0357 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/fulltexts/cbks/Xosearch_fulltext_svc.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/fulltexts/cbks/Xosearch_fulltext_svc.java @@ -72,10 +72,11 @@ class Xosearch_fulltext_svc implements Gfo_invk { Xoa_ttl ttl = wiki.Ttl_parse(ns_id, ttl_bry); if (found <= max_pages_per_wiki) { - cbk_highlight.Init(wiki, ttl, max_snips_per_page); + cbk_highlight.Init(wiki, page_id, max_snips_per_page); app.Gui__cbk_mgr().Send_json(cbk_trg, "xo.search_fulltext.results__page__add__recv", gplx.core.gfobjs.Gfobj_nde.New() .Add_bry("wiki", wiki.Domain_bry()) - .Add_bry("page", ttl.Full_db()) + .Add_int("page_id", page_id) + .Add_bry("page_ttl", ttl.Full_db()) .Add_int("found", 0) ); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/fulltexts/finders/Xosearch_finder_cbk__highlight.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/fulltexts/finders/Xosearch_finder_cbk__highlight.java index 58ea74638..34b84c319 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/fulltexts/finders/Xosearch_finder_cbk__highlight.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/fulltexts/finders/Xosearch_finder_cbk__highlight.java @@ -19,7 +19,7 @@ public class Xosearch_finder_cbk__highlight implements Xosearch_finder_cbk { private final Xog_cbk_trg cbk_trg; private final Xoa_app app; private Xow_wiki wiki; - private Xoa_ttl ttl; + private int page_id; private final Bry_bfr tmp_bfr = Bry_bfr_.New(); public int found; private int max_snips_per_page; @@ -27,9 +27,9 @@ public class Xosearch_finder_cbk__highlight implements Xosearch_finder_cbk { this.app = app; this.cbk_trg = cbk_trg; } - public void Init(Xow_wiki wiki, Xoa_ttl ttl, int max_snips_per_page) { + public void Init(Xow_wiki wiki, int page_id, int max_snips_per_page) { this.wiki = wiki; - this.ttl = ttl; + this.page_id = page_id; this.max_snips_per_page = max_snips_per_page; found = 0; } @@ -63,14 +63,14 @@ public class Xosearch_finder_cbk__highlight implements Xosearch_finder_cbk { // send notification app.Gui__cbk_mgr().Send_json(cbk_trg, "xo.search_fulltext.results__line__add__recv", gplx.core.gfobjs.Gfobj_nde.New() .Add_bry("wiki", wiki.Domain_bry()) - .Add_bry("page", ttl.Full_db()) + .Add_int("page_id", page_id) .Add_int("line", found) .Add_bry("html", tmp_bfr.To_bry_and_clear()) ); } app.Gui__cbk_mgr().Send_json(cbk_trg, "xo.search_fulltext.results__page__update__recv", gplx.core.gfobjs.Gfobj_nde.New() .Add_bry("wiki", wiki.Domain_bry()) - .Add_bry("page", ttl.Full_db()) + .Add_int("page_id", page_id) .Add_int("found", found) ); }