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

Wikis: Support renamed folders and different langs

Browse Source
This commit is contained in:
gnosygnu 2017-02-08 22:22:32 -05:00
parent 4dba081399
commit 0cdd3d437f
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
400_xowa/src/gplx/xowa/Xoa_app_.java
View File

@ -33,7 +33,7 @@ public class Xoa_app_ {
} }
public static final String Name = "xowa"; public static final String Name = "xowa";
public static final int Version_id = 514; public static final int Version_id = 514;
public static final String Version = "4.1.2.1702"; // RELEASE:2017-01-03 20:30 public static final String Version = "4.1.3.1702"; // RELEASE:2017-01-03 20:30
public static String Build_date = "2012-12-30 00:00:00"; 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 Build_date_fmt = "yyyy-MM-dd HH:mm:ss";
public static String Op_sys_str; public static String Op_sys_str;

7
400_xowa/src/gplx/xowa/Xowe_wiki.java
View File

@ -87,7 +87,7 @@ public class Xowe_wiki implements Xow_wiki, Gfo_invk, Gfo_evt_itm {
public Xoa_ttl Ttl_parse(int ns_id, byte[] ttl) {return Xoa_ttl.Parse(this, ns_id, ttl);} public Xoa_ttl Ttl_parse(int ns_id, byte[] ttl) {return Xoa_ttl.Parse(this, ns_id, ttl);}
public boolean Type_is_edit() {return Bool_.Y;} public boolean Type_is_edit() {return Bool_.Y;}
public Xoa_app App() {return app;} public Xoa_app App() {return app;}
public Xol_lang_itm Lang() {return lang;} private final Xol_lang_itm lang; public Xol_lang_itm Lang() {return lang;} private Xol_lang_itm lang;
public Xol_case_mgr Case_mgr() {return lang.Case_mgr();} public Xol_case_mgr Case_mgr() {return lang.Case_mgr();}
public byte[] Domain_bry() {return domain_bry;} private final byte[] domain_bry; public byte[] Domain_bry() {return domain_bry;} private final byte[] domain_bry;
public String Domain_str() {return domain_str;} private final String domain_str; public String Domain_str() {return domain_str;} private final String domain_str;
@ -191,12 +191,17 @@ public class Xowe_wiki implements Xow_wiki, Gfo_invk, Gfo_evt_itm {
try { try {
byte[] cfg_domain_bry = db_mgr_sql.Core_data_mgr().Db__core().Tbl__cfg().Select_bry("xowa.bldr.session", "wiki_domain"); byte[] cfg_domain_bry = db_mgr_sql.Core_data_mgr().Db__core().Tbl__cfg().Select_bry("xowa.bldr.session", "wiki_domain");
if (!Bry_.Eq(cfg_domain_bry, domain_bry)) { if (!Bry_.Eq(cfg_domain_bry, domain_bry)) {
// set wikidata vars
Xow_domain_itm cfg_domain_itm = Xow_domain_itm_.parse(cfg_domain_bry); Xow_domain_itm cfg_domain_itm = Xow_domain_itm_.parse(cfg_domain_bry);
this.wdata_wiki_tid = cfg_domain_itm.Domain_type_id(); this.wdata_wiki_tid = cfg_domain_itm.Domain_type_id();
this.wdata_wiki_lang = cfg_domain_itm.Lang_orig_key(); this.wdata_wiki_lang = cfg_domain_itm.Lang_orig_key();
Bry_bfr bfr = Bry_bfr_.New(); Bry_bfr bfr = Bry_bfr_.New();
Xow_abrv_wm_.To_abrv(bfr, wdata_wiki_lang, Int_obj_ref.New(wdata_wiki_tid)); Xow_abrv_wm_.To_abrv(bfr, wdata_wiki_lang, Int_obj_ref.New(wdata_wiki_tid));
this.wdata_wiki_abrv = bfr.To_bry_and_clear(); this.wdata_wiki_abrv = bfr.To_bry_and_clear();
// set lang; handles "German Wikipedia" for "de.wikipedia.org"
this.lang = app.Lang_mgr().Get_by_or_load(cfg_domain_itm.Lang_actl_key());
this.msg_mgr.Lang_(lang);
} }
} catch (Exception e) { } catch (Exception e) {
Gfo_usr_dlg_.Instance.Warn_many("", "", "db.init: failed to get domain from config; err=~{0}", Err_.Message_gplx_log(e)); Gfo_usr_dlg_.Instance.Warn_many("", "", "db.init: failed to get domain from config; err=~{0}", Err_.Message_gplx_log(e));

8
400_xowa/src/gplx/xowa/addons/bldrs/centrals/tasks/Xobc_task_regy__work.java
View File

@ -49,10 +49,10 @@ public class Xobc_task_regy__work extends Xobc_task_regy__base {
} }
public void Run_task(Xobc_task_itm task, Xobc_cmd_itm cmd) { public void Run_task(Xobc_task_itm task, Xobc_cmd_itm cmd) {
// if task marked for skip, launch skip-cmd on separate thread and exit; // if task marked for skip, launch skip-cmd on separate thread and exit;
if (task_mgr.Skip_mgr().Should_skip(task_mgr.Data_db().Tbl__import_step().Select_one(cmd.Step_id()))) { // if (task_mgr.Skip_mgr().Should_skip(task_mgr.Data_db().Tbl__import_step().Select_one(cmd.Step_id()))) {
thread_mgr.Add("skip_" + cmd.Cmd_uid(), Thread_adp_.Start_by_key("skip_xobc: " + cmd.Cmd_name(), new Xobc_task_skip(this, cmd), "")); // thread_mgr.Add("skip_" + cmd.Cmd_uid(), Thread_adp_.Start_by_key("skip_xobc: " + cmd.Cmd_name(), new Xobc_task_skip(this, cmd), ""));
return; // return;
} // }
task.Task_status_(gplx.core.progs.Gfo_prog_ui_.Status__working); task.Task_status_(gplx.core.progs.Gfo_prog_ui_.Status__working);
task_mgr.Send_json("xo.bldr.work.prog__start__recv", task.Save_to(Gfobj_nde.New())); task_mgr.Send_json("xo.bldr.work.prog__start__recv", task.Save_to(Gfobj_nde.New()));