Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-10-27 20:34:16 +00:00
Code Issues Projects Releases Wiki Activity

Personal_wikis: Fix perpetual 'Do you want to upgrade your search databases' when using Search field for personal wikis

Browse Source
This commit is contained in:
gnosygnu 2017-03-29 18:22:00 -04:00
parent e5beacf7c4
commit ff3b65c438
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_upgrade.java
View File

@ -17,14 +17,11 @@ package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.xowa.*; i
import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.dbs.*; import gplx.dbs.cfgs.*;
public class Srch_db_upgrade { public class Srch_db_upgrade {
private final Xow_wiki wiki; private final Xow_wiki wiki;
private boolean upgrade_prompted;
public Srch_db_upgrade(Xow_wiki wiki, Srch_db_mgr search_db_mgr) { public Srch_db_upgrade(Xow_wiki wiki, Srch_db_mgr search_db_mgr) {
this.wiki = wiki; this.wiki = wiki;
} }
public void Upgrade() { public void Upgrade() {
if (!wiki.App().Mode().Tid_is_gui()) return; // ignore if html-server or drd-app if (!wiki.App().Mode().Tid_is_gui()) return; // ignore if html-server or drd-app
if (upgrade_prompted) return;
upgrade_prompted = true;
Xoae_app app = ((Xoae_app)wiki.App()); Xoae_app app = ((Xoae_app)wiki.App());
boolean ok = app.Gui_mgr().Kit().Ask_ok_cancel("", "", String_.Concat_lines_nl_skip_last boolean ok = app.Gui_mgr().Kit().Ask_ok_cancel("", "", String_.Concat_lines_nl_skip_last
( "XOWA would like to upgrade your search database for " + wiki.Domain_str() + "." ( "XOWA would like to upgrade your search database for " + wiki.Domain_str() + "."

5
400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java
View File

@ -29,6 +29,7 @@ public class Srch_search_mgr implements Gfo_invk {
private final Srch_search_cmd[] cur_cmds; private final Srch_search_cmd[] cur_cmds;
private final Object mutex = new Object(); private final Object mutex = new Object();
private int search_count; private int search_count;
private boolean upgrade_prompted;
public Srch_search_mgr(Srch_search_addon addon, Xow_wiki wiki, Srch_text_parser parser) { public Srch_search_mgr(Srch_search_addon addon, Xow_wiki wiki, Srch_text_parser parser) {
this.addon = addon; this.wiki = wiki; this.addon = addon; this.wiki = wiki;
crt_parser = new Srch_crt_parser(Srch_crt_scanner_syms.Dflt); // NOTE: hard-coded to dflt; should change to use qry.Phrase.Syms, but requires more work crt_parser = new Srch_crt_parser(Srch_crt_scanner_syms.Dflt); // NOTE: hard-coded to dflt; should change to use qry.Phrase.Syms, but requires more work
@ -49,7 +50,9 @@ public class Srch_search_mgr implements Gfo_invk {
if (qry.Phrase.Orig.length == 0) return; if (qry.Phrase.Orig.length == 0) return;
// handle obsolete search dbs; // handle obsolete search dbs;
if (addon.Db_mgr().Cfg().Version_id__needs_upgrade()) { if (addon.Db_mgr().Cfg().Version_id__needs_upgrade()
&& !upgrade_prompted) {
upgrade_prompted = true;
Srch_db_upgrade upgrade_mgr = new Srch_db_upgrade(wiki, addon.Db_mgr()); Srch_db_upgrade upgrade_mgr = new Srch_db_upgrade(wiki, addon.Db_mgr());
upgrade_mgr.Upgrade(); upgrade_mgr.Upgrade();
return; return;