Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Full-text search: Clear cache if more than 8 entries

Browse Source
This commit is contained in:
gnosygnu
2017-03-23 08:18:31 -04:00
parent c3eca52574
commit 879ef3a7d0
5 changed files with 147 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/specials/Xofulltext_searcher_html.java
View File

@@ -22,9 +22,11 @@ class Xofulltext_searcher_html extends Xow_special_wtr__base implements Mustache
private final boolean case_match, auto_wildcard_bgn, auto_wildcard_end, expand_matches_section, show_all_matches;
private final Hash_adp props = Hash_adp_.New();
public Xofulltext_searcher_html(Xocfg_mgr cfg_mgr, Gfo_qarg_mgr url_args, Xow_wiki wiki, Guid_adp page_guid) {
String search_text = url_args.Read_str_or("search", "");
search_text = String_.Replace(search_text, "_", " "); // xofulltext_searcher.js chains multiple words with "_"; convert back to space
props.Add("search", search_text);
props.Add("page_guid", page_guid.To_str());
props.Add("cur_wiki", wiki.Domain_str());
props.Add("search", url_args.Read_str_or("search", ""));
props_Add(cfg_mgr, url_args, "wikis" , wiki.Domain_str());
props_Add(cfg_mgr, url_args, "ns_ids", "0");
props_Add(cfg_mgr, url_args, "limits", "100");

32
400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/svcs/Xofulltext_searcher_svc.java
View File

@@ -29,7 +29,7 @@ import gplx.xowa.addons.wikis.fulltexts.searchers.mgrs.gflucenes.*;
import gplx.xowa.addons.wikis.fulltexts.searchers.mgrs.brutes.*;
class Xofulltext_searcher_svc implements Gfo_invk {
private final Xoa_app app;
private final Hash_adp wkr_hash = Hash_adp_.New();
private final Ordered_hash wkr_hash = Ordered_hash_.New();
public Xofulltext_searcher_svc(Xoa_app app) {
this.app = app;
}
@@ -38,6 +38,31 @@ class Xofulltext_searcher_svc implements Gfo_invk {
Xofulltext_args_qry prv_args = (Xofulltext_args_qry)wkr_hash.Get_by(page_guid);
if (prv_args != null) {
prv_args.Cancel();
synchronized (wkr_hash) {
wkr_hash.Del(page_guid);
}
}
}
private static void Compress(Ordered_hash wkr_hash) {
int max = 2;
int len = wkr_hash.Len();
if (len > max) {
synchronized (wkr_hash) {
// create list for deleted items; in general, this list will never be more than 1
List_adp deleted = List_adp_.New();
int bgn = len - max;
for (int i = 0; i < bgn; i++) {
Xofulltext_args_qry args = (Xofulltext_args_qry)wkr_hash.Get_at(i);
deleted.Add(args);
}
len = deleted.Len();
for (int i = 0; i < len; i++) {
Xofulltext_args_qry args = (Xofulltext_args_qry)deleted.Get_at(i);
wkr_hash.Del(args.page_guid);
}
}
}
}
public void Search(Json_nde args) {
@@ -47,7 +72,10 @@ class Xofulltext_searcher_svc implements Gfo_invk {
// cancel any existing searches
this.Cancel(search_args.page_guid);
wkr_hash.Add(search_args.page_guid, search_args);
Compress(wkr_hash);
synchronized (wkr_hash) {
wkr_hash.Add(search_args.page_guid, search_args);
}
// autosave any changes if enabled
Xocfg_mgr cfg_mgr = app.Cfg();