v2.10.3.1

400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_itm.java

@@ -26,10 +26,10 @@ public class Xol_vnt_itm implements GfoInvkAble {
 	public byte[]					Key() {return key;} private final byte[] key;										// EX: zh-cn
 	public byte[]					Name() {return name;} private final byte[] name;										// EX: 大陆简体
 	public boolean						Visible() {return visible;} private boolean visible = true;								// visible in menu
-	public byte[][]					Fallback_ary() {return fallback_ary;} private byte[][] fallback_ary = Bry_.Ary_empty;	// EX: zh-hans|zh
-	public int						Dir() {return dir;} private int dir = Xol_vnt_dir_.Tid__bi;								// EX: "bidirectional"
 	public int						Mask__vnt() {return mask__vnt;} private final int mask__vnt;							// EX: 8
 	public int						Mask__fallbacks() {return mask_fallbacks;} private int mask_fallbacks;					// EX: 11 for zh,zh-hans,zh-cn
+	public int						Dir() {return dir;} private int dir = Xol_vnt_dir_.Tid__bi;								// EX: "bidirectional"
+	public byte[][]					Fallback_ary() {return fallback_ary;} private byte[][] fallback_ary = Bry_.Ary_empty;	// EX: zh-hans|zh
 	public byte[][]					Convert_ary() {return convert_ary;} private byte[][] convert_ary = Bry_.Ary_empty;		// EX: zh-hans|zh-cn
 	public Xol_convert_wkr			Convert_wkr() {return convert_wkr;} private final Xol_convert_wkr convert_wkr;
 	public void						Visible_(boolean v) {this.visible = v;}
@@ -37,12 +37,12 @@ public class Xol_vnt_itm implements GfoInvkAble {
 	public void Init(int dir, byte[][] fallback_ary) {
 		this.dir = dir; this.fallback_ary = fallback_ary;
 	}
-	public void Mask__fallbacks__calc(Xol_vnt_regy regy, byte[][] ary) {
+	public void Mask__fallbacks_(Xol_vnt_regy regy, byte[][] ary) {
 		this.mask_fallbacks = regy.Mask__calc(Bry_.Ary_add(Bry_.Ary(key), ary));// NOTE: must add lang.key which is not part of fallback; EX: "zh-cn" has fallback of "zh-hans", but chain should calc "zh-cn","zh-hans"
 	}
 	public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
 		if		(ctx.Match(k, Invk_fallbacks_))			fallback_ary = Bry_split_.Split(m.ReadBry("v"), Byte_ascii.Pipe);
-		else if	(ctx.Match(k, Invk_converts_))			convert_ary  = Bry_split_.Split(m.ReadBry("v"), Byte_ascii.Pipe);
+		else if	(ctx.Match(k, Invk_converts_))			Convert_ary_(Bry_split_.Split(m.ReadBry("v"), Byte_ascii.Pipe));
 		else if	(ctx.Match(k, Invk_dir_))				dir = Xol_vnt_dir_.Parse(m.ReadBry("v"));
 		else	return GfoInvkAble_.Rv_unhandled;
 		return this;

400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_itm_sorter.java

@@ -1,38 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
-import gplx.xowa.parsers.vnts.*;
-class Xol_vnt_itm_sorter__rule implements gplx.lists.ComparerAble {
-	private Hash_adp hash;
-	public void Sort(Hash_adp hash, Xop_vnt_rule_tkn[] ary) {
-		synchronized (hash) {
-			this.hash = hash;
-			Array_.Sort(ary, this);
-		}
-	}
-	public int compare(Object lhsObj, Object rhsObj) {
-		return -Int_.Compare(To_mask(lhsObj), To_mask(rhsObj));	// - to sort by descending order; "more specific" vnts are at end of list;
-	}
-	private int To_mask(Object o) {
-		int rv = -1;
-		Xop_vnt_rule_tkn rule = (Xop_vnt_rule_tkn)o; if (rule == null) return rv;
-		Xol_vnt_itm itm = (Xol_vnt_itm)hash.Get_by(rule.Rule_lang()); if (itm == null) return rv;
-		return itm.Mask__vnt();
-	}
-        public static final Xol_vnt_itm_sorter__rule I = new Xol_vnt_itm_sorter__rule(); Xol_vnt_itm_sorter__rule() {}
-}

400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_mgr.java

@@ -16,17 +16,20 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
-import gplx.xowa.langs.vnts.converts.*;
-import gplx.xowa.parsers.vnts.*;
+import gplx.xowa.langs.vnts.converts.*; import gplx.xowa.parsers.vnts.*;
 public class Xol_vnt_mgr implements GfoInvkAble {
-	public Xol_vnt_mgr(Xol_lang lang) {this.lang = lang;}
-	public Xol_lang					Lang() {return lang;} private final Xol_lang lang;
-	public boolean						Enabled() {return enabled;} private boolean enabled = false;
-	public Xol_vnt_regy				Regy() {return regy;} private final Xol_vnt_regy regy = new Xol_vnt_regy();	// EX:zh;zh-hans;zh-hant;zh-cn;zh-hk;zh-mo;zh-sg;zh-tw
-	public byte[]					Cur_key() {return cur_key;} private byte[] cur_key;								// EX:zh-cn
-	public Xol_vnt_itm				Cur_itm() {return cur_itm;} private Xol_vnt_itm cur_itm;
+	public Xol_vnt_mgr(Xol_lang_itm lang) {
+		this.lang = lang;
+		this.convert_lang = new Vnt_convert_lang(convert_mgr, regy);
+	}
+	public Xol_lang_itm				Lang() {return lang;} private final Xol_lang_itm lang;
 	public Xol_convert_mgr			Convert_mgr() {return convert_mgr;} private final Xol_convert_mgr convert_mgr = new Xol_convert_mgr();
+	public Vnt_convert_lang			Convert_lang() {return convert_lang;} private final Vnt_convert_lang convert_lang;
+	public Xol_vnt_regy				Regy() {return regy;} private final Xol_vnt_regy regy = new Xol_vnt_regy();	// EX:zh;zh-hans;zh-hant;zh-cn;zh-hk;zh-mo;zh-sg;zh-tw
+	public Xol_vnt_itm				Cur_itm() {return cur_itm;} private Xol_vnt_itm cur_itm;						// EX:zh-cn
+	public boolean						Enabled() {return enabled;} private boolean enabled = false;
 	public String					Html__lnki_style() {return html__lnki_style;} private String html__lnki_style = "";	// style for showing vnt lnkis in different colors
+	public void						Enabled_(boolean v) {this.enabled = v;}	// TEST
 	public Xol_vnt_itm				Regy__get_or_new(byte[] key) {
 		Xol_vnt_itm rv = regy.Get_by(key);
 		if (rv == null) {
@@ -36,6 +39,18 @@ public class Xol_vnt_mgr implements GfoInvkAble {
 		}
 		return rv;
 	}
+	public void Cur_itm_(byte[] v) {
+		this.cur_itm = regy.Get_by(v); if (cur_itm == null) throw Err_.new_("lang.vnt", "vnt not found", "key", v);
+	} 
+	public void Init_end() {
+		int len = regy.Len();
+		for (int i = 0; i < len; ++i) {	// calc fallback_flag; needs to be run after all items added, b/c "zh-cn" added before "zh-sg" but "zh-cn" can have "zh-sg" as fallback
+			Xol_vnt_itm itm = regy.Get_at(i);
+			Xol_lang_itm vnt_lang = lang.Lang_mgr().Get_by_or_load(itm.Key());	// load vnt's language in order to get fallback; EX: "zh-mo" to get "zh-hant|zh-hk|zh-tw"
+			itm.Mask__fallbacks_(regy, vnt_lang.Fallback_bry_ary());
+		}
+		convert_mgr.Init(regy);			// needs to run at end b/c converts are added one at a time
+	}		
 	private void Limit_visibility(byte[][] ary) {
 		int regy_len = regy.Len();
 		for (int i = 0; i < regy_len; ++i)
@@ -44,29 +59,11 @@ public class Xol_vnt_mgr implements GfoInvkAble {
 		for (int i = 0; i < ary_len; ++i)
 			regy.Get_by(ary[i]).Visible_(Bool_.Y);
 	}
-	public void Cur_vnt_(byte[] v) {
-		this.cur_itm = regy.Get_by(v); if (v == null) throw Err_.new_("lang.vnt", "vnt not found", "key", v);
-		this.cur_key = v;
-		convert_mgr.Cur_vnt_(v);
-	} 
-	public void Init_by_wiki(Xowe_wiki wiki) {
-		if (!enabled) return;
-		Xop_vnt_lxr_.Init(wiki);
-	}
-	public void Init_end() {
-		int len = regy.Len();
-		for (int i = 0; i < len; ++i) {	// calc fallback_flag; needs to be run after all items added, b/c "zh-cn" added before "zh-sg" but "zh-cn" can have "zh-sg" as fallback
-			Xol_vnt_itm itm = regy.Get_at(i);
-			Xol_lang vnt_lang = lang.Lang_mgr().Get_by_key_or_load(itm.Key());	// load vnt's language in order to get fallback; EX: "zh-mo" to get "zh-hant|zh-hk|zh-tw"
-			itm.Mask__fallbacks__calc(regy, vnt_lang.Fallback_bry_ary());
-		}
-		convert_mgr.Init(regy);			// needs to run at end b/c converts are added one at a time
-	}		
 	public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
 		if		(ctx.Match(k, Invk_get))					return Regy__get_or_new(m.ReadBry("v"));
 		else if	(ctx.Match(k, Invk_init_end))				Init_end();
 		else if	(ctx.Match(k, Invk_vnt_grp_))				Limit_visibility(m.ReadBryAry("v", Byte_ascii.Pipe));
-		else if	(ctx.Match(k, Invk_cur_vnt_))				Cur_vnt_(m.ReadBry("v"));
+		else if	(ctx.Match(k, Invk_cur_vnt_))				Cur_itm_(m.ReadBry("v"));
 		else if	(ctx.Match(k, Invk_html_style_))			html__lnki_style = m.ReadStr("v");
 		else	return GfoInvkAble_.Rv_unhandled;
 		return this;

400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_regy.java

@@ -48,9 +48,9 @@ public class Xol_vnt_regy {
 		}
 		return rv;
 	}
-	public boolean Mask__match_any(int lhs, int rhs) {		// EX: match "zh-cn|zh-hans|zh-hant" against "zh|zh-hans|zh-hant"			
+	public boolean Mask__match_any(int lhs, int rhs) {			// EX: match "zh-cn|zh-hans|zh-hant" against "zh|zh-hans|zh-hant"			
 		for (int i = 0; i < hash_len; ++i) {
-			int mask = gplx.core.brys.Bit_.Get_flag(i);	// 1,2,4,8
+			int mask = gplx.core.brys.Bit_.Get_flag(i);		// 1,2,4,8
 			if (Bitmask_.Has_int(lhs, mask)) {				// lhs has mask; EX: for lhs=6, mask=1 -> 'n'; mask=2 -> 'y'
 				if (Bitmask_.Has_int(rhs, mask))			// if rhs does not have mask, return false;
 					return true;
@@ -58,5 +58,4 @@ public class Xol_vnt_regy {
 		}
 		return false;	// should only occur when len = 0;
 	}
-	public void Mask__sort(Xop_vnt_rule_tkn... ary)	{Xol_vnt_itm_sorter__rule.I.Sort(hash, ary);}
 }

400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_regy_fxt.java

@@ -32,15 +32,14 @@ public class Xol_vnt_regy_fxt {
 	public void Test_calc(String[] ary, int expd) {
 		Tfds.Eq(expd, mgr.Mask__calc(Bry_.Ary(ary)));
 	}
-	public void Test_sort(String[] vnt_ary, String[] expd) {
-		int vnt_len = vnt_ary.length;
-		Xop_vnt_rule_tkn[] rule_ary = new Xop_vnt_rule_tkn[vnt_len];
-		for (int i = 0; i < vnt_len; ++i)
-			rule_ary[i] = new Xop_vnt_rule_tkn(Bry_.Empty, Bry_.new_u8(vnt_ary[i]), gplx.xowa.parsers.Xop_tkn_itm_.Ary_empty);
-		mgr.Mask__sort(rule_ary);
-		for (int i = 0; i < vnt_len; ++i)
-			vnt_ary[i] = String_.new_u8(rule_ary[i].Rule_lang());
-		Tfds.Eq_ary_str(expd, vnt_ary);
+	public static void Init__vnt_mgr(Xol_vnt_mgr vnt_mgr, int cur_idx, String[] ary) {
+		int len = ary.length;
+		for (int i = 0; i < len; ++i) {
+			Xol_vnt_itm itm = vnt_mgr.Regy__get_or_new(Bry_.new_a7(ary[i]));
+			vnt_mgr.Lang().Lang_mgr().Get_by_or_load(itm.Key()).Fallback_bry_(Bry_.new_a7("zh-hans,zh-hant"));
+		}
+		vnt_mgr.Init_end();
+		vnt_mgr.Cur_itm_(Bry_.new_a7(ary[cur_idx]));
 	}
 	public static Xol_vnt_regy new_chinese() {	// REF.MW:/languages/classes/LanguageZh.php|LanguageZh|__construct
 		Xol_vnt_regy rv = new Xol_vnt_regy();

400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_regy_tst.java

@@ -46,8 +46,4 @@ public class Xol_vnt_regy_tst {
 		, String_.Ary("zh", "zh-hant", "zh-hans")
 		);
 	}
-	@Test  public void Sort() {
-		fxt.Test_sort(String_.Ary("zh"								)	, String_.Ary("zh"));
-		fxt.Test_sort(String_.Ary("zh", "zh-hans", "zh-cn"			)	, String_.Ary("zh-cn", "zh-hans", "zh"));
-	}
 }

400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_grp.java

@@ -16,8 +16,9 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.langs.vnts.converts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; import gplx.xowa.langs.vnts.*;
+import gplx.xowa.langs.parsers.*;
 public class Xol_convert_grp implements GfoInvkAble {// group of convert_itm by vnt; EX:  zh-hant {A -> A1; B -> B1}
-	private final Ordered_hash hash = Ordered_hash_.new_bry_();
+	private final Ordered_hash hash = Ordered_hash_.New_bry();
 	public Xol_convert_grp(byte[] key) {this.key = key;}
 	public byte[]				Key()							{return key;} private final byte[] key;
 	public int					Len()							{return hash.Count();}
@@ -32,7 +33,7 @@ public class Xol_convert_grp implements GfoInvkAble {// group of convert_itm by
 		int len = raw.length;
 		int pos = 0, fld_bgn = 0, fld_idx = 0;
 		byte[] src = Bry_.Empty, trg = Bry_.Empty;
-		Xol_csv_parser csv_parser = Xol_csv_parser._;
+		Xol_csv_parser csv_parser = Xol_csv_parser.Instance;
 		while (true) {
 			boolean last = pos == len;
 			byte b = last ? Byte_ascii.Nl : raw[pos];

400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_mgr.java

@@ -16,36 +16,21 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.langs.vnts.converts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; import gplx.xowa.langs.vnts.*;
-import gplx.xowa.nss.*; import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.data.tbls.*;
 public class Xol_convert_mgr {
-	private final Ordered_hash tmp_page_list = Ordered_hash_.new_bry_();
-	private int wkr_ary_len, cur_wkr_idx = -1;
+	private final Ordered_hash tmp_page_list = Ordered_hash_.New_bry();		
 	public Xol_convert_regy			Converter_regy() {return converter_regy;} private final Xol_convert_regy converter_regy = new Xol_convert_regy();
-	public Xol_convert_wkr[]		Converter_ary() {return wkr_ary;} private Xol_convert_wkr[] wkr_ary; 
+	public Xol_convert_wkr[]		Converter_ary() {return wkr_ary;} private Xol_convert_wkr[] wkr_ary;  private int wkr_ary_len;
 	public void Init(Xol_vnt_regy regy) {
 		int len = regy.Len();
 		this.wkr_ary_len = len;
 		this.wkr_ary = new Xol_convert_wkr[len];
 		for (int i = 0; i < len; i++) {
 			Xol_vnt_itm itm = regy.Get_at(i);
-			itm.Convert_wkr().Rebuild(converter_regy, itm.Convert_ary());
+			itm.Convert_wkr().Init(converter_regy, itm.Convert_ary());
 			wkr_ary[i] = itm.Convert_wkr();
 		}
 	}
-	public void Cur_vnt_(byte[] cur_vnt) {
-		int new_wkr_idx = -1;
-		for (int i = 0; i < wkr_ary_len; i++) {
-			Xol_convert_wkr wkr = wkr_ary[i];
-			if (Bry_.Eq(cur_vnt, wkr.Key())) {
-				new_wkr_idx = i;
-				break;
-			}
-		}
-		if (new_wkr_idx == -1) throw Err_.new_("lang.vnt", "unknown vnt", "key", cur_vnt);
-		this.cur_wkr_idx = new_wkr_idx;
-	}
-	public byte[] Convert_text(byte[] src) {return Convert_text(src, 0, src.length);}
-	public byte[] Convert_text(byte[] src, int bgn, int end) {return Convert_text(cur_wkr_idx, src, bgn, end);}
 	public byte[] Convert_text(int vnt_idx, byte[] src, int bgn, int end) {
 		Bry_bfr tmp_bfr = Xoa_app_.Utl__bfr_mkr().Get_m001();
 		Xol_convert_wkr converter = wkr_ary[vnt_idx];
@@ -54,16 +39,17 @@ public class Xol_convert_mgr {
 	}
 	public Xowd_page_itm Convert_ttl(Xowe_wiki wiki, Xoa_ttl ttl) {return Convert_ttl(wiki, ttl.Ns(), ttl.Page_db());}	// NOTE: not Full_db as ttl.Ns is passed; EX:Шаблон:Šablon:Jez-eng; PAGE:sr.w:ДНК DATE:2014-07-06
 	public Xowd_page_itm Convert_ttl(Xowe_wiki wiki, Xow_ns ns, byte[] ttl_bry) {
-		Bry_bfr tmp_bfr = wiki.Utl__bfr_mkr().Get_b512();
+		Bry_bfr tmp_bfr = Xoa_app_.Utl__bfr_mkr().Get_b512();
 		Xowd_page_itm rv = Convert_ttl(wiki, tmp_bfr, ns, ttl_bry);
 		tmp_bfr.Mkr_rls();
 		return rv;
 	}
-	public Xowd_page_itm Convert_ttl(Xowe_wiki wiki, Bry_bfr tmp_bfr, Xow_ns ns, byte[] ttl_bry) {	// REF.MW:LanguageConverter.php|findVariantLink
-		synchronized (tmp_page_list) {
+	private Xowd_page_itm Convert_ttl(Xowe_wiki wiki, Bry_bfr tmp_bfr, Xow_ns ns, byte[] ttl_bry) {	// REF.MW:LanguageConverter.php|findVariantLink
+		synchronized (tmp_page_list) {	// THREAD:
 			int converted = Convert_ttl__convert_each_vnt(wiki, tmp_bfr, ns, ttl_bry);	// convert ttl for each vnt
 			if (converted == 0) return Xowd_page_itm.Null;								// ttl_bry has no conversions; exit;
-			wiki.Db_mgr().Load_mgr().Load_by_ttls(Cancelable_.Never, tmp_page_list, true, 0, converted);
+			// wiki.Data__core_mgr().Tbl__page().Select_in__ns_ttl(Cancelable_.Never, tmp_page_list, wiki.Ns_mgr(), true, 0, converted);	// TODO: use this call; when defaulting test to use db_mgr, not txt_mgr
+			wiki.Db_mgr().Load_mgr().Load_by_ttls(Cancelable_.Never, tmp_page_list, Bool_.Y, 0, converted);
 			for (int i = 0; i < converted; i++) {
 				Xowd_page_itm page = (Xowd_page_itm)tmp_page_list.Get_at(i);
 				if (page.Exists()) return page;											// return 1st found page
@@ -71,23 +57,21 @@ public class Xol_convert_mgr {
 			return Xowd_page_itm.Null;
 		}
 	}
-	private int Convert_ttl__convert_each_vnt(Xowe_wiki wiki, Bry_bfr tmp_bfr, Xow_ns ns, byte[] ttl_bry) {
-		synchronized (tmp_page_list) {
-			tmp_page_list.Clear();
-			int rv = 0;
-			for (int i = 0; i < wkr_ary_len; i++) {											// convert ttl for each variant
-				Xol_convert_wkr converter = wkr_ary[i];
-				tmp_bfr.Clear();
-				if (!converter.Convert_text(tmp_bfr, ttl_bry)) continue;					// ttl is not converted for variant; ignore
-				Xoa_ttl ttl = Xoa_ttl.parse(wiki, ns.Id(), tmp_bfr.Xto_bry_and_clear());	// NOTE: must convert to ttl in order to upper 1st letter; EX:{{jez-eng|sense}} -> Jez-eng; PAGE:sr.w:ДНК DATE:2014-07-06
-				if (ttl == null) continue;
-				Xowd_page_itm page = new Xowd_page_itm();
-				page.Ttl_(ns, ttl.Page_db());
-				byte[] converted_ttl = page.Ttl_full_db(); if (tmp_page_list.Has(converted_ttl)) continue;
-				tmp_page_list.Add(converted_ttl, page);
-				++rv;
-			}
-			return rv;
+	private int Convert_ttl__convert_each_vnt(Xow_wiki wiki, Bry_bfr tmp_bfr, Xow_ns ns, byte[] ttl_bry) {
+		tmp_page_list.Clear();
+		int rv = 0;
+		for (int i = 0; i < wkr_ary_len; i++) {											// convert ttl for each variant
+			Xol_convert_wkr converter = wkr_ary[i];
+			tmp_bfr.Clear();
+			if (!converter.Convert_text(tmp_bfr, ttl_bry)) continue;					// ttl is not converted for variant; ignore
+			Xoa_ttl ttl = wiki.Ttl_parse(ns.Id(), tmp_bfr.To_bry_and_clear());			// NOTE: must convert to ttl in order to upper 1st letter; EX:{{jez-eng|sense}} -> Jez-eng; PAGE:sr.w:ДНК DATE:2014-07-06
+			if (ttl == null) continue;
+			Xowd_page_itm page = new Xowd_page_itm();
+			page.Ttl_(ns, ttl.Page_db());
+			byte[] converted_ttl = page.Ttl_full_db(); if (tmp_page_list.Has(converted_ttl)) continue;
+			tmp_page_list.Add(converted_ttl, page);
+			++rv;
 		}
+		return rv;
 	}
 }

400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_regy.java

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.langs.vnts.converts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; import gplx.xowa.langs.vnts.*;
 import gplx.xowa.apps.fsys.*;
 public class Xol_convert_regy implements GfoInvkAble {	// registry of convert_grp; EX: zh-hans;zh-hant;
-	private final Ordered_hash hash = Ordered_hash_.new_bry_();		
+	private final Ordered_hash hash = Ordered_hash_.New_bry();		
 	public Xol_convert_grp Get_or_null(byte[] key) {return (Xol_convert_grp)hash.Get_by(key);}
 	public Xol_convert_grp Get_or_make(byte[] key) {
 		Xol_convert_grp rv = (Xol_convert_grp)hash.Get_by(key);

400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_regy_tst.java

@@ -47,15 +47,15 @@ class Xol_convert_regy_fxt {
 	public Xop_fxt Parser_fxt() {return parser_fxt;} private Xop_fxt parser_fxt;
 	public void Clear() {
 		app = Xoa_app_fxt.app_();
-		Xol_lang lang = app.Lang_mgr().Get_by_key_or_new(Bry_.new_a7("zh"));
-		Xol_lang_.Lang_init(lang);
+		Xol_lang_itm lang = app.Lang_mgr().Get_by_or_new(Bry_.new_a7("zh"));
+		Xol_lang_itm_.Lang_init(lang);
 		Init_cnv(app, "zh", "zh-hant", KeyVal_.new_("x0", "x1"));
 		wiki = Xoa_app_fxt.wiki_(app, "zh.wikipedia.org", lang);
-		gplx.xowa.parsers.vnts.Xop_vnt_parser_fxt.Vnt_mgr__init(wiki.Lang().Vnt_mgr(), 1, String_.Ary("zh", "zh-hans", "zh-hant"));
+		gplx.xowa.langs.vnts.Xol_vnt_regy_fxt.Init__vnt_mgr(wiki.Lang().Vnt_mgr(), 1, String_.Ary("zh", "zh-hans", "zh-hant"));
 		parser_fxt = new Xop_fxt(app, wiki);
 	}
 	public static void Init_cnv(Xoae_app app, String lang_key, String vnt_key, KeyVal... ary) {
-		Xol_lang lang = app.Lang_mgr().Get_by_key_or_new(Bry_.new_a7(lang_key));
+		Xol_lang_itm lang = app.Lang_mgr().Get_by_or_new(Bry_.new_a7(lang_key));
 		Xol_convert_grp grp = lang.Vnt_mgr().Convert_mgr().Converter_regy().Get_or_make(Bry_.new_a7(vnt_key));
 		int ary_len = ary.length;
 		for (int i = 0; i < ary_len; i++) {
@@ -64,21 +64,14 @@ class Xol_convert_regy_fxt {
 		}
 		Xol_vnt_itm vnt_itm = lang.Vnt_mgr().Regy__get_or_new(Bry_.new_a7(vnt_key));
 		vnt_itm.Convert_ary_(Bry_.Ary(vnt_key));
-		vnt_itm.Convert_wkr().Rebuild(lang.Vnt_mgr().Convert_mgr().Converter_regy(), vnt_itm.Convert_ary());
+		vnt_itm.Convert_wkr().Init(lang.Vnt_mgr().Convert_mgr().Converter_regy(), vnt_itm.Convert_ary());
 	}
-//		public void Test_convert(String lang, String vnt, String raw, String expd) {
-//			Xol_convert_grp convert_grp = app.Lang_mgr().Get_by_key_or_new(Bry_.new_a7(lang)).Cnv_mgr().Get_or_new(Bry_.new_a7(vnt));
-//			Bry_bfr bfr = Bry_bfr.new_();
-//			boolean converted = convert_grp.Convert_to_bfr(bfr, Bry_.new_u8(raw));
-//			String actl = converted ? bfr.Xto_str_and_clear() : raw;
-//			Tfds.Eq(expd, actl);
-//		}
 	public void Test_parse(String raw, String expd) {
 		parser_fxt.Test_parse_page_all_str(raw, expd);
 	}
 	public void Test_convert_by_ttl(String lang_key, String raw, boolean expd) {
-		Xol_lang lang = app.Lang_mgr().Get_by_key_or_new(Bry_.new_a7(lang_key));
-		Xoa_ttl ttl = Xoa_ttl.parse(wiki, Bry_.new_u8(raw));
+		Xol_lang_itm lang = app.Lang_mgr().Get_by_or_new(Bry_.new_a7(lang_key));
+		Xoa_ttl ttl = wiki.Ttl_parse(Bry_.new_u8(raw));
 		Xowd_page_itm page = lang.Vnt_mgr().Convert_mgr().Convert_ttl(wiki, ttl);
 		if (expd)
 			Tfds.Eq_true(page.Exists());

400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_wkr.java

@@ -21,8 +21,8 @@ public class Xol_convert_wkr {
 	private final Btrie_slim_mgr trie = Btrie_slim_mgr.cs();
 	public Xol_convert_wkr(byte[] key) {this.key = key;}
 	public byte[] Key() {return key;} private final byte[] key;
-	public void Add(byte[] src, byte[] trg) {trie.Add_obj(src, trg);}
-	public void Del(byte[] src)				{trie.Del(src);}
+	public void Add(byte[] src, byte[] trg) {trie.Add_obj(src, trg);}	// called by -{H}-
+	public void Del(byte[] src)				{trie.Del(src);}			// called by -{-}-
 	public boolean Convert_text(Bry_bfr bfr, byte[] src) {return Convert_text(bfr, src, 0, src.length);}
 	public boolean Convert_text(Bry_bfr bfr, byte[] src, int bgn, int end) {
 		int pos = bgn;
@@ -52,16 +52,16 @@ public class Xol_convert_wkr {
 		if (!matched) bfr.Add_mid(src, bgn, end);	// no convert; make sure to add back src, else bfr will be blank
 		return matched;
 	}
-	public void Rebuild(Xol_convert_regy regy, byte[][] ary) {
+	public void Init(Xol_convert_regy regy, byte[][] vnt_ary) {	// EX: "zh-cn" should add all converts from "zh-hans" "zh-cn" to its wkr
 		trie.Clear();
-		int len = ary.length;
+		int len = vnt_ary.length;
 		for (int i = 0; i < len; ++i) {
-			byte[] key = ary[i];
-			Xol_convert_grp grp = regy.Get_or_null(key); if (grp == null) continue;	// vnts may not have convert mapping; EX: zh-my
-			Rebuild_grp(grp);
+			byte[] key = vnt_ary[i];
+			Xol_convert_grp grp = regy.Get_or_null(key); if (grp == null) continue;	// vnt may not have convert mapping; EX: zh-my
+			Init_grp(grp);
 		}
 	}
-	private void Rebuild_grp(Xol_convert_grp grp) {
+	private void Init_grp(Xol_convert_grp grp) {
 		int len = grp.Len();
 		for (int i = 0; i < len; ++i) {
 			Xol_convert_itm itm = grp.Get_at(i);

400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_mw_parse_tst.java

@@ -19,23 +19,26 @@ package gplx.xowa.langs.vnts.converts; import gplx.*; import gplx.xowa.*; import
 import org.junit.*;
 import gplx.langs.phps.*;
 public class Xol_mw_parse_tst {
-	private Xol_mw_parse_fxt fxt = new Xol_mw_parse_fxt();
-	@Test   public void Basic() {
-		fxt.Test_convert("$zh2Hant = array('a' => 'A', 'b' => 'B',);", String_.Concat_lines_nl
-		( "// zh_zh-hant"
-		, "app.langs.get('zh').converts.get('zh-hant').add_bulk("
-		, "<:['"
-		, "a|A"
-		, "b|B"
-		, "']:>"
-		, ");"
-		));
-	}
+	private final Xol_mw_parse_fxt fxt = new Xol_mw_parse_fxt();
+//		@Test   public void Basic() {
+//			fxt.Test_convert("$zh2Hant = array('a' => 'A', 'b' => 'B',);", String_.Concat_lines_nl
+//			( "// zh_zh-hant"
+//			, "app.langs.get('zh').converts.get('zh-hant').add_bulk("
+//			, "<:['"
+//			, "a|A"
+//			, "b|B"
+//			, "']:>"
+//			, ");"
+//			));
+//		}
 //		@Test   public void Run() {
-//			Io_url src_dir = Io_url_.new_dir_("C:\\xowa\\bin\\any\\xowa\\lang\\mediawiki\\converts\\");
-//			Io_url trg_dir = Io_url_.new_dir_("C:\\xowa\\bin\\any\\xowa\\lang\\");
+//			Io_url src_dir = Io_url_.new_dir_("C:\\xowa\\bin\\any\\xowa\\cfg\\lang\\mediawiki\\converts\\");
+//			Io_url trg_dir = Io_url_.new_dir_("C:\\xowa\\bin\\any\\xowa\\cfg\\lang\\");
 //			fxt.Test_run(src_dir, trg_dir);
 //		}
+	@Test   public void Ignore() {
+		fxt.toString();
+	}
 }
 class Xol_mw_parse_grp {
 	public byte[] Lng() {return lng;} public Xol_mw_parse_grp Lng_(byte[] v) {lng = v; return this;} private byte[] lng;
@@ -80,15 +83,15 @@ class Xol_mw_parse_fxt {
 		Xol_mw_parse_grp[] actl_ary = Parse(Bry_.new_u8(mw));
 		Bry_bfr bfr = Bry_bfr.new_();
 		actl_ary[0].Write_as_gfs(bfr);
-		Tfds.Eq_str_lines(expd, bfr.Xto_str());
+		Tfds.Eq_str_lines(expd, bfr.To_str());
 	}
 	public void Test_run(Io_url src_dir, Io_url trg_dir) {
 		Bry_bfr bfr = Bry_bfr.new_();
-		Io_url[] fils = Io_mgr.I.QueryDir_fils(src_dir);
+		Io_url[] fils = Io_mgr.Instance.QueryDir_fils(src_dir);
 		int fils_len = fils.length;
 		for (int i = 0; i < fils_len; i++) {
 			Io_url fil = fils[i];
-			byte[] src = Io_mgr.I.LoadFilBry(fil);
+			byte[] src = Io_mgr.Instance.LoadFilBry(fil);
 			Xol_mw_parse_grp[] itms = Parse(src);
 			int itms_len = itms.length;
 			String lang_name = String_.Lower(String_.Mid(fil.NameOnly(), 0, 2));	// ZhConversion.php -> Zh
@@ -97,7 +100,7 @@ class Xol_mw_parse_fxt {
 				itm.Write_as_gfs(bfr);
 			}
 			Io_url trg_fil = Xol_convert_regy.Bld_url(trg_dir, lang_name);
-			Io_mgr.I.SaveFilBry(trg_fil, bfr.Xto_bry_and_clear());
+			Io_mgr.Instance.SaveFilBry(trg_fil, bfr.To_bry_and_clear());
 		}
 	}
 	public Xol_mw_parse_grp[] Parse(byte[] src) {
@@ -119,7 +122,7 @@ class Xol_mw_parse_fxt {
 	private Xol_mw_parse_grp Parse_grp(Php_line_assign line) {
 		Xol_mw_parse_grp grp = new Xol_mw_parse_grp();
 		byte[] key =  line.Key().Val_obj_bry();				// EX: "zh2Hant"
-		key = Bry_.Lcase__all(key);						// EX: "zh2hant"
+		key = Bry_.Lcase__all(key);							// EX: "zh2hant"
 		byte[][] parts = Bry_split_.Split(key, Byte_ascii.Num_2);	// EX: "zh", "hant"
 		byte[] src = parts[0];
 		byte[] trg = Bry_.Add(parts[0], new byte[] {Byte_ascii.Dash}, parts[1]);