From b01b85fcc186cc4eca1d2ed03cc6f8a74b8de5db Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Tue, 28 Mar 2017 22:25:25 -0400 Subject: [PATCH] Full-text search: Upgrade oojs-ui and other minor changes --- 400_xowa/src/gplx/xowa/Xoa_app_.java | 4 ++-- 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_tst.java | 2 +- .../xowa/bldrs/setups/maints/Wmf_dump_list_parser_tst.java | 2 +- 400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_itm__pgbnr.java | 2 +- 400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/400_xowa/src/gplx/xowa/Xoa_app_.java b/400_xowa/src/gplx/xowa/Xoa_app_.java index 22a7e9598..6efe26a6f 100644 --- a/400_xowa/src/gplx/xowa/Xoa_app_.java +++ b/400_xowa/src/gplx/xowa/Xoa_app_.java @@ -30,8 +30,8 @@ public class Xoa_app_ { } } public static final String Name = "xowa"; - public static final int Version_id = 520; - public static final String Version = "4.4.2.1703"; + public static final int Version_id = 521; + public static final String Version = "4.5.0.1703"; public static String Build_date = "2012-12-30 00:00:00"; public static String Build_date_fmt = "yyyy-MM-dd HH:mm:ss"; public static String Op_sys_str; diff --git a/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_tst.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_tst.java index b2d138a08..5357a226d 100644 --- a/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_tst.java +++ b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_tst.java @@ -20,7 +20,7 @@ import gplx.core.brys.args.*; import gplx.core.threads.*; import gplx.xowa.bldrs import gplx.xowa.wikis.domains.*; import gplx.xowa.bldrs.wms.*; import gplx.xowa.bldrs.wms.dumps.*; public class Xoi_cmd_wiki_tst { - @Test public void Run() { // MAINT:2016-12-04 + @Test public void Run() { // MAINT:2017-03-28 // Bld_import_list(Xow_domain_regy.All); // Bld_cfg_files(Xow_domain_regy.All); // NOTE: remember to carry over the wikisource / page / index commands from the existing xowa_build_cfg.gfs; also, only run the xowa_build_cfg.gfs once; DATE:2013-10-15; last run: DATE:2014-09-09 } diff --git a/400_xowa/src/gplx/xowa/bldrs/setups/maints/Wmf_dump_list_parser_tst.java b/400_xowa/src/gplx/xowa/bldrs/setups/maints/Wmf_dump_list_parser_tst.java index 76fd2ffc6..36ef5bb21 100644 --- a/400_xowa/src/gplx/xowa/bldrs/setups/maints/Wmf_dump_list_parser_tst.java +++ b/400_xowa/src/gplx/xowa/bldrs/setups/maints/Wmf_dump_list_parser_tst.java @@ -39,7 +39,7 @@ public class Wmf_dump_list_parser_tst { , fxt.itm("zh-classicalwiki", "20131128", Wmf_dump_itm.Status_tid_complete, "Dump complete", "2013-11-28 06:08:56") ); } -// @Test public void Update() { // MAINT:QUARTERLY:2016-10-13; must run home/wiki/Dashboard/Wiki_maintenance and click "update dump status" +// @Test public void Update() { // MAINT:QUARTERLY:2017-03-28; COUNT=830; must run home/wiki/Dashboard/Wiki_maintenance and click "update dump status" // Hash_adp_bry excluded_domains = Hash_adp_bry.cs().Add_many_str // ( "advisory.wikipedia.org", "beta.wikiversity.org", "donate.wikipedia.org", "login.wikipedia.org" // , "nostalgia.wikipedia.org", "outreach.wikipedia.org", "quality.wikipedia.org", "sources.wikipedia.org" diff --git a/400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_itm__pgbnr.java b/400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_itm__pgbnr.java index f135d7600..5d5e0d4ac 100644 --- a/400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_itm__pgbnr.java +++ b/400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_itm__pgbnr.java @@ -20,7 +20,7 @@ public class Xoh_head_itm__pgbnr extends Xoh_head_itm__base { @Override public int Flags() {return Flag__css_include;} @Override public void Write_css_include(Xoae_app app, Xowe_wiki wiki, Xoae_page page, Xoh_head_wtr wtr) { if (Url__css__styles == null) { - Url__css__oojs_ui = app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "lib", "oojs-ui", "oojs-ui-mediawiki.css").To_http_file_bry(); // needed for icons; should move to own file + Url__css__oojs_ui = app.Fsys_mgr().Bin_any_dir().GenSubFil_nest("xowa", "html", "res", "lib", "oojs-ui", "oojs-ui-core-mediawiki.css").To_http_file_bry(); // needed for icons; should move to own file Io_url resources_dir = app.Fsys_mgr().Bin_any_dir().GenSubDir_nest("xowa", "xtns", "WikidataPageBanner", "resources"); Url__css__styles = resources_dir.GenSubFil_nest("ext.WikidataPageBanner.styles" , "ext.WikidataPageBanner.css").To_http_file_bry(); Url__css__toc = resources_dir.GenSubFil_nest("ext.WikidataPageBanner.toc.styles" , "ext.WikidataPageBanner.toc.css").To_http_file_bry(); diff --git a/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java b/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java index 178b149a9..d70143271 100644 --- a/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java +++ b/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_wtr_.java @@ -65,7 +65,7 @@ public class Xopg_tag_wtr_ { } public static void Add__ooui(Xopg_tag_mgr head_tags, Io_url http_root) { Io_url dir = http_root.GenSubDir_nest("bin", "any", "xowa", "html", "res", "lib", "oojs-ui"); - head_tags.Add(Xopg_tag_itm.New_css_file(dir.GenSubFil_nest("oojs-ui-mediawiki.css"))); + head_tags.Add(Xopg_tag_itm.New_css_file(dir.GenSubFil_nest("oojs-ui-core-mediawiki.css"))); } private static String Get_app_js_file(Xoa_app app) { if (app.Mode().Tid_is_http()) return "xo.app.http_server.js";