diff --git a/400_xowa/src/gplx/xowa/Xoa_app_.java b/400_xowa/src/gplx/xowa/Xoa_app_.java index e8d0988d9..bf54cb1c4 100644 --- a/400_xowa/src/gplx/xowa/Xoa_app_.java +++ b/400_xowa/src/gplx/xowa/Xoa_app_.java @@ -31,7 +31,7 @@ public class Xoa_app_ { } public static final String Name = "xowa"; public static final int Version_id = 524; - public static final String Version = "4.5.3.1703"; + public static final String Version = "4.5.2.1704"; 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/xtns/xowa_cmds/wiki_setups/Xop_wiki_setup_mgr.java b/400_xowa/src/gplx/xowa/xtns/xowa_cmds/wiki_setups/Xop_wiki_setup_mgr.java index fdb318dfe..2472152f2 100644 --- a/400_xowa/src/gplx/xowa/xtns/xowa_cmds/wiki_setups/Xop_wiki_setup_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/xowa_cmds/wiki_setups/Xop_wiki_setup_mgr.java @@ -46,16 +46,17 @@ class Xop_wiki_setup_mgr { private Xows_task_itm[] Make_task_ary(Bry_bfr url_list_bfr, byte[] wiki_domain) { Xobc_task_regy_itm[] task_rows = data_db.Tbl__task_regy().Select_by_wiki(wiki_domain); int len = task_rows.length; - Xows_task_itm[] rv = new Xows_task_itm[len]; + List_adp list = List_adp_.New(); for (int i = 0; i < len; ++i) { Xobc_task_regy_itm task_row = task_rows[i]; + if (task_row.Seqn() == 999990) continue; // ignore 999990 archive rows for en.w; DATE:2017-04-26 Xobc_task_key task_key = Xobc_task_key.To_itm(String_.new_u8(task_row.Key())); String task_key_type = task_key.Task_type_ui(); Xows_file_itm[] files = Make_file_ary(url_list_bfr, wiki_domain, task_row.Id()); - rv[i] = new Xows_task_itm(task_row.Seqn(), wiki_domain, task_row.Name(), Bry_.new_u8(task_key_type), Bry_.new_u8(task_key.Wiki_date_ui()), files); + list.Add(new Xows_task_itm(task_row.Seqn(), wiki_domain, task_row.Name(), Bry_.new_u8(task_key_type), Bry_.new_u8(task_key.Wiki_date_ui()), files)); } - Array_.Sort(rv, new Xows_task_itm_sorter()); - return rv; + list.Sort_by(new Xows_task_itm_sorter()); + return (Xows_task_itm[])list.To_ary_and_clear(Xows_task_itm.class); } private Xows_file_itm[] Make_file_ary(Bry_bfr url_list_bfr, byte[] wiki_domain, int task_id) { Xobc_import_step_itm[] rows = data_db.Tbl__import_step().Select_by_task_id(task_id); diff --git a/400_xowa/src/gplx/xowa/xtns/xowa_cmds/wiki_setups/Xop_wiki_setup_xnde.java b/400_xowa/src/gplx/xowa/xtns/xowa_cmds/wiki_setups/Xop_wiki_setup_xnde.java index 2d0c23283..0bde8ba04 100644 --- a/400_xowa/src/gplx/xowa/xtns/xowa_cmds/wiki_setups/Xop_wiki_setup_xnde.java +++ b/400_xowa/src/gplx/xowa/xtns/xowa_cmds/wiki_setups/Xop_wiki_setup_xnde.java @@ -39,7 +39,6 @@ public class Xop_wiki_setup_xnde implements Xox_xnde, Mwh_atr_itm_owner2 { } public void Xtn_write(Bry_bfr bfr, Xoae_app app, Xop_ctx ctx, Xoh_html_wtr html_wtr, Xoh_wtr_ctx hctx, Xoae_page wpg, Xop_xnde_tkn xnde, byte[] src) { html_wtr.Write_tkn_to_html(bfr, ctx, hctx, root.Root_src(), xnde, Xoh_html_wtr.Sub_idx_null, root); -// } public Xop_root_tkn Xtn_root() {throw Err_.new_unimplemented_w_msg("xowa_wiki_setup.xtn_root should not be called");}