Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

v1.10.2.1

Browse Source
This commit is contained in:
gnosygnu
2014-10-13 00:13:41 -04:00
parent cd5a440404
commit d6561b3c1f
514 changed files with 1899 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
400_xowa/src/gplx/core/brys/Bry_comparer.java
View File

@@ -22,22 +22,5 @@ public class Bry_comparer implements ComparerAble {
byte[] lhs = (byte[])lhsObj, rhs = (byte[])rhsObj;
return Bry_.Compare(lhs, 0, lhs.length, rhs, 0, rhs.length);
}
// public static int Compare(byte[] lhs, byte[] rhs, int lhs_bgn, int lhs_end, int rhs_bgn, int rhs_end) {
// int lhs_len = lhs_end - lhs_bgn;
// for (int i = 0; i < lhs_len; i++) {
// int lhs_byte = lhs[i + lhs_bgn] & 0xff; // PATCH.JAVA:need to convert to unsigned byte
// int rhs_idx = i + rhs_bgn; if (rhs_idx == rhs_end) return CompareAble_.More;
// int rhs_byte = rhs[rhs_idx] & 0xff; // PATCH.JAVA:need to convert to unsigned byte
// if (lhs_byte == rhs_byte) {
// if (lhs_byte == Byte_ascii.Pipe) return CompareAble_.Same;
// }
// else {
// if (rhs_byte == Byte_ascii.Pipe) return CompareAble_.More;
// else if (lhs_byte == Byte_ascii.Pipe) return CompareAble_.Less;
// else return lhs_byte < rhs_byte ? CompareAble_.Less : CompareAble_.More;
// }
// }
// return Int_.Compare(lhs_len, rhs_end - rhs_bgn);
// }
public static final Bry_comparer _ = new Bry_comparer(); Bry_comparer() {}
}

2
400_xowa/src/gplx/core/btries/Btrie_fast_mgr.java
View File

@@ -106,7 +106,7 @@ public class Btrie_fast_mgr {
pos = match_pos;
}
}
return dirty ? tmp_bfr.XtoAryAndClear() : src;
return dirty ? tmp_bfr.Xto_bry_and_clear() : src;
}
public static Btrie_fast_mgr cs_() {return new Btrie_fast_mgr(false);}
public static Btrie_fast_mgr ci_ascii_() {return new Btrie_fast_mgr(true);}

2
400_xowa/src/gplx/core/btries/Btrie_slim_mgr.java
View File

@@ -116,7 +116,7 @@ public class Btrie_slim_mgr implements Btrie_mgr {
pos = match_pos;
}
}
return dirty ? tmp_bfr.XtoAryAndClear() : src;
return dirty ? tmp_bfr.Xto_bry_and_clear() : src;
}
public void Clear() {root.Clear(); count = 0;}
public static Btrie_slim_mgr cs_() {return new Btrie_slim_mgr(true);}

4
400_xowa/src/gplx/core/flds/Gfo_fld_rdr.java
View File

@@ -80,8 +80,8 @@ public class Gfo_fld_rdr extends Gfo_fld_base {
}
throw Err_.new_("fld_dlm failed").Add("fld_dlm", (char)fld_dlm).Add("bgn", fld_bgn);
}
public String Read_str_escape() {Move_next_escaped(bfr); return String_.new_utf8_(bfr.XtoAryAndClear());}
public byte[] Read_bry_escape() {Move_next_escaped(bfr); return bfr.XtoAryAndClear();}
public String Read_str_escape() {Move_next_escaped(bfr); return String_.new_utf8_(bfr.Xto_bry_and_clear());}
public byte[] Read_bry_escape() {Move_next_escaped(bfr); return bfr.Xto_bry_and_clear();}
public void Move_1() {++pos;}
public void Move_next_escaped() {Move_next_escaped(bfr); bfr.Clear();}
public int Move_next_simple_fld() {

2
400_xowa/src/gplx/core/flds/Gfo_fld_rdr_tst.java
View File

@@ -50,7 +50,7 @@ class Gfo_fld_rdr_fxt {
byte[] bry = Bry_.new_utf8_(val);
wtr.Bfr_(bfr);
wtr.Write_bry_escape_fld(bry);
Tfds.Eq(expd, bfr.XtoStr());
Tfds.Eq(expd, bfr.Xto_str());
return this;
} private Bry_bfr bfr = Bry_bfr.new_();
}

2
400_xowa/src/gplx/core/regxs/Gfo_pattern_itm_.java
View File

@@ -46,6 +46,6 @@ public class Gfo_pattern_itm_ {
++pos;
if (last) break;
}
return (Gfo_pattern_itm[])rv.XtoAryAndClear(Gfo_pattern_itm.class);
return (Gfo_pattern_itm[])rv.Xto_ary_and_clear(Gfo_pattern_itm.class);
}
}

2
400_xowa/src/gplx/core/regxs/Gfo_pattern_tst.java
View File

@@ -78,6 +78,6 @@ class Gfo_pattern_itm_fxt {
Gfo_pattern_itm itm = ary[i];
itm.Xto_str(sb);
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
}

2
400_xowa/src/gplx/fsdb/Fsdb_db_atr_tbl.java
View File

@@ -30,7 +30,7 @@ public class Fsdb_db_atr_tbl {
rv.Add(itm);
}
} finally {rdr.Rls();}
return (Fsdb_db_atr_fil[])rv.XtoAry(Fsdb_db_atr_fil.class);
return (Fsdb_db_atr_fil[])rv.Xto_ary(Fsdb_db_atr_fil.class);
}
public static void Commit_all(Db_provider provider, Fsdb_db_atr_fil[] ary) {
stmt_bldr.Init(provider);

2
400_xowa/src/gplx/fsdb/Fsdb_db_bin_tbl.java
View File

@@ -50,7 +50,7 @@ public class Fsdb_db_bin_tbl {
rv.Add(itm);
}
} finally {rdr.Rls();}
return (Fsdb_db_bin_fil[])rv.XtoAry(Fsdb_db_bin_fil.class);
return (Fsdb_db_bin_fil[])rv.Xto_ary(Fsdb_db_bin_fil.class);
}
public static final String Tbl_name = "fsdb_db_bin", Fld_uid = "uid", Fld_url = "url", Fld_bin_len = "bin_len", Fld_bin_max = "bin_max";
private static final String Tbl_sql = String_.Concat_lines_nl

2
400_xowa/src/gplx/fsdb/Fsdb_mnt_tbl.java
View File

@@ -54,7 +54,7 @@ public class Fsdb_mnt_tbl {
}
}
finally {rdr.Rls();}
return (Fsdb_mnt_itm[])list.XtoAryAndClear(Fsdb_mnt_itm.class);
return (Fsdb_mnt_itm[])list.Xto_ary_and_clear(Fsdb_mnt_itm.class);
}
public static final String Tbl_name = "fsdb_mnt", Fld_mnt_id = "mnt_id", Fld_mnt_name = "mnt_name", Fld_mnt_url = "mnt_url";
private static final String Tbl_sql = String_.Concat_lines_nl

2
400_xowa/src/gplx/gfs/Gfs_lxr.java
View File

@@ -167,7 +167,7 @@ class Gfs_lxr_quote implements Gfs_lxr {
break;
}
}
ctx.Make_atr_by_bry(lxr_bgn + bgn_bry_len, end_pos, bfr.XtoAryAndClear());
ctx.Make_atr_by_bry(lxr_bgn + bgn_bry_len, end_pos, bfr.Xto_bry_and_clear());
}
else
ctx.Make_atr(lxr_bgn + bgn_bry_len, end_pos);

2
400_xowa/src/gplx/gfs/Gfs_msg_bldr_tst.java
View File

@@ -71,6 +71,6 @@ class Gfs_msg_bldr_fxt {
if (i != 0) sb.Add_char_crlf();
sb.Add(ary[i].XtoStr());
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
}

6
400_xowa/src/gplx/gfs/Gfs_parser_ctx.java
View File

@@ -97,7 +97,7 @@ class Gfs_err_mgr {
tmp_fail_bfr.Add_byte(Byte_ascii.Eq).Add_byte(Byte_ascii.Apos);
tmp_fail_bfr.Add_str(kv.Val_to_str_or_empty()).Add_byte(Byte_ascii.Apos);
}
return tmp_fail_bfr.XtoStrAndClear();
return tmp_fail_bfr.Xto_str_and_clear();
}
Bry_bfr tmp_fail_bfr = Bry_bfr.reset_(255);
KeyValList tmp_fail_args = new KeyValList();
@@ -105,12 +105,12 @@ class Gfs_err_mgr {
String Fail_excerpt_bgn(byte[] src, int src_len, int pos) {
int bgn = pos - excerpt_len; if (bgn < 0) bgn = 0;
Fail_excerpt_rng(tmp_fail_bfr, src, bgn, pos);
return tmp_fail_bfr.XtoStrAndClear();
return tmp_fail_bfr.Xto_str_and_clear();
}
String Fail_excerpt_end(byte[] src, int src_len, int pos) {
int end = pos + excerpt_len; if (end > src_len) end = src_len;
Fail_excerpt_rng(tmp_fail_bfr, src, pos, end);
return tmp_fail_bfr.XtoStrAndClear();
return tmp_fail_bfr.Xto_str_and_clear();
}
private static void Fail_excerpt_rng(Bry_bfr bfr, byte[] src, int bgn, int end) {
for (int i = bgn; i < end; i++) {

2
400_xowa/src/gplx/gfs/Gfs_parser_tst.java
View File

@@ -159,7 +159,7 @@ class Gfs_parser_fxt {
path_bfr.Clear().Add_int_variable(i);
To_str(tmp_bfr, path_bfr, src, expd[i]);
}
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
public void To_str(Bry_bfr bfr, Bry_bfr path, byte[] src, Gfs_nde nde) {
To_str_atr(bfr, path, src, Atr_name, nde.Name(), nde.Name_bgn(), nde.Name_end());

2
400_xowa/src/gplx/gfui/Gfui_bnd_parser.java
View File

@@ -88,7 +88,7 @@ public class Gfui_bnd_parser {
Gfui_bnd_tkn tkn = (Gfui_bnd_tkn)tkns.FetchAt(i);
tkn.Write(tmp_bfr, !src_is_gfui);
}
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
private void Process_sym(boolean src_is_gfui, Gfui_bnd_tkn sym_tkn, int itm_bgn, int itm_end) {
Hash_adp_bry regy = src_is_gfui ? gfui_regy : norm_regy;

2
400_xowa/src/gplx/html/Html_nde.java
View File

@@ -77,7 +77,7 @@ public class Html_nde {
break;
}
}
return dirty ? tmp_bfr.XtoAryAndClear() : Bry_.Mid(src, bgn, end);
return dirty ? tmp_bfr.Xto_bry_and_clear() : Bry_.Mid(src, bgn, end);
}
public byte[] Data(byte[] src) {
return Bry_.Mid(src, tag_lhs_end, tag_rhs_bgn);

2
400_xowa/src/gplx/html/Html_parser.java
View File

@@ -53,7 +53,7 @@ public class Html_parser {
break;
}
}
return (Html_nde[])rv.XtoAry(Html_nde.class);
return (Html_nde[])rv.Xto_ary(Html_nde.class);
}
int cur_lhs_bgn, cur_lhs_end, cur_name_bgn, cur_name_end, cur_rhs_bgn; boolean xnde_init = true, tag_tid_is_inline = false;
private boolean Parse_xnde_rhs() {

2
400_xowa/src/gplx/html/Html_selecter.java
View File

@@ -33,7 +33,7 @@ public class Html_selecter {
}
}
}
Html_nde[] rv = (Html_nde[])list.XtoAry(Html_nde.class);
Html_nde[] rv = (Html_nde[])list.Xto_ary(Html_nde.class);
list.Clear();
return rv;
}

10
400_xowa/src/gplx/html/Html_utl.java
View File

@@ -25,7 +25,7 @@ public class Html_utl {
public static byte[] Escape_for_atr_val_as_bry(Bry_bfr tmp_bfr, byte quote_byte, byte[] bry) {
if (bry == null) return null;
boolean dirty = Escape_for_atr_val_as_bry(tmp_bfr, quote_byte, bry, 0, bry.length);
return dirty ? tmp_bfr.XtoAryAndClear() : bry;
return dirty ? tmp_bfr.Xto_bry_and_clear() : bry;
}
public static boolean Escape_for_atr_val_as_bry(Bry_bfr tmp_bfr, byte quote_byte, byte[] src, int bgn, int end) {
boolean dirty = false;
@@ -92,7 +92,7 @@ public class Html_utl {
if (write_to_bfr)
return null;
else
return dirty ? bfr.XtoAryAndClear() : bry;
return dirty ? bfr.Xto_bry_and_clear() : bry;
}
private static final Btrie_slim_mgr unescape_trie = Btrie_slim_mgr.ci_ascii_()
@@ -106,7 +106,7 @@ public class Html_utl {
Bry_bfr bfr = Bry_bfr.reset_(255);
byte[] bry = Bry_.new_utf8_(src);
Unescape(Bool_.Y, bfr, bry, 0, bry.length, Bool_.Y, Bool_.Y, Bool_.Y, Bool_.Y, Bool_.Y);
return bfr.XtoStrAndClear();
return bfr.Xto_str_and_clear();
}
public static byte[] Unescape(boolean write_to_bfr, Bry_bfr bfr, byte[] bry, int bgn, int end, boolean escape_lt, boolean escape_gt, boolean escape_amp, boolean escape_quote, boolean escape_apos) {
if (bry == null) return null;
@@ -148,7 +148,7 @@ public class Html_utl {
if (write_to_bfr)
return null;
else
return dirty ? bfr.XtoAryAndClear() : bry;
return dirty ? bfr.Xto_bry_and_clear() : bry;
}
public static byte[] Del_comments(Bry_bfr bfr, byte[] src) {return Del_comments(bfr, src, 0, src.length);}
public static byte[] Del_comments(Bry_bfr bfr, byte[] src, int pos, int end) {
@@ -167,6 +167,6 @@ public class Html_utl {
bfr.Add_mid(src, pos, comm_bgn); // add everything between pos and comm_bgn
pos = comm_end + Html_tag_.Comm_end_len; // reposition pos after comm_end
}
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
}

6
400_xowa/src/gplx/html/Html_wtr.java
View File

@@ -82,9 +82,9 @@ public class Html_wtr {
bfr.Add_byte(Byte_ascii.Gt);
return this;
}
public byte[] Xto_bry_and_clear() {return bfr.XtoAryAndClear();}
public byte[] Xto_bry() {return bfr.XtoAry();}
public String Xto_str() {return bfr.XtoStr();}
public byte[] Xto_bry_and_clear() {return bfr.Xto_bry_and_clear();}
public byte[] Xto_bry() {return bfr.Xto_bry();}
public String Xto_str() {return bfr.Xto_str();}
public static void Write_atr_bry(Bry_bfr bfr, byte[] key, byte[] val) {Write_atr_bry(bfr, Bool_.Y, Byte_ascii.Quote, key, val);}
public static void Write_atr_bry(Bry_bfr bfr, boolean write_space, byte atr_quote, byte[] key, byte[] val) {
if (Bry_.Len_eq_0(val)) return; // don't write empty

4
400_xowa/src/gplx/json/Json_doc_srl.java
View File

@@ -20,8 +20,8 @@ public class Json_doc_srl {
private int indent = -1;
private Bry_bfr bfr = Bry_bfr.reset_(255);
public boolean Ws_enabled() {return ws_enabled;} public void Ws_enabled_(boolean v) {ws_enabled = v;} private boolean ws_enabled = false;
public byte[] Bld() {return bfr.XtoAryAndClear();}
public String Bld_as_str() {return bfr.XtoStrAndClear();}
public byte[] Bld() {return bfr.Xto_bry_and_clear();}
public String Bld_as_str() {return bfr.Xto_str_and_clear();}
public Json_doc_srl Write_root(byte[] key, Object val) {
Write_nde_bgn();
Write_obj(false, key, val);

4
400_xowa/src/gplx/json/Json_doc_wtr.java
View File

@@ -93,6 +93,6 @@ public class Json_doc_wtr {
bfr.Add_byte(Byte_ascii.Colon);
return this;
}
public byte[] Bld() {return bfr.XtoAryAndClear();}
public String Bld_as_str() {return bfr.XtoStrAndClear();}
public byte[] Bld() {return bfr.Xto_bry_and_clear();}
public String Bld_as_str() {return bfr.Xto_str_and_clear();}
}

2
400_xowa/src/gplx/json/Json_itm.java
View File

@@ -111,6 +111,6 @@ class Json_itm_str extends Json_itm_base {
break;
}
}
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
}

2
400_xowa/src/gplx/json/Json_itm_base.java
View File

@@ -23,7 +23,7 @@ public abstract class Json_itm_base implements Json_itm {
public int Src_end() {return src_end;} protected int src_end;
public abstract Object Data();
public abstract byte[] Data_bry();
public String Print_as_json() {Bry_bfr bfr = Bry_bfr.new_(); Print_as_json(bfr, 0); return bfr.XtoStrAndClear();}
public String Print_as_json() {Bry_bfr bfr = Bry_bfr.new_(); Print_as_json(bfr, 0); return bfr.Xto_str_and_clear();}
public abstract void Print_as_json(Bry_bfr bfr, int depth);
@gplx.Virtual public boolean Data_eq(byte[] comp) {return false;}
}

4
400_xowa/src/gplx/json/Json_parser_tst.java
View File

@@ -78,7 +78,7 @@ class Json_parser_fxt {
byte[] raw = Json_parser_tst.Replace_apos(Bry_.new_utf8_(raw_str));
Json_doc doc = parser.Parse(raw);
doc.Root().Print_as_json(tmp_bfr, 0);
String actl = tmp_bfr.XtoStrAndClear();
String actl = tmp_bfr.Xto_str_and_clear();
String expd = Xto_str(raw, doc, expd_ary, 0, expd_ary.length);
Tfds.Eq_str_lines(expd, actl, actl);
}
@@ -94,6 +94,6 @@ class Json_parser_fxt {
Json_itm itm = ary[i];
itm.Print_as_json(tmp_bfr, 0);
}
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
}

2
400_xowa/src/gplx/php/Php_parser.java
View File

@@ -49,7 +49,7 @@ public class Php_parser {
Init_lxr(list, new Php_lxr_num());
Init_lxr(list, new Php_lxr_quote(Byte_ascii.Apos));
Init_lxr(list, new Php_lxr_quote(Byte_ascii.Quote));
lxrs = (Php_lxr[])list.XtoAry(Php_lxr.class);
lxrs = (Php_lxr[])list.Xto_ary(Php_lxr.class);
lxrs_len = list.Count();
}
private void Init_lxr(ListAdp list, Php_lxr lxr) {

6
400_xowa/src/gplx/php/Php_parser_tst.java
View File

@@ -163,7 +163,7 @@ class Php_parser_fxt {
public void tst_tkns(String raw, Php_tkn_chkr_base... expd) {
byte[] raw_bry = Bry_.new_utf8_(raw);
parser.Parse_tkns(raw_bry, tkn_wkr);
Php_tkn[] actl = (Php_tkn[])tkn_wkr.List().XtoAry(Php_tkn.class);
Php_tkn[] actl = (Php_tkn[])tkn_wkr.List().Xto_ary(Php_tkn.class);
tst_mgr.Vars().Clear().Add("raw_bry", raw_bry);
tst_mgr.Tst_ary("", expd, actl);
log_mgr_chkr.tst(tst_mgr, tkn_wkr.Msg_log());
@@ -171,7 +171,7 @@ class Php_parser_fxt {
public void tst_lines(String raw, Php_line_assign_chkr... expd) {
byte[] raw_bry = Bry_.new_utf8_(raw);
parser.Parse_tkns(raw_bry, line_wkr);
Php_line[] actl = (Php_line[])line_wkr.List().XtoAry(Php_line.class);
Php_line[] actl = (Php_line[])line_wkr.List().Xto_ary(Php_line.class);
tst_mgr.Vars().Clear().Add("raw_bry", raw_bry);
tst_mgr.Tst_ary("", expd, actl);
log_mgr_chkr.tst(tst_mgr, line_wkr.Msg_log());
@@ -380,7 +380,7 @@ class Gfo_msg_log_chkr implements Tst_chkr {
Gfo_msg_data[] actl_itms = new Gfo_msg_data[actl_itms_len];
for (int i = 0; i < actl_itms_len; i++)
actl_itms[i] = actl.Ary_get(i);
mgr.Tst_ary("itms", (Gfo_msg_data_chkr[])itms.XtoAry(Gfo_msg_data_chkr.class), actl_itms);
mgr.Tst_ary("itms", (Gfo_msg_data_chkr[])itms.Xto_ary(Gfo_msg_data_chkr.class), actl_itms);
}
}
class Gfo_msg_data_chkr implements Tst_chkr {

4
400_xowa/src/gplx/php/Php_srl_parser_tst.java
View File

@@ -98,7 +98,7 @@ class Php_srl_parser_fxt {
Php_srl_itm_ary root = parser.Parse(raw);
Php_srl_itm root_sub = root.Subs_get_at(0).Val();
root_sub.Xto_bfr(tmp_bfr, 0);
String actl = tmp_bfr.XtoStrAndClear();
String actl = tmp_bfr.Xto_str_and_clear();
String expd = Xto_str(expd_ary, 0, expd_ary.length);
Tfds.Eq_str_lines(expd, actl, actl);
}
@@ -107,6 +107,6 @@ class Php_srl_parser_fxt {
Php_srl_itm itm = ary[i];
itm.Xto_bfr(tmp_bfr, 0);
}
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
}

2
400_xowa/src/gplx/php/Php_text_itm_parser.java
View File

@@ -32,7 +32,7 @@ public class Php_text_itm_parser {
Php_text_itm itm = (Php_text_itm)tmp_list.FetchAt(i);
itm.Bld(tmp_bfr, raw);
}
rv = tmp_bfr.XtoAryAndClear();
rv = tmp_bfr.Xto_bry_and_clear();
break;
}
return rv;

2
400_xowa/src/gplx/php/Php_text_itm_tst.java
View File

@@ -48,6 +48,6 @@ class Php_text_itm_fxt {
Php_text_itm itm = (Php_text_itm)list.FetchAt(i);
itm.Bld(bfr, raw);
}
Tfds.Eq(expd, bfr.XtoStrAndClear());
Tfds.Eq(expd, bfr.Xto_str_and_clear());
}
}

2
400_xowa/src/gplx/srls/dsvs/Dsv_tbl_parser_int_tst.java
View File

@@ -38,7 +38,7 @@ class Mok_int_itm implements XtoStrAble {
}
class Mok_int_mgr extends Mok_mgr_base {
public void Clear() {itms.Clear();}
@Override public XtoStrAble[] Itms() {return (XtoStrAble[])itms.XtoAry(XtoStrAble.class);} private ListAdp itms = ListAdp_.new_();
@Override public XtoStrAble[] Itms() {return (XtoStrAble[])itms.Xto_ary(XtoStrAble.class);} private ListAdp itms = ListAdp_.new_();
private String fld_0;
private int fld_1, fld_2;
@Override public Dsv_fld_parser[] Fld_parsers() {

4
400_xowa/src/gplx/srls/dsvs/Dsv_tbl_parser_str_tst.java
View File

@@ -83,7 +83,7 @@ class Mok_str_mgr extends Mok_mgr_base {
this.flds_len = flds_len;
}
public void Clear() {itms.Clear();}
@Override public XtoStrAble[] Itms() {return (XtoStrAble[])itms.XtoAry(XtoStrAble.class);} private ListAdp itms = ListAdp_.new_();
@Override public XtoStrAble[] Itms() {return (XtoStrAble[])itms.Xto_ary(XtoStrAble.class);} private ListAdp itms = ListAdp_.new_();
private ListAdp flds = ListAdp_.new_();
@Override public boolean Write_bry(Dsv_tbl_parser parser, int fld_idx, byte[] src, int bgn, int end) {
flds.Add(String_.new_utf8_(src, bgn, end));
@@ -96,7 +96,7 @@ class Mok_str_mgr extends Mok_mgr_base {
return rv;
}
@Override public void Commit_itm(Dsv_tbl_parser parser, int pos) {
Mok_str_itm itm = new Mok_str_itm((String[])flds.XtoAryAndClear(String.class));
Mok_str_itm itm = new Mok_str_itm((String[])flds.Xto_ary_and_clear(String.class));
itms.Add(itm);
}
}

8
400_xowa/src/gplx/xowa/Xoa_app.java
View File

@@ -20,12 +20,13 @@ import gplx.core.btries.*; import gplx.core.flds.*; import gplx.ios.*; import gp
import gplx.xowa.apps.*; import gplx.xowa.apps.caches.*; import gplx.xowa.apps.fsys.*; import gplx.xowa.apis.*; import gplx.xowa.urls.encoders.*;
import gplx.xowa.langs.*; import gplx.xowa.specials.*; import gplx.xowa.cfgs2.*;
import gplx.xowa.wikis.*; import gplx.xowa.users.*; import gplx.xowa.gui.*; import gplx.xowa.cfgs.*; import gplx.xowa.ctgs.*; import gplx.xowa.html.tocs.*; import gplx.xowa.fmtrs.*; import gplx.xowa.html.*;
import gplx.xowa.parsers.*; import gplx.xowa.parsers.amps.*;
import gplx.xowa.parsers.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.tblws.*;
import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.math.*;
import gplx.xowa.parsers.logs.*; import gplx.xowa.servers.tcp.*; import gplx.xowa.servers.http.*;
public class Xoa_app implements GfoInvkAble {
public Xoa_app(Gfo_usr_dlg usr_dlg, Io_url root_dir, Io_url user_dir, String bin_dir_name) {
this.usr_dlg = usr_dlg;
Io_url.Http_file_str_encoder = encoder_mgr.Fsys();
log_wtr = usr_dlg.Log_wtr();
cfg_mgr = new Xoa_cfg_mgr(this);
api_root = new Xoapi_root(this);
@@ -50,7 +51,6 @@ public class Xoa_app implements GfoInvkAble {
gfs_mgr = new Xoa_gfs_mgr(this);
xtn_mgr = new Xow_xtn_mgr().Ctor_by_app(this);
hive_mgr = new Xoa_hive_mgr(this);
Io_url.Http_file_str_encoder = encoder_mgr.Fsys();
tcp_server.App_ctor(this);
fmtr_mgr = new Xoa_fmtr_mgr(this);
log_mgr = new Xop_log_mgr(this);
@@ -112,6 +112,7 @@ public class Xoa_app implements GfoInvkAble {
public Gfo_log_wtr Log_wtr() {return log_wtr;} private Gfo_log_wtr log_wtr;
public Xoa_gfs_mgr Gfs_mgr() {return gfs_mgr;} private Xoa_gfs_mgr gfs_mgr;
public Xoa_special_mgr Special_mgr() {return special_mgr;} private Xoa_special_mgr special_mgr = new gplx.xowa.specials.Xoa_special_mgr();
public Xoh_html_mgr Html_mgr() {return html_mgr;} private Xoh_html_mgr html_mgr;
public Xop_log_mgr Log_mgr() {return log_mgr;} private Xop_log_mgr log_mgr;
public Xoa_shell Shell() {return shell;} private Xoa_shell shell;
public byte Mode() {return mode;} public Xoa_app Mode_(byte v) {mode = v; return this;} private byte mode = Xoa_app_.Mode_console;
@@ -143,12 +144,11 @@ public class Xoa_app implements GfoInvkAble {
public boolean Xwiki_missing(byte[] wiki_key) {return user.Wiki().Xwiki_mgr().Get_by_key(wiki_key) == null;} // NOTE: only the user_wiki has a full list of all wikis b/c it has xwiki objects; wiki_mgr does not, b/c it has heavier wiki objects which are loaded dynamically;
public boolean Xwiki_exists(byte[] wiki_key) {return user.Wiki().Xwiki_mgr().Get_by_key(wiki_key) != null;}
public Xoa_ctg_mgr Ctg_mgr() {return ctg_mgr;} private Xoa_ctg_mgr ctg_mgr = new Xoa_ctg_mgr();
public Xoa_fsys_eval Url_cmd_eval() {return url_cmd_eval;} Xoa_fsys_eval url_cmd_eval;
public Xoa_fsys_eval Url_cmd_eval() {return url_cmd_eval;} Xoa_fsys_eval url_cmd_eval;
public Xoa_cur Cur_redirect() {return cur_redirect;} private Xoa_cur cur_redirect;
public Xoa_cfg_mgr Cfg_mgr() {return cfg_mgr;} private Xoa_cfg_mgr cfg_mgr;
public Xocfg_regy Cfg_regy() {return cfg_regy;} private Xocfg_regy cfg_regy;
public Io_stream_zip_mgr Zip_mgr() {return zip_mgr;} Io_stream_zip_mgr zip_mgr = new Io_stream_zip_mgr();
public gplx.xowa.html.Xoh_html_mgr Html_mgr() {return html_mgr;} private Xoh_html_mgr html_mgr;
public Xoa_cache_mgr Cache_mgr() {return cache_mgr;} private Xoa_cache_mgr cache_mgr = new Xoa_cache_mgr();
public Xosrv_server Tcp_server() {return tcp_server;} private Xosrv_server tcp_server = new Xosrv_server();

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

@@ -24,7 +24,7 @@ public class Xoa_app_ {
boot_mgr.Run(args);
}
public static final String Name = "xowa";
public static final String Version = "1.10.1.1";
public static final String Version = "1.10.2.1";
public static String Build_date = "2012-12-30 00:00:00";
public static String Op_sys;
public static String User_agent = "";

4
400_xowa/src/gplx/xowa/apis/xowa/html/modules/Xoapi_popups.java
View File

@@ -201,8 +201,8 @@ public class Xoapi_popups implements GfoInvkAble, GfoEvMgrOwner {
, " <span><a href='xowa-cmd:xowa.api.gui.browser.tabs.new_link__at_dflt__focus_y(\"~{page_url}\");' title='~{<>msgs.get('api-xowa.gui.browser.tabs.new_link__at_dflt__focus_y-name');<>}'><img src='~{xowa_root_dir}user/anonymous/app/img/window/menu/tabs/new.png'></a></span>"
, " <span><a href='xowa-cmd:xowa.api.gui.browser.tabs.new_link__at_dflt__focus_n(\"~{page_url}\");' title='~{<>msgs.get('api-xowa.gui.browser.tabs.new_link__at_dflt__focus_n-name');<>}'><img src='~{xowa_root_dir}user/anonymous/app/img/window/menu/tabs/new_background.png'></a></span>"
, " <span><a href='xowa-cmd:xowa.api.usr.bookmarks.add(\"~{page_url}\");' title='~{<>msgs.get('api-xowa.usr.bookmarks.add-name');<>}'><img src='~{xowa_root_dir}user/anonymous/app/img/window/menu/bookmarks/add.png'></a></span>"
, " <span><a href='xowa-cmd:xowa.api.html.modules.popups.show_more(\"~{popup_id}\");' title='~{<>msgs.get('api-xowa.html.modules.popups.show_more-tip');<>}'><img src='~{xowa_root_dir}bin/any/xowa/html/modules/xowa.popups/imgs/show_more.png'></a></span>"
, " <span><a href='xowa-cmd:xowa.api.html.modules.popups.show_all (\"~{popup_id}\");' title='~{<>msgs.get('api-xowa.html.modules.popups.show_all-tip');<>}'> <img src='~{xowa_root_dir}bin/any/xowa/html/modules/xowa.popups/imgs/show_all.png' ></a></span>"
, " <span><a href='xowa-cmd:xowa.api.html.modules.popups.show_more(\"~{popup_id}\");' title='~{<>msgs.get('api-xowa.html.modules.popups.show_more-tip');<>}'><img src='~{xowa_root_dir}bin/any/xowa/html/res/src/xowa/popups/imgs/show_more.png'></a></span>"
, " <span><a href='xowa-cmd:xowa.api.html.modules.popups.show_all (\"~{popup_id}\");' title='~{<>msgs.get('api-xowa.html.modules.popups.show_all-tip');<>}'> <img src='~{xowa_root_dir}bin/any/xowa/html/res/src/xowa/popups/imgs/show_all.png' ></a></span>"
, " <span><a href='/wiki/Special:XowaPopupHistory' title='~{<>msgs.get('api-xowa.html.modules.popups.history-tip');<>}'><img src='~{xowa_root_dir}user/anonymous/app/img/window/menu/history/show.png'></a></span>"
, " <span><a href='xowa-cmd:xowa.api.gui.browser.tabs.new_link__at_dflt__focus_y(\"home/wiki/Help:Options/Popups\");' title='~{<>msgs.get('api-xowa.nav.cfg.main-name');<>}'><img src='~{xowa_root_dir}user/anonymous/app/img/window/menu/tools/options.png'></a></span>"
, " </div>"

2
400_xowa/src/gplx/xowa/apis/xowa/usrs/Xoapi_history.java
View File

@@ -23,7 +23,7 @@ public class Xoapi_history implements GfoInvkAble {
public void Init_by_kit(Xoa_app app) {this.win = app.Gui_mgr().Browser_win();}
public boolean Enabled() {return enabled;} private boolean enabled = true;
public void Enabled_(boolean v) {enabled = v;}
public void Goto_recent() {win.Page__navigate_by_url_bar(app.User().History_mgr().Get_at_last(app));}
public void Goto_recent() {win.Page__navigate_by_url_bar(app.User().History_mgr().Get_at_last());}
public void Show() {win.Page__navigate_by_url_bar("home/wiki/Special:XowaPageHistory");}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_enabled)) return Yn.Xto_str(this.Enabled());

6
400_xowa/src/gplx/xowa/apps/Xoa_gfs_mgr.java
View File

@@ -79,11 +79,11 @@ public class Xoa_gfs_mgr implements GfoInvkAble, GfoInvkRootWkr {
cur_msg = cur_msg.Subs_getAt(0);
}
}
public byte[] Build_prop_set_to_bry(Bry_bfr bfr, byte[] prop, byte[] val) {Build_prop_set(bfr, prop, val); return bfr.XtoAryAndClear();}
public byte[] Build_prop_set_to_bry(Bry_bfr bfr, byte[] prop, byte[] val) {Build_prop_set(bfr, prop, val); return bfr.Xto_bry_and_clear();}
public void Build_prop_set(Bry_bfr bfr, byte[] prop, byte[] val) {
fmtr_eval_set.Bld_bfr_many(bfr, prop, Xoa_gfs_mgr.Cfg_save_escape(val));
} private Bry_fmtr fmtr_eval_set = Bry_fmtr.new_("~{prop}_('~{val}');\n", "prop", "val");
public byte[] Build_prop_get_to_bry(Bry_bfr bfr, byte[] prop) {Build_prop_get(bfr, prop); return bfr.XtoAryAndClear();}
public byte[] Build_prop_get_to_bry(Bry_bfr bfr, byte[] prop) {Build_prop_get(bfr, prop); return bfr.Xto_bry_and_clear();}
public void Build_prop_get(Bry_bfr bfr, byte[] prop) {
fmtr_eval_get.Bld_bfr_many(bfr, prop);
} private Bry_fmtr fmtr_eval_get = Bry_fmtr.new_("~{prop};\n", "prop");
@@ -108,7 +108,7 @@ public class Xoa_gfs_mgr implements GfoInvkAble, GfoInvkRootWkr {
if (i != 0) Build_code_bfr.Add_byte(Byte_ascii.Dot);
Build_code_bfr.Add_str(ary[i]);
}
return Build_code_bfr.XtoStrAndClear();
return Build_code_bfr.Xto_str_and_clear();
} static final Bry_bfr Build_code_bfr = Bry_bfr.new_();
public static final String Cfg_user_file = "xowa_user_cfg.gfs", Cfg_user_custom_file = "user_custom_cfg.gfs", Cfg_os = "xowa_cfg_os.gfs";
public static boolean Fail_if_unhandled = false;

4
400_xowa/src/gplx/xowa/apps/Xoa_gfs_php_mgr.java
View File

@@ -55,7 +55,7 @@ public class Xoa_gfs_php_mgr {
break;
}
}
return dirty ? bfr.XtoAryAndClear() : src;
return dirty ? bfr.Xto_bry_and_clear() : src;
}
private static int Xto_php_swap(Bry_bfr bfr, byte[] src, int len, int pos) {
if (pos >= len) throw Err_.new_("invalid gfs: tilde is last char; src={0}", String_.new_utf8_(src));
@@ -112,6 +112,6 @@ public class Xoa_gfs_php_mgr {
break;
}
}
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
}

2
400_xowa/src/gplx/xowa/apps/fsys/Xoa_fsys_mgr.java
View File

@@ -19,6 +19,7 @@ package gplx.xowa.apps.fsys; import gplx.*; import gplx.xowa.*; import gplx.xowa
public class Xoa_fsys_mgr implements GfoInvkAble {
public Xoa_fsys_mgr(Io_url root_dir, String plat_name) {
this.root_dir = root_dir;
root_dir_bry = root_dir.To_http_file_bry();
file_dir = root_dir.GenSubDir("file");
wiki_dir = root_dir.GenSubDir("wiki");
bin_plat_dir = root_dir.GenSubDir("bin").GenSubDir(plat_name);
@@ -28,6 +29,7 @@ public class Xoa_fsys_mgr implements GfoInvkAble {
cfg_wiki_core_dir = bin_any_dir.GenSubDir_nest("xowa", "cfg", "wiki", "core");
}
public Io_url Root_dir() {return root_dir;} private final Io_url root_dir;
public byte[] Root_dir_bry() {return root_dir_bry;} private final byte[] root_dir_bry;
public Io_url File_dir() {return file_dir;} private final Io_url file_dir;
public Io_url Wiki_dir() {return wiki_dir;} public Xoa_fsys_mgr Wiki_dir_(Io_url v) {wiki_dir = v; return this;} private Io_url wiki_dir;
public Io_url Bin_plat_dir() {return bin_plat_dir;} private final Io_url bin_plat_dir;

7
400_xowa/src/gplx/xowa/apps/setups/Xoa_setup_mgr.java
View File

@@ -21,8 +21,11 @@ public class Xoa_setup_mgr {
public static void Delete_old_files(Xoa_app app) {
String version_previous = app.Api_root().App().Env().Version_previous();
Gfo_usr_dlg usr_dlg = app.Usr_dlg();
Delete_old_dir(usr_dlg, version_previous, "1.8.2.1", app.Fsys_mgr().Root_dir().GenSubDir_nest("user", "anonymous", "lang"));
Delete_old_dir(usr_dlg, version_previous, "1.8.2.1", app.Fsys_mgr().Root_dir().GenSubDir_nest("user", "anonymous", "wiki", "#cfg"));
Io_url root_dir = app.Fsys_mgr().Root_dir();
Delete_old_dir(usr_dlg, version_previous, "1.8.2.1" , root_dir.GenSubDir_nest("user", "anonymous", "lang"));
Delete_old_dir(usr_dlg, version_previous, "1.8.2.1" , root_dir.GenSubDir_nest("user", "anonymous", "wiki", "#cfg"));
Delete_old_dir(usr_dlg, version_previous, "1.10.2.1" , root_dir.GenSubDir_nest("bin", "any", "javascript"));
Delete_old_dir(usr_dlg, version_previous, "1.10.2.1" , root_dir.GenSubDir_nest("bin", "any", "xowa", "html", "modules"));
}
@gplx.Internal protected static void Delete_old_dir(Gfo_usr_dlg usr_dlg, String version_prv, String version_del, Io_url dir) {
if (Xoa_version_.Compare(version_prv, version_del) != CompareAble_.Less) return;

6
400_xowa/src/gplx/xowa/bldrs/Db_mgr_fxt.java
View File

@@ -98,7 +98,7 @@ public class Db_mgr_fxt {
list.Add(itm.Id());
}
}
return (int[])list.XtoAryAndClear(int.class);
return (int[])list.Xto_ary_and_clear(int.class);
}
public void Test_category_v2(String ctg_name_str, int... expd) {
Xow_wiki wiki = bldr_fxt.Wiki();
@@ -122,7 +122,7 @@ public class Db_mgr_fxt {
list.Add(itm.Id());
}
}
return (int[])list.XtoAryAndClear(int.class);
return (int[])list.Xto_ary_and_clear(int.class);
}
public void Init_db_sqlite() {Init_db_sqlite(Xoa_test_.Url_wiki_enwiki().GenSubFil_nest("en.wikipedia.org.sqlite3"));}
public void Init_db_sqlite(Io_url url) {
@@ -163,7 +163,7 @@ public class Db_mgr_fxt {
dsv_tbl_text(sb);
dsv_tbl_category(sb);
dsv_tbl_categorylinks(sb);
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
private static void Add_lines_w_crlf(String_bldr sb, String... ary) {
int len = ary.length;

6
400_xowa/src/gplx/xowa/bldrs/Xob_fxt.java
View File

@@ -81,7 +81,7 @@ public class Xob_fxt {
}
private void tst_fils(Io_url[] ary) {
Io_fil[] actls = Get_actl(ary);
Io_fil_chkr[] expds = (Io_fil_chkr[])expd_list.XtoAry(Io_fil_chkr.class);
Io_fil_chkr[] expds = (Io_fil_chkr[])expd_list.Xto_ary(Io_fil_chkr.class);
tst_mgr.Tst_ary("all", expds, actls);
}
Io_fil[] Get_actl(Io_url[] ary) {
@@ -135,7 +135,7 @@ public class Xob_fxt {
}
private void Test_expd_files() {
if (expd_list.Count() > 0) {
Io_fil_chkr[] expd = (Io_fil_chkr[])expd_list.XtoAry(Io_fil_chkr.class);
Io_fil_chkr[] expd = (Io_fil_chkr[])expd_list.Xto_ary(Io_fil_chkr.class);
Io_fil[] actl = wiki_();
tst_mgr.Tst_ary("all", expd, actl);
}
@@ -145,7 +145,7 @@ public class Xob_fxt {
wiki_fil_add(rv, wiki.Fsys_mgr().Ns_dir());
wiki_fil_add(rv, wiki.Fsys_mgr().Site_dir());
rv.Sort();
return (Io_fil[])rv.XtoAry(Io_fil.class);
return (Io_fil[])rv.Xto_ary(Io_fil.class);
}
private void wiki_fil_add(ListAdp list, Io_url root_dir) {
Io_url[] ary = Io_mgr._.QueryDir_args(root_dir).Recur_().ExecAsUrlAry();

4
400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr_tst.java
View File

@@ -89,7 +89,7 @@ public class Xob_wiki_cfg_bldr_tst {
// String[] terms = String_.Split(line, '|');
// sb.Add(lang_code).Add("|").Add(String_.Trim(terms[0])).Add("|").Add(String_.Trim(terms[1])).Add("\n");
// }
// Tfds.Write(sb.XtoStrAndClear());
// Tfds.Write(sb.Xto_str_and_clear());
// }
@Test public void Ns_aliases() {
Io_mgr._.InitEngine_mem();
@@ -144,7 +144,7 @@ public class Xob_wiki_cfg_bldr_tst {
}
catch(Exception e) {sb.Add("// fail: " + wiki + " " + Err_.Message_gplx_brief(e)).Add_char_nl();}
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
}
class Xob_wiki_cfg_bldr_fxt {

2
400_xowa/src/gplx/xowa/bldrs/imports/Xob_page_txt.java
View File

@@ -47,7 +47,7 @@ public class Xob_page_txt extends Xob_itm_dump_base implements Xobd_wkr, GfoInvk
// idx: EX: 00100|aB64|Ttl;
Xob_tmp_wtr ttl_wtr = ttl_wtr_mgr.Get_or_new(ns);
int file_idx = page_wtr.Fil_idx(), row_idx = page_wtr.Idx_pos() - ListAdp_.LastIdxOffset;
page.Db_file_idx_(file_idx).Db_row_idx_(row_idx);
page.Text_db_id_(file_idx).Db_row_idx_(row_idx);
if (ttl_wtr.FlushNeeded(Xodb_page_.Txt_ttl_len__fixed + ttl_len)) ttl_wtr.Flush(bldr.Usr_dlg());
Xodb_page_.Txt_ttl_save(ttl_wtr.Bfr(), id, file_idx, row_idx, redirect, text_len, ttl_wo_ns);
}

4
400_xowa/src/gplx/xowa/bldrs/imports/Xob_search_base.java
View File

@@ -73,7 +73,7 @@ public abstract class Xob_search_base extends Xob_itm_dump_base implements Xobd_
while (true) {
if (word_done || i == ttl_len) {
if (bfr.Len() > 0) {
byte[] word = bfr.XtoAry();
byte[] word = bfr.Xto_bry();
word_ref.Val_(word);
if (!list.Has(word_ref)) list.Add(word_ref, word);
bfr.ClearAndReset();
@@ -104,7 +104,7 @@ public abstract class Xob_search_base extends Xob_itm_dump_base implements Xobd_
}
}
bfr.ClearAndReset();
byte[][] rv = (byte[][])list.XtoAry(byte[].class);
byte[][] rv = (byte[][])list.Xto_ary(byte[].class);
list.Clear(); list.ResizeBounds(16);
return rv;
}

2
400_xowa/src/gplx/xowa/bldrs/imports/Xobc_core_batch.java
View File

@@ -30,7 +30,7 @@ public class Xobc_core_batch implements GfoInvkAble {
bz2_fil.Fil_(bz2_fil_url).Parse(bz2_fil_url.NameOnly());
fmtr.Bld_bfr_many(bfr, bz2_fil_url.Raw(), bz2_fil.Domain());
bldr.Usr_dlg().Note_many(GRP_KEY, "bgn", "starting script for ~{0}", String_.new_utf8_(bz2_fil.Domain()));
bldr.App().Gfs_mgr().Run_str(bfr.XtoStrAndClear());
bldr.App().Gfs_mgr().Run_str(bfr.Xto_str_and_clear());
}
}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {

2
400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Uca_trie_tst.java
View File

@@ -40,6 +40,6 @@ class Uca_trie_fxt {
public void Init_trie_itm(String charAsStr, byte[] uca) {trie.Init_itm(gplx.intl.Utf16_.Decode_to_int(Bry_.new_utf8_(charAsStr), 0), uca);}
public void Test_decode(byte[] bry, String expd) {
trie.Decode(bfr, bry, 0, bry.length);
Tfds.Eq(expd, bfr.XtoStrAndClear());
Tfds.Eq(expd, bfr.Xto_str_and_clear());
}
}

2
400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_category_registry_sql_tst.java
View File

@@ -58,6 +58,6 @@ class Xob_category_registry_sql_fxt {
String[] flds = String_.Split(line, '|');
list.Add(Base85_utl.XtoIntByStr(flds[1]));
}
return (int[])list.XtoAryAndClear(int.class);
return (int[])list.Xto_ary_and_clear(int.class);
}
}

2
400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_categorylinks_base.java
View File

@@ -53,7 +53,7 @@ public abstract class Xob_categorylinks_base extends Xob_sql_dump_base implement
trie.Init();
}
trie.Decode(uca_bfr, cur_sortkey, 0, cur_sortkey.length);
cur_sortkey = uca_bfr.Len() == 0 ? Sortkey_space : uca_bfr.XtoAryAndClear();
cur_sortkey = uca_bfr.Len() == 0 ? Sortkey_space : uca_bfr.Xto_bry_and_clear();
}
fld_wtr.Bfr_(file_bfr);
fld_wtr.Write_bry_escape_fld(cur_ctg);

2
400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_categorylinks_sql.java
View File

@@ -23,7 +23,7 @@ public class Xob_categorylinks_sql extends Xob_categorylinks_base {
@Override public String Cmd_key() {return KEY;} public static final String KEY = "import.sql.categorylinks";
@Override public Io_sort_cmd Make_sort_cmd(Sql_file_parser sql_parser) {return new Xob_categorylinks_sql_make(sql_parser, wiki, idx_mode);}
public static final String Tbl_categorylinks = String_.Concat_lines_nl
( "CREATE TABLE `categorylinks` ("
( "CREATE TABLE `categorylinks` ("
, " `cl_from` int(10) unsigned NOT NULL DEFAULT '0',"
, " `cl_to` varbinary(255) NOT NULL DEFAULT '',"
, " `cl_sortkey` varbinary(230) NOT NULL DEFAULT '',"

2
400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_categorylinks_sql_tst.java
View File

@@ -128,7 +128,7 @@ class Db_tst_qry {
if (!pass) {
bfr.Add(Lbl_row_hdr).Add_int_variable(expd_row_idx).Add_byte_nl();
bfr.Add_str(qry.XtoSql()).Add_byte(Byte_ascii.Semic);
throw Err_.new_(bfr.XtoStrAndClear());
throw Err_.new_(bfr.Xto_str_and_clear());
}
} static final byte[] Lbl_row_hdr = Bry_.new_ascii_("row: "), Lbl_eq_y = Bry_.new_ascii_(" == "), Lbl_eq_n = Bry_.new_ascii_(" != ");
public static Db_tst_qry tbl_(String tbl_name, String order_by) {return new_(Db_qry_.select_tbl_(tbl_name).OrderBy_asc_(order_by));}

2
400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_ctg_v1_base.java
View File

@@ -133,7 +133,7 @@ public abstract class Xob_ctg_v1_base extends Xob_itm_dump_base implements Xobd_
}
private void wkr_hooks_add(Bry_bfr tmp_bfr, byte[] word) {
tmp_bfr.Add_byte(Byte_ascii.Brack_bgn).Add_byte(Byte_ascii.Brack_bgn).Add(word).Add_byte(Byte_ascii.Colon);
byte[] key = tmp_bfr.XtoAryAndClear();
byte[] key = tmp_bfr.Xto_bry_and_clear();
if (!wkr_hooks.Has(key)) wkr_hooks.Add(key, key);
}
static final String GRP_KEY = "xowa.bldr.make_ctg";

2
400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_ctg_v1_base_tst.java
View File

@@ -44,7 +44,7 @@ class Xodb_page_wkr_ctg_fxt {
Xodb_page page = new Xodb_page().Text_(src);//.Ttl_(Bry_.new_utf8_("Test"), new Xow_ns_mgr());
mgr.Wkr_bgn(bldr);
mgr.Wkr_run(page);
byte[][] ttl = (byte[][])wkr.Found().XtoAry(byte[].class);
byte[][] ttl = (byte[][])wkr.Found().Xto_ary(byte[].class);
String[] actl = new String[ttl.length];
for (int i = 0; i < actl.length; i++) {
actl[i] = String_.new_utf8_(ttl[i]);

2
400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_ctg_v1_sql.java
View File

@@ -71,6 +71,6 @@ class Xob_ctg_v1_sql_make implements Io_make_cmd {
}
}
bfr.Mkr_rls();
return dirty ? bfr.XtoAryAndClear() : bry;
return dirty ? bfr.Xto_bry_and_clear() : bry;
}
}

4
400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang_kwds.java
View File

@@ -70,7 +70,7 @@ public class Xobc_utl_make_lang_kwds implements GfoInvkAble, Xol_lang_transform
if (!tmp.Has(itm)) tmp.Add(itm, itm);
}
}
byte[][] words = (byte[][])tmp.XtoAry(byte[].class);
byte[][] words = (byte[][])tmp.Xto_ary(byte[].class);
kwd_grp.Srl_load(kwd_grp.Case_match(), words);
}
}
@@ -138,7 +138,7 @@ public class Xobc_utl_make_lang_kwds implements GfoInvkAble, Xol_lang_transform
if (last) break;
++pos;
}
return (Xobcl_kwd_row[])rv.XtoAry(Xobcl_kwd_row.class);
return (Xobcl_kwd_row[])rv.Xto_ary(Xobcl_kwd_row.class);
}
}
class Xobcl_kwd_lang {

2
400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang_tst.java
View File

@@ -174,6 +174,6 @@ class Xobc_utl_make_lang_fxt {
}
sb.Add_char_nl();
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
}

10
400_xowa/src/gplx/xowa/bldrs/langs/Xol_mw_lang_parser.java
View File

@@ -114,7 +114,7 @@ public class Xol_mw_lang_parser {
public void Parse_core(String text, Xol_lang lang, Bry_bfr bfr, Xol_lang_transform lang_transform) {
evaluator.Clear();
parser.Parse_tkns(text, evaluator);
Php_line[] lines = (Php_line[])evaluator.List().XtoAry(Php_line.class);
Php_line[] lines = (Php_line[])evaluator.List().Xto_ary(Php_line.class);
int lines_len = lines.length;
ListAdp bry_list = ListAdp_.new_();
for (int i = 0; i < lines_len; i++) {
@@ -173,7 +173,7 @@ public class Xol_mw_lang_parser {
evaluator.Clear();
parser.Parse_tkns(text, evaluator);
ListAdp bry_list = ListAdp_.new_();
Php_line[] lines = (Php_line[])evaluator.List().XtoAry(Php_line.class);
Php_line[] lines = (Php_line[])evaluator.List().Xto_ary(Php_line.class);
int lines_len = lines.length;
for (int i = 0; i < lines_len; i++) {
Php_line_assign line = (Php_line_assign)lines[i];
@@ -216,7 +216,7 @@ public class Xol_mw_lang_parser {
}
}
public Xow_ns[] Parse_namespace_strings(ListAdp list, boolean ns_names) {
byte[][] brys = (byte[][])list.XtoAry(byte[].class);
byte[][] brys = (byte[][])list.Xto_ary(byte[].class);
int brys_len = brys.length;
Xow_ns[] rv = new Xow_ns[brys_len / 2];
int key_dif = ns_names ? 0 : 1;
@@ -232,7 +232,7 @@ public class Xol_mw_lang_parser {
return rv;
}
private void Parse_messages(ListAdp rv, Xol_lang lang, Bry_bfr bfr) {
byte[][] brys = (byte[][])rv.XtoAry(byte[].class);
byte[][] brys = (byte[][])rv.Xto_ary(byte[].class);
int brys_len = brys.length;
Xol_msg_mgr mgr = lang.Msg_mgr();
ListAdp quote_itm_list = ListAdp_.new_(); Byte_obj_ref quote_parse_result = Byte_obj_ref.zero_();
@@ -308,7 +308,7 @@ public class Xol_mw_lang_parser {
byte[] key_bry = Php_itm_.Parse_bry(kv.Key()), val_bry = Php_itm_.Parse_bry(kv.Val());
val_bry = php_quote_parser.Parse_as_bry(tmp_list, val_bry, tmp_result, tmp_bfr);
Xol_csv_parser._.Load(tmp_bfr, val_bry);
val_bry = tmp_bfr.XtoAryAndClear();
val_bry = tmp_bfr.Xto_bry_and_clear();
if ( Bry_.Eq(key_bry, Bry_separatorTransformTable_dot)
|| Bry_.Eq(key_bry, Bry_separatorTransformTable_comma)
)

2
400_xowa/src/gplx/xowa/bldrs/oimgs/Xob_dump_mgr_base.java
View File

@@ -282,7 +282,7 @@ class Xob_rate_mgr {
.Add_int_variable(count).Add_byte_pipe()
.Add_int_variable(dif).Add_byte_nl()
;
Io_mgr._.AppendFilByt(log_file, save_bfr.XtoAryAndClear());
Io_mgr._.AppendFilByt(log_file, save_bfr.Xto_bry_and_clear());
}
public String Rate_as_str() {return Int_.Xto_str(Rate());}
public int Rate() {

2
400_xowa/src/gplx/xowa/bldrs/oimgs/Xob_parse_all_src_sql.java
View File

@@ -44,7 +44,7 @@ class Xob_dump_src_ttl implements Xob_parse_all_db {
if (file.Tid() == Xodb_file_tid.Tid_text)
text_files_list.Add(file);
}
return (Xodb_file[])text_files_list.XtoAryAndClear(Xodb_file.class);
return (Xodb_file[])text_files_list.Xto_ary_and_clear(Xodb_file.class);
}
}
class Xob_dump_src_id {

4
400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xob_subpage_parser.java
View File

@@ -25,7 +25,7 @@ class Xob_subpage_parser {
Php_parser php_parser = new Php_parser();
Php_evaluator eval = new Php_evaluator(new Gfo_msg_log("test"));
php_parser.Parse_tkns(src, eval);
Php_line[] lines = (Php_line[])eval.List().XtoAry(Php_line.class);
Php_line[] lines = (Php_line[])eval.List().Xto_ary(Php_line.class);
Php_line_assign line = (Php_line_assign)lines[0];
Php_itm_ary root_ary = (Php_itm_ary)line.Val();
Php_itm_kv root_kv = (Php_itm_kv)root_ary.Subs_get(0);
@@ -41,7 +41,7 @@ class Xob_subpage_parser {
catch (Exception e) {
throw Err_.new_fmt_("parse failed; src={0} err={1}", String_.new_utf8_(src), Err_.Message_gplx(e));
}
return (Xob_subpage_wiki[])wikis_list.XtoAry(Xob_subpage_wiki.class);
return (Xob_subpage_wiki[])wikis_list.Xto_ary(Xob_subpage_wiki.class);
}
private void Parse_wiki(Php_itm_kv wiki_tkn, Xob_subpage_wiki wiki_itm) {
wiki_itm.Name_(wiki_tkn.Key().Val_obj_bry());

4
400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api.java
View File

@@ -69,7 +69,7 @@ public class Xoi_wiki_props_api {
sub_itm.Init_by_xml(sub_nde);
list.Add(sub_itm);
}
return (Xoi_wiki_props_alias[])list.XtoAryAndClear(Xoi_wiki_props_alias.class);
return (Xoi_wiki_props_alias[])list.Xto_ary_and_clear(Xoi_wiki_props_alias.class);
}
private Xoi_wiki_props_ns[] Parse_ns_ary(XmlNde xnde) {
int xndes_len = xnde.SubNdes().Count();
@@ -81,6 +81,6 @@ public class Xoi_wiki_props_api {
sub_itm.Init_by_xml(sub_nde);
list.Add(sub_itm);
}
return (Xoi_wiki_props_ns[])list.XtoAryAndClear(Xoi_wiki_props_ns.class);
return (Xoi_wiki_props_ns[])list.Xto_ary_and_clear(Xoi_wiki_props_ns.class);
}
}

6
400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api_tst.java
View File

@@ -75,7 +75,7 @@ class Xoi_wiki_props_fxt {
}
public void Test_build(Xoi_wiki_props_wiki wiki, String expd) {
api.Build_cfg(bfr, wiki);
Tfds.Eq_str_lines(expd, bfr.XtoStrAndClear());
Tfds.Eq_str_lines(expd, bfr.Xto_str_and_clear());
}
private String Xto_str(Xoi_wiki_props_wiki v) {
int len = v.Alias_ary().length;
@@ -91,7 +91,7 @@ class Xoi_wiki_props_fxt {
bfr.Add_int_variable(ns.Id()).Add_byte_pipe().Add_int_bool(ns.Subpages_enabled()).Add_byte_nl();
}
bfr.Add_byte_nl();
return bfr.XtoStrAndClear();
return bfr.Xto_str_and_clear();
}
}
class Xob_subpage_tst_fxt {
@@ -120,7 +120,7 @@ class Xob_subpage_tst_fxt {
}
public String X_str_wikis(Xob_subpage_wiki[] ary) {
X_str_wikis(sb, ary);
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
private void X_str_wikis(String_bldr sb, Xob_subpage_wiki[] ary) {

2
400_xowa/src/gplx/xowa/bldrs/xmls/Xob_siteinfo_parser.java
View File

@@ -51,7 +51,7 @@ public class Xob_siteinfo_parser {
else if ( String_.Eq(sub_nde.Name(), "#text")) {} // NOTE: JAVA has node names for "#text"
// else throw Err_mgr._.fmt_(GRP_KEY, "siteinfo.root.unknown_sub", "unknown sub for root nde: ~{0}", sub_nde.Name()); // NOTE: do not fail if MW introduces something odd in future (or if JAVA starts picking up other elements)
}
wiki.Props().Siteinfo_misc_(siteinfo_misc_bfr.XtoAryAndClear());
wiki.Props().Siteinfo_misc_(siteinfo_misc_bfr.Xto_bry_and_clear());
wiki.Props().Bldr_version_(Bry_.new_ascii_(Xoa_app_.Version));
}
private static byte[] Siteinfo_parse_mainpage(byte[] url) {

6
400_xowa/src/gplx/xowa/bldrs/xmls/Xob_xml_page_bldr.java
View File

@@ -18,16 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx.xowa.bldrs.xmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
import gplx.ios.*;
public class Xob_xml_page_bldr {
public byte[] Xto_bry() {return bfr.XtoAryAndClear();}
public byte[] Xto_bry() {return bfr.Xto_bry_and_clear();}
public Io_buffer_rdr XtoByteStreamRdr() {return XtoByteStreamRdr(Io_mgr.Len_kb);}
public Io_buffer_rdr XtoByteStreamRdr(int bfr_len) {
Io_url url = Io_url_.mem_fil_("mem/byteStreamRdr.txt");
Io_mgr._.SaveFilBry(url, bfr.XtoAryAndClear());
Io_mgr._.SaveFilBry(url, bfr.Xto_bry_and_clear());
return Io_buffer_rdr.new_(gplx.ios.Io_stream_rdr_.file_(url), bfr_len);
}
public Bry_bfr Bfr() {return bfr;} Bry_bfr bfr = Bry_bfr.new_();
public Xob_xml_page_bldr Upd(String find, String repl) {
String all = bfr.XtoStrAndClear();
String all = bfr.Xto_str_and_clear();
all = String_.Replace(all, find, repl);
bfr.Add_str(all);
return this;

4
400_xowa/src/gplx/xowa/bldrs/xmls/Xob_xml_parser.java
View File

@@ -74,13 +74,13 @@ public class Xob_xml_parser {
case Xob_xml_parser_.Id_title_end:
if (title_needed) {
data_bfr_add = false;
byte[] ttl = data_bfr.XtoAryAndClear();
byte[] ttl = data_bfr.Xto_bry_and_clear();
Bry_.Replace_reuse(ttl, Byte_ascii.Space, Byte_ascii.Underline);
rv.Ttl_(ttl, ns_mgr);
title_needed = false;
}
break;
case Xob_xml_parser_.Id_text_end: data_bfr_add = false; rv.Text_(data_bfr.XtoAryAndClear()); break;
case Xob_xml_parser_.Id_text_end: data_bfr_add = false; rv.Text_(data_bfr.Xto_bry_and_clear()); break;
case Xob_xml_parser_.Id_amp: case Xob_xml_parser_.Id_quot: case Xob_xml_parser_.Id_lt: case Xob_xml_parser_.Id_gt:
case Xob_xml_parser_.Id_cr_nl: case Xob_xml_parser_.Id_cr:
if (data_bfr_add) data_bfr.Add_byte(itm.Subst_byte());

2
400_xowa/src/gplx/xowa/cfgs2/Xocfg_bnd_itm_srl.java
View File

@@ -39,7 +39,7 @@ public class Xocfg_bnd_itm_srl implements GfoInvkAble {
Gfs_wtr wtr = app.Gfs_mgr().Wtr();
wtr.Add_set_eq(Key_box, Bry_.new_ascii_(Xog_bnd_box_.Xto_sys_str(box)));
wtr.Add_set_eq(Key_ipt, Bry_.new_ascii_(ipt.Key()));
return wtr.Bfr().XtoStrAndClear();
return wtr.Bfr().Xto_str_and_clear();
} private static final byte[] Key_box = Bry_.new_ascii_("box"), Key_ipt = Bry_.new_ascii_("ipt");
public static void Src_(Xoa_app app, Xocfg_bnd_itm_srl itm, String v) {
Xoa_gfs_mgr gfs_mgr = app.Gfs_mgr();

4
400_xowa/src/gplx/xowa/ctgs/Xoctg_fmtr_all.java
View File

@@ -111,7 +111,7 @@ class Xoctg_fmtr_all {
Bry_bfr bfr = wiki.Utl_bry_bfr_mkr().Get_k004();
Html_nav_bry(bfr, wiki, ttl, view_grp, Bool_.N);
Html_nav_bry(bfr, wiki, ttl, view_grp, Bool_.Y);
return bfr.Mkr_rls().XtoAryAndClear();
return bfr.Mkr_rls().Xto_bry_and_clear();
}
private void Html_nav_bry(Bry_bfr bfr, Xow_wiki wiki, Xoa_ttl ttl, Xoctg_view_grp view_grp, boolean fill_at_bgn) {
Bry_bfr href_bfr = wiki.Utl_bry_bfr_mkr().Get_b512();
@@ -130,7 +130,7 @@ class Xoctg_fmtr_all {
href_bfr.Add_byte(Byte_ascii.Question).Add(arg_idx_lbl).Add_byte(Byte_ascii.Eq); // filefrom=
href_bfr.Add(arg_sortkey); // Abc
href_bfr.Add_byte(Byte_ascii.Hash).Add(div_id); // #mw-subcategories
byte[] nav_href = href_bfr.Mkr_rls().XtoAryAndClear();
byte[] nav_href = href_bfr.Mkr_rls().Xto_bry_and_clear();
byte[] nav_ttl = ttl.Full_url();
int nav_text_id = fill_at_bgn ? Xol_msg_itm_.Id_next_results : Xol_msg_itm_.Id_prev_results;
byte[] nav_text = wiki.Msg_mgr().Val_by_id_args(nav_text_id, grp_max); // fill_at_bgn 200 / previous 200

2
400_xowa/src/gplx/xowa/ctgs/Xoctg_fmtr_itm.java
View File

@@ -110,7 +110,7 @@ class Xoctg_fmtr_itm_subc extends Xoctg_fmtr_itm_base {
Bld_contains_text_itm(bfr, Xol_msg_itm_.Id_ctgtree_subc_counts_page, sub_pages);
Bld_contains_text_itm(bfr, Xol_msg_itm_.Id_ctgtree_subc_counts_file, sub_files);
bfr.Add_byte(Byte_ascii.Paren_end);
return bfr.Mkr_rls().XtoAryAndClear();
return bfr.Mkr_rls().Xto_bry_and_clear();
}
private void Bld_contains_text_itm(Bry_bfr bfr, int msg_id, int val) {
if (val == 0) return;

6
400_xowa/src/gplx/xowa/ctgs/Xoctg_html_mgr_tst.java
View File

@@ -252,7 +252,7 @@ class Xoh_ctg_page_fxt {
fmtr_itm.Col_idx_(0, 0);
Bry_bfr bfr = wiki.Utl_bry_bfr_mkr().Get_b512();
fmtr_itm.XferAry(bfr, 0);
Tfds.Eq_str_lines(expd, bfr.Mkr_rls().XtoStrAndClear());
Tfds.Eq_str_lines(expd, bfr.Mkr_rls().Xto_str_and_clear());
}
public void Test_html_grp(byte tid, String expd) {
Xoctg_fmtr_all list_mgr = ctg_html.Fmtr(tid);
@@ -260,11 +260,11 @@ class Xoh_ctg_page_fxt {
fmtr_grp.Init_from_all(wiki, wiki.Lang(), ctg, list_mgr, ctg.Grp_by_tid(tid));
Bry_bfr bfr = wiki.Utl_bry_bfr_mkr().Get_b512();
fmtr_grp.XferAry(bfr, 0);
Tfds.Eq_str_lines(expd, bfr.Mkr_rls().XtoStrAndClear());
Tfds.Eq_str_lines(expd, bfr.Mkr_rls().Xto_str_and_clear());
}
public void Test_html_all(byte tid, String expd) {
Bry_bfr bfr = wiki.Utl_bry_bfr_mkr().Get_b512();
ctg_html.Bld_all(bfr, wiki, wiki.Lang(), ctg, tid);
Tfds.Eq_str_lines(expd, bfr.Mkr_rls().XtoStrAndClear());
Tfds.Eq_str_lines(expd, bfr.Mkr_rls().Xto_str_and_clear());
}
}

2
400_xowa/src/gplx/xowa/ctgs/Xoctg_idx_mgr_tst.java
View File

@@ -85,7 +85,7 @@ class Xoctg_idx_mgr_fxt {
if (i < 10) bfr.Add_byte(Byte_ascii.Num_0);
bfr.Add_int_variable(i).Add_byte_pipe();
}
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
public Xoctg_idx_mgr_fxt Init_itms(int block_len, byte[] src) {idx_mgr.Block_len_(block_len); idx_mgr.Index(Gfo_usr_dlg_base.test_(), Ctg_name, src); return this;}
public Xoctg_idx_mgr_fxt Init_block_len(int block_len) {idx_mgr.Block_len_(block_len); return this;}

6
400_xowa/src/gplx/xowa/ctgs/Xoctg_pagelist_wtr_tst.java
View File

@@ -79,9 +79,9 @@ class Xoctg_pagelist_mgr_fxt {
} private ListAdp init_ctgs = ListAdp_.new_();
public void Test_print_hidden(String expd) {
Bry_bfr bfr = Bry_bfr.new_();
Xodb_page[] page_ary = (Xodb_page[])init_ctgs.XtoAryAndClear(Xodb_page.class);
Xodb_page[] page_ary = (Xodb_page[])init_ctgs.Xto_ary_and_clear(Xodb_page.class);
hidden_wtr.Print_hidden(bfr, fxt.Wiki(), page_ary);
Tfds.Eq_str_lines(expd, bfr.XtoStrAndClear());
// Tfds.Write(bfr.XtoAryAndClear());
Tfds.Eq_str_lines(expd, bfr.Xto_str_and_clear());
// Tfds.Write(bfr.Xto_bry_and_clear());
}
}

2
400_xowa/src/gplx/xowa/ctgs/Xoctg_view_grp.java
View File

@@ -36,6 +36,6 @@ public class Xoctg_view_grp {
}
public void Itms_add(Xoctg_view_itm sub) {tmp_list.Add(sub);}
public ListAdp Itms_list() {return tmp_list;} ListAdp tmp_list = ListAdp_.new_();
public void Itms_make() {itms = (Xoctg_view_itm[])tmp_list.XtoAry(Xoctg_view_itm.class);}
public void Itms_make() {itms = (Xoctg_view_itm[])tmp_list.Xto_ary(Xoctg_view_itm.class);}
public byte[] Itms_last_sortkey() {return itms_last_sortkey;} public Xoctg_view_grp Itms_last_sortkey_(byte[] v) {itms_last_sortkey = v; return this;} private byte[] itms_last_sortkey;
}

3
400_xowa/src/gplx/xowa/dbs/Xodb_fsys_mgr.java
View File

@@ -87,7 +87,7 @@ public class Xodb_fsys_mgr {
int file_idx = files_ary_len;
Io_url url = Create_sqlite3(src_dir, trg_dir, wiki_name, file_idx);
Xodb_file rv = Xodb_file.make_(file_idx, file_tid, url.NameAndExt()).Connect_(Db_conn_info_.sqlite_(url));
Xodb_xowa_cfg_tbl.Insert_str(rv.Provider(), "db.meta", "type_name", Xodb_file_tid.Xto_key(file_tid));
Xodb_xowa_cfg_tbl.Insert_str(rv.Provider(), Cfg_grp_db_meta, "type_name", Xodb_file_tid.Xto_key(file_tid));
files_ary = (Xodb_file[])Array_.Resize(files_ary, files_ary_len + 1);
files_ary[files_ary_len++] = rv;
return rv;
@@ -104,4 +104,5 @@ public class Xodb_fsys_mgr {
}
private static final int File_id_core = 0;
public static final int Heap_max_infinite = 0;
public static final String Cfg_grp_db_meta = "db.meta";
}

12
400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql.java
View File

@@ -46,12 +46,12 @@ public class Xodb_load_mgr_sql implements Xodb_load_mgr {
KeyVal kv = kv_ary[i];
gfs_mgr.Build_prop_set(bfr, Bry_.new_utf8_(kv.Key()), Bry_.new_utf8_(kv.Val_to_str_or_empty()));
}
gfs_mgr.Run_str_for(wiki, bfr.XtoStrAndClear());
gfs_mgr.Run_str_for(wiki, bfr.Xto_str_and_clear());
} finally {bfr.Mkr_rls();}
}
public boolean Load_by_ttl(Xodb_page rv, Xow_ns ns, byte[] ttl) {return db_mgr.Tbl_page().Select_by_ttl(rv, ns, ttl);}
public void Load_by_ttls(Cancelable cancelable, OrderedHash rv, boolean fill_idx_fields_only, int bgn, int end) {db_mgr.Tbl_page().Select_by_ttl_in(cancelable, rv, db_mgr.Wiki(), fill_idx_fields_only, bgn, end);}
public void Load_page(Xodb_page rv, Xow_ns ns, boolean timestamp_enabled) {rv.Text_(db_mgr.Tbl_text().Select(rv.Db_file_idx(), rv.Id()));}
public void Load_by_ttls(Cancelable cancelable, OrderedHash rv, boolean fill_idx_fields_only, int bgn, int end) {db_mgr.Tbl_page().Select_by_ttl_in(cancelable, rv, db_mgr.Db_ctx(), fill_idx_fields_only, bgn, end);}
public void Load_page(Xodb_page rv, Xow_ns ns, boolean timestamp_enabled) {rv.Text_(db_mgr.Tbl_text().Select(rv.Text_db_id(), rv.Id()));}
public boolean Load_by_id (Xodb_page rv, int id) {return db_mgr.Tbl_page().Select_by_id(rv, id);}
public void Load_by_ids(Cancelable cancelable, ListAdp rv, int bgn, int end) {db_mgr.Tbl_page().Select_by_id_list(cancelable, false, rv, bgn, end);}
public boolean Load_ctg_v1(Xoctg_view_ctg rv, byte[] ctg_bry) {
@@ -128,7 +128,7 @@ public class Xodb_load_mgr_sql implements Xodb_load_mgr {
if (search_version == gplx.xowa.specials.search.Xosrh_core.Version_1)
db_mgr.Tbl_page().Select_by_search(cancelable, rv, search, results_max);
else {
Xodb_search_title_word_tbl.Select_by_word(cancelable, rv, db_mgr.Wiki(), search, results_max, db_mgr.Fsys_mgr().Get_tid_root(Xodb_file_tid.Tid_search).Provider());
Xodb_search_title_word_tbl.Select_by_word(cancelable, rv, db_mgr.Db_ctx(), search, results_max, db_mgr.Fsys_mgr().Get_tid_root(Xodb_file_tid.Tid_search).Provider());
db_mgr.Tbl_page().Select_by_id_list(cancelable, true, rv);
}
}
@@ -166,7 +166,7 @@ public class Xodb_load_mgr_sql implements Xodb_load_mgr {
hash2.Add(page.Id_val(), page);
}
len = hash2.Count(); // must update len (!hash2.Has() may have skipped titles)
db_mgr.Tbl_category().Select_by_cat_id_in(Cancelable_.Never, hash2, fsys_mgr.Provider_ctg(), db_mgr.Wiki(), 0, len);
return (Xodb_page[])hash.XtoAry(Xodb_page.class);
db_mgr.Tbl_category().Select_by_cat_id_in(Cancelable_.Never, hash2, fsys_mgr.Provider_ctg(), db_mgr.Db_ctx(), 0, len);
return (Xodb_page[])hash.Xto_ary(Xodb_page.class);
}
}

2
400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql_tst.java
View File

@@ -91,7 +91,7 @@ class Xodb_load_mgr_sql_fxt {
bfr.Add(page.Ttl_wo_ns()).Add_byte_pipe();
bfr.Add_byte(Bool_.Xto_byte(ctg_itm.Hidden())).Add_byte_nl();
}
return bfr.XtoStrAndClear();
return bfr.Xto_str_and_clear();
}
public Xoctg_url_mok ctg_url_() {return new Xoctg_url_mok();}

4
400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_txt.java
View File

@@ -24,7 +24,7 @@ public class Xodb_load_mgr_txt implements Xodb_load_mgr {
} private Xow_wiki wiki; Xow_fsys_mgr fsys_mgr;
Xob_xdat_file tmp_xdat_file = new Xob_xdat_file(); Xob_xdat_itm tmp_xdat_itm = new Xob_xdat_itm();
public void Load_init (Xow_wiki wiki) {}
public void Load_page(Xodb_page rv, Xow_ns ns, boolean timestamp_enabled) {Load_page(rv, rv.Db_file_idx(), rv.Db_row_idx(), ns, timestamp_enabled, tmp_xdat_file, tmp_xdat_itm);}
public void Load_page(Xodb_page rv, Xow_ns ns, boolean timestamp_enabled) {Load_page(rv, rv.Text_db_id(), rv.Db_row_idx(), ns, timestamp_enabled, tmp_xdat_file, tmp_xdat_itm);}
public void Load_page(Xodb_page rv, int txtdb_fil_idx, int txtdb_row_idx, Xow_ns ns, boolean timestamp_enabled, Xob_xdat_file xdat_file, Xob_xdat_itm xdat_itm) {
Io_url file = fsys_mgr.Url_ns_fil(Xow_dir_info_.Tid_page, ns.Id(), txtdb_fil_idx);
byte[] bry = gplx.ios.Io_stream_rdr_.Load_all(file); int bry_len = bry.length;
@@ -526,7 +526,7 @@ public class Xodb_load_mgr_txt implements Xodb_load_mgr {
this.Load_by_ttl(page, ns, ttl);
Load_ctg_v2_main(ctg_temp, page.Ttl_wo_ns());
Xodb_category_itm ctg_itm = Xodb_category_itm.load_(page.Id(), page.Db_file_idx(), ctg_temp.Hidden(), ctg_temp.Total_by_tid(Xoa_ctg_mgr.Tid_subc), ctg_temp.Total_by_tid(Xoa_ctg_mgr.Tid_file), ctg_temp.Total_by_tid(Xoa_ctg_mgr.Tid_page));
Xodb_category_itm ctg_itm = Xodb_category_itm.load_(page.Id(), page.Text_db_id(), ctg_temp.Hidden(), ctg_temp.Total_by_tid(Xoa_ctg_mgr.Tid_subc), ctg_temp.Total_by_tid(Xoa_ctg_mgr.Tid_file), ctg_temp.Total_by_tid(Xoa_ctg_mgr.Tid_page));
page.Xtn_(ctg_itm);
rv[i] = page;
}

2
400_xowa/src/gplx/xowa/dbs/Xodb_ns_map_mgr.java
View File

@@ -30,7 +30,7 @@ class Xodb_ns_map_mgr {
Xodb_ns_map_itm itm = Parse_itm(src, line, canonical_ns_mgr);
itms.Add(itm);
}
rv.itms = (Xodb_ns_map_itm[])itms.XtoAryAndClear(Xodb_ns_map_itm.class);
rv.itms = (Xodb_ns_map_itm[])itms.Xto_ary_and_clear(Xodb_ns_map_itm.class);
return rv;
}
private static Xodb_ns_map_itm Parse_itm(byte[] src, byte[] line, Xow_ns_mgr ns_mgr) {

2
400_xowa/src/gplx/xowa/dbs/Xodb_ns_map_mgr_tst.java
View File

@@ -52,6 +52,6 @@ class Xodb_ns_map_mgr_fxt {
}
bfr.Add_byte_nl();
}
return bfr.XtoStrAndClear();
return bfr.Xto_str_and_clear();
}
}

2
400_xowa/src/gplx/xowa/dbs/Xodb_save_mgr_sql.java
View File

@@ -80,7 +80,7 @@ public class Xodb_save_mgr_sql implements Xodb_save_mgr {
Xodb_page db_page = new Xodb_page();
db_mgr.Load_mgr().Load_by_id(db_page, page.Revision_data().Id());
text = zip_mgr.Zip(db_mgr.Data_storage_format(), text);
db_mgr.Tbl_text().Update(db_page.Db_file_idx(), page.Revision_data().Id(), text);
db_mgr.Tbl_text().Update(db_page.Text_db_id(), page.Revision_data().Id(), text);
}
public void Data_rename(Xoa_page page, int trg_ns, byte[] trg_ttl) {
Db_qry qry = Db_qry_.update_common_("page", Db_crt_.eq_("page_id", page.Revision_data().Id())

12
400_xowa/src/gplx/xowa/dbs/Xodb_save_mgr_txt.java
View File

@@ -45,14 +45,14 @@ public class Xodb_save_mgr_txt implements Xodb_save_mgr {
if (Bry_.Len_gt_0(page_rdr_bry)) page_rdr.Parse(page_rdr_bry, page_rdr_bry.length, page_rdr_url);
int row_idx = page_rdr.Count();
Bry_bfr tmp_bfr = wiki.Utl_bry_bfr_mkr().Get_b512();
page_rdr.Insert(tmp_bfr, tmp.XtoAryAndClear());
page_rdr.Insert(tmp_bfr, tmp.Xto_bry_and_clear());
this.Data_save(Xow_dir_info_.Tid_page, page_rdr, page_rdr_url, tmp_bfr);
tmp_bfr.Mkr_rls();
Xoa_ttl redirect_ttl = redirect_mgr.Extract_redirect(text, text_len);
db_page.Set_all_(page_id, fil_idx, row_idx, redirect_ttl != null, text_len, ttl.Page_db());
Xodb_page_.Txt_ttl_save(tmp, db_page);
byte[] ttl_row_bry = tmp.Mkr_rls().XtoAryAndClear();
byte[] ttl_row_bry = tmp.Mkr_rls().Xto_bry_and_clear();
Xowd_hive_mgr ttl_hive = new Xowd_hive_mgr(wiki, Xow_dir_info_.Tid_ttl);
ttl_hive.Create(ttl.Ns(), ttl.Page_db(), ttl_row_bry, Bry_comparer_fld_last._);
wiki.Db_mgr().Load_mgr().Clear(); // NOTE: need to clear cached regy_ary in load_mgr
@@ -77,7 +77,7 @@ public class Xodb_save_mgr_txt implements Xodb_save_mgr {
}
// update page
Xob_xdat_file page_rdr = new Xob_xdat_file(); Xob_xdat_itm page_itm = new Xob_xdat_itm();
load_mgr.Load_page(tmp_page, db_page.Db_file_idx(), db_page.Db_row_idx(), ns, true, page_rdr, page_itm);
load_mgr.Load_page(tmp_page, db_page.Text_db_id(), db_page.Db_row_idx(), ns, true, page_rdr, page_itm);
Bry_bfr tmp_bfr = wiki.Utl_bry_bfr_mkr().Get_b512();
if (text == null) text = tmp_page.Text();
int text_len = text.length;
@@ -87,8 +87,8 @@ public class Xodb_save_mgr_txt implements Xodb_save_mgr {
page.Revision_data().Modified_on_(modified_on);
}
Xodb_page_.Txt_page_save(tmp_bfr, db_page.Id(), modified_on, ttl_bry, text, true);
page_rdr.Update(tmp_bfr, page_itm, tmp_bfr.XtoAryAndClear());
Io_url page_rdr_url = fsys_mgr.Url_ns_fil(Xow_dir_info_.Tid_page, ttl.Ns().Id(), db_page.Db_file_idx());
page_rdr.Update(tmp_bfr, page_itm, tmp_bfr.Xto_bry_and_clear());
Io_url page_rdr_url = fsys_mgr.Url_ns_fil(Xow_dir_info_.Tid_page, ttl.Ns().Id(), db_page.Text_db_id());
this.Data_save(Xow_dir_info_.Tid_page, page_rdr, page_rdr_url, tmp_bfr);
tmp_bfr.Mkr_rls();
// update ttl
@@ -97,7 +97,7 @@ public class Xodb_save_mgr_txt implements Xodb_save_mgr {
db_page.Type_redirect_(redirect_ttl != null);
Bry_bfr tmp = wiki.Utl_bry_bfr_mkr().Get_b512();
Xodb_page_.Txt_ttl_save(tmp, db_page);
byte[] ttl_row_bry = tmp.XtoAryAndClear();
byte[] ttl_row_bry = tmp.Xto_bry_and_clear();
tmp.Mkr_rls();
Xowd_hive_mgr ttl_hive = new Xowd_hive_mgr(wiki, Xow_dir_info_.Tid_ttl);
ttl_hive.Update(ns, old_ttl, new_ttl, ttl_row_bry, Xodb_page_.Txt_ttl_pos, Byte_ascii.Pipe, true, true);

4
400_xowa/src/gplx/xowa/dbs/tbls/Xodb_category_tbl.java
View File

@@ -57,10 +57,10 @@ public class Xodb_category_tbl {
} finally {stmt.Rls(); rdr.Rls();}
return Xodb_category_itm.Null;
}
public void Select_by_cat_id_in(Cancelable cancelable, OrderedHash rv, Db_provider p, Xow_wiki wiki, int bgn, int end) {
public void Select_by_cat_id_in(Cancelable cancelable, OrderedHash rv, Db_provider p, Xodb_ctx db_ctx, int bgn, int end) {
Xodb_in_wkr_category_id wkr = new Xodb_in_wkr_category_id();
wkr.Init(rv);
wkr.Select_in(p, cancelable, wiki, bgn, end);
wkr.Select_in(p, cancelable, db_ctx, bgn, end);
}
public static Xodb_category_itm Read_ctg(DataRdr rdr) {
return Xodb_category_itm.load_

7
400_xowa/src/gplx/xowa/dbs/tbls/Xodb_in_wkr_base.java
View File

@@ -21,12 +21,11 @@ public abstract class Xodb_in_wkr_base {
public abstract int Interval();
public abstract void Fill_stmt(Db_stmt stmt, int bgn, int end);
public abstract Db_qry Build_qry(Xodb_ctx tbl_ctx, int bgn, int end);
public abstract void Eval_rslts(Cancelable cancelable, Xow_wiki wiki, DataRdr rdr);
public void Select_in(Db_provider provider, Cancelable cancelable, Xow_wiki wiki, int full_bgn, int full_end) {
public abstract void Eval_rslts(Cancelable cancelable, Xodb_ctx db_ctx, DataRdr rdr);
public void Select_in(Db_provider provider, Cancelable cancelable, Xodb_ctx db_ctx, int full_bgn, int full_end) {
DataRdr rdr = DataRdr_.Null;
Db_stmt stmt = Db_stmt_.Null;
int interval = Interval();
Xodb_ctx db_ctx = wiki.Db_mgr().Db_ctx();
for (int i = full_bgn; i < full_end; i += interval) {
int part_end = i + interval;
if (part_end > full_end) part_end = full_end;
@@ -34,7 +33,7 @@ public abstract class Xodb_in_wkr_base {
stmt = provider.Prepare(Build_qry(db_ctx, i, part_end));
Fill_stmt(stmt, i, part_end);
rdr = stmt.Exec_select();
Eval_rslts(cancelable, wiki, rdr);
Eval_rslts(cancelable, db_ctx, rdr);
}
finally {rdr.Rls(); stmt.Rls();}
}

14
400_xowa/src/gplx/xowa/dbs/tbls/Xodb_in_wkr_page.java
View File

@@ -57,10 +57,10 @@ class Xodb_in_wkr_page_title extends Xodb_in_wkr_page_base {
@Override public Xodb_page Eval_rslts_key(Xodb_page rdr_page) {return (Xodb_page)hash.Fetch(rdr_page.Ttl_wo_ns());}
}
class Xodb_in_wkr_page_title_ns extends Xodb_in_wkr_page_base {
private Xow_wiki wiki;
private Xow_ns_mgr ns_mgr;
private OrderedHash hash;
@Override public int Interval() {return 64;} // NOTE: 96+ overflows; EX: w:Space_Liability_Convention; DATE:2013-10-24
public void Init(Xow_wiki wiki, OrderedHash hash) {this.wiki = wiki; this.hash = hash;}
@Override public int Interval() {return 64;} // NOTE: 96+ overflows; PAGE:en.w:Space_Liability_Convention; DATE:2013-10-24
public void Init(Xow_ns_mgr ns_mgr, OrderedHash hash) {this.ns_mgr = ns_mgr; this.hash = hash;}
@Override public String In_fld_name() {return Xodb_page_tbl.Fld_page_title;}
@Override public Criteria In_filter(Object[] part_ary) {
int len = part_ary.length;
@@ -77,7 +77,7 @@ class Xodb_in_wkr_page_title_ns extends Xodb_in_wkr_page_base {
}
}
@Override public Xodb_page Eval_rslts_key(Xodb_page rdr_page) {
Xow_ns ns = wiki.Ns_mgr().Ids_get_or_null(rdr_page.Ns_id());
Xow_ns ns = ns_mgr.Ids_get_or_null(rdr_page.Ns_id());
if (ns == null) return null; // NOTE: ns seems to "randomly" be null when threading during redlinks; guard against null; DATE:2014-01-03
byte[] ttl_wo_ns = rdr_page.Ttl_wo_ns();
rdr_page.Ttl_(ns, ttl_wo_ns);
@@ -99,9 +99,9 @@ abstract class Xodb_in_wkr_page_base extends Xodb_in_wkr_base {
)
;
}
@Override public void Eval_rslts(Cancelable cancelable, Xow_wiki wiki, DataRdr rdr) {
@Override public void Eval_rslts(Cancelable cancelable, Xodb_ctx db_ctx, DataRdr rdr) {
Xodb_page temp = new Xodb_page();
boolean html_db_enabled = wiki.Db_mgr().Hdump_mgr().Enabled();
boolean html_db_enabled = db_ctx.Html_db_enabled();
while (rdr.MoveNextPeer()) {
if (cancelable.Canceled()) return;
if (fill_idx_fields_only)
@@ -134,7 +134,7 @@ class Xodb_in_wkr_category_id extends Xodb_in_wkr_base {
stmt.Val_int_(page.Id());
}
}
@Override public void Eval_rslts(Cancelable cancelable, Xow_wiki wiki, DataRdr rdr) {
@Override public void Eval_rslts(Cancelable cancelable, Xodb_ctx db_ctx, DataRdr rdr) {
while (rdr.MoveNextPeer()) {
if (cancelable.Canceled()) return;
Xodb_category_itm ctg_data = Xodb_category_tbl.Read_ctg(rdr);

45
400_xowa/src/gplx/xowa/dbs/tbls/Xodb_page_tbl.java
View File

@@ -22,9 +22,9 @@ public class Xodb_page_tbl {
, Fld_page_id = "page_id", Fld_page_ns = "page_namespace", Fld_page_title = "page_title"
, Fld_page_is_redirect = "page_is_redirect", Fld_page_touched = "page_touched", Fld_page_len = "page_len"
, Fld_page_random_int = "page_random_int", Fld_page_file_idx = "page_file_idx"
, Fld_page_html_db_id = "page_html_db_id";
, Fld_page_html_db_id = "page_html_db_id", Fld_page_redirect_id = "page_redirect_id";
private static final String[] Select_by_id_flds__basic = new String[] {Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_touched, Fld_page_is_redirect, Fld_page_len, Fld_page_file_idx};
private static final String[] Select_by_id_flds__hdump = new String[] {Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_touched, Fld_page_is_redirect, Fld_page_len, Fld_page_file_idx, Fld_page_html_db_id};
private static final String[] Select_by_id_flds__hdump = new String[] {Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_touched, Fld_page_is_redirect, Fld_page_len, Fld_page_file_idx, Fld_page_html_db_id, Fld_page_redirect_id};
// public boolean Select_by_id(Xodb_page rv, int page_id) {
// Db_rdr rdr = Db_rdr_.Null;
// Db_stmt stmt = Db_stmt_.Null;
@@ -37,7 +37,14 @@ public class Xodb_page_tbl {
// }
// } finally {rdr.Close(); stmt.Rls();}
// return false;
// }
// }
private final Xow_ns_mgr ns_mgr; private final Xodb_ctx db_ctx;
public Xodb_page_tbl(Xow_wiki wiki) {
this.ns_mgr = wiki.Ns_mgr();
this.db_ctx = wiki.Db_mgr().Db_ctx();
}
public void Html_db_enabled_(boolean v) {html_db_enabled = v;} private boolean html_db_enabled;
public Db_provider Provider() {return provider;} public void Provider_(Db_provider provider) {this.provider = provider;} private Db_provider provider;
public boolean Select_by_ttl(Xodb_page rv, Xow_ns ns, byte[] ttl) {
Db_rdr rdr = Db_rdr_.Null; Db_stmt stmt = Db_stmt_.Null;
try {
@@ -57,9 +64,11 @@ public class Xodb_page_tbl {
page.Modified_on_ (DateAdp_.parse_fmt(rdr.Read_str(3), Page_touched_fmt));
page.Type_redirect_ (rdr.Read_byte(4) == 1);
page.Text_len_ (rdr.Read_int(5));
page.Db_file_idx_ (rdr.Read_int(6));
if (html_db_enabled)
page.Text_db_id_ (rdr.Read_int(6));
if (html_db_enabled) {
page.Html_db_id_(rdr.Read_int(7));
page.Redirect_id_(rdr.Read_int(8));
}
}
public boolean Select_by_id(Xodb_page rv, int page_id) {
DataRdr rdr = DataRdr_.Null;
@@ -76,10 +85,6 @@ public class Xodb_page_tbl {
} finally {rdr.Rls(); stmt.Rls();}
return false;
}
private Xow_wiki wiki;
public Xodb_page_tbl(Xow_wiki wiki) {this.wiki = wiki;}
public void Html_db_enabled_(boolean v) {html_db_enabled = v;} private boolean html_db_enabled;
public Db_provider Provider() {return provider;} public void Provider_(Db_provider provider) {this.provider = provider;} private Db_provider provider;
public void Delete_all() {provider.Exec_qry(Db_qry_.delete_tbl_(Tbl_name));}
public Db_stmt Insert_stmt(Db_provider p) {
return Db_stmt_.new_insert_(p, Tbl_name, html_db_enabled ? Flds_insert__html_y : Flds_insert__html_n);
@@ -188,7 +193,7 @@ public class Xodb_page_tbl {
public boolean Select_by_id_list(Cancelable cancelable, ListAdp rv) {return Select_by_id_list(cancelable, false, rv, 0, rv.Count());}
public boolean Select_by_id_list(Cancelable cancelable, boolean skip_table_read, ListAdp rv) {return Select_by_id_list(cancelable, skip_table_read, rv, 0, rv.Count());}
public boolean Select_by_id_list(Cancelable cancelable, boolean skip_table_read, ListAdp rv, int bgn, int end) {
Xodb_page[] page_ary = (Xodb_page[])rv.XtoAry(Xodb_page.class);
Xodb_page[] page_ary = (Xodb_page[])rv.Xto_ary(Xodb_page.class);
int len = page_ary.length; if (len == 0) return false;
OrderedHash hash = OrderedHash_.new_();
for (int i = 0; i < len; i++) {
@@ -199,7 +204,7 @@ public class Xodb_page_tbl {
}
Xodb_in_wkr_page_id wkr = new Xodb_in_wkr_page_id();
wkr.Init(rv, hash);
wkr.Select_in(provider, cancelable, wiki, bgn, end);
wkr.Select_in(provider, cancelable, db_ctx, bgn, end);
return true;
}
public byte[] Select_random(Xow_ns ns) {// ns should be ns_main
@@ -270,16 +275,16 @@ public class Xodb_page_tbl {
}
} finally {rdr.Rls();}
}
public void Select_by_ttl_in(Cancelable cancelable, OrderedHash rv, Xow_wiki wiki, boolean fill_idx_fields_only, int bgn, int end) {
public void Select_by_ttl_in(Cancelable cancelable, OrderedHash rv, Xodb_ctx db_ctx, boolean fill_idx_fields_only, int bgn, int end) {
Xodb_in_wkr_page_title_ns wkr = new Xodb_in_wkr_page_title_ns();
wkr.Fill_idx_fields_only_(fill_idx_fields_only);
wkr.Init(wiki, rv);
wkr.Select_in(provider, cancelable, wiki, bgn, end);
wkr.Init(ns_mgr, rv);
wkr.Select_in(provider, cancelable, db_ctx, bgn, end);
}
public void Select_by_ttl_in(Cancelable cancelable, OrderedHash rv, int ns_id, int bgn, int end) {
Xodb_in_wkr_page_title wkr = new Xodb_in_wkr_page_title();
wkr.Init(rv, ns_id);
wkr.Select_in(provider, cancelable, wiki, bgn, end);
wkr.Select_in(provider, cancelable, db_ctx, bgn, end);
}
public void Update_html_db_id(int page_id, int html_db_id) {
if (!html_db_enabled) throw Err_.new_("html_db not enabled");
@@ -290,9 +295,9 @@ public class Xodb_page_tbl {
private static String Xto_touched_str(DateAdp v) {return v.XtoStr_fmt(Page_touched_fmt);}
public static final String[]
Flds_insert__html_n = String_.Ary(Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_is_redirect, Fld_page_touched, Fld_page_len, Fld_page_random_int, Fld_page_file_idx)
, Flds_insert__html_y = String_.Ary(Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_is_redirect, Fld_page_touched, Fld_page_len, Fld_page_random_int, Fld_page_file_idx, Fld_page_html_db_id)
, Flds_insert__html_y = String_.Ary(Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_is_redirect, Fld_page_touched, Fld_page_len, Fld_page_random_int, Fld_page_file_idx, Fld_page_html_db_id, Fld_page_redirect_id)
, Flds_select_all__html_n = String_.Ary(Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_touched, Fld_page_is_redirect, Fld_page_len, Fld_page_file_idx)
, Flds_select_all__html_y = String_.Ary(Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_touched, Fld_page_is_redirect, Fld_page_len, Fld_page_file_idx, Fld_page_html_db_id)
, Flds_select_all__html_y = String_.Ary(Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_touched, Fld_page_is_redirect, Fld_page_len, Fld_page_file_idx, Fld_page_html_db_id, Fld_page_redirect_id)
, Flds_select_idx = String_.Ary(Fld_page_id, Fld_page_ns, Fld_page_title, Fld_page_len)
;
public static final boolean Load_idx_flds_only_y = true;
@@ -303,9 +308,11 @@ public class Xodb_page_tbl {
page.Modified_on_ (DateAdp_.parse_fmt(rdr.ReadStr(Fld_page_touched), Page_touched_fmt));
page.Type_redirect_ (rdr.ReadByte(Fld_page_is_redirect) == 1);
page.Text_len_ (rdr.ReadInt(Fld_page_len));
page.Db_file_idx_ (rdr.ReadInt(Fld_page_file_idx));
if (html_db_enabled)
page.Text_db_id_ (rdr.ReadInt(Fld_page_file_idx));
if (html_db_enabled) {
page.Html_db_id_(rdr.ReadInt(Fld_page_html_db_id));
page.Redirect_id_(rdr.ReadInt(Fld_page_redirect_id));
}
}
public static void Read_page__idx(Xodb_page page, DataRdr rdr) {
page.Id_ (rdr.ReadInt(Fld_page_id));

6
400_xowa/src/gplx/xowa/dbs/tbls/Xodb_search_title_word_tbl.java
View File

@@ -27,7 +27,7 @@ public class Xodb_search_title_word_tbl {
.Val_str_by_bry_(word)
.Exec_insert();
}
public static void Select_by_word(Cancelable cancelable, ListAdp rv, Xow_wiki wiki, byte[] search, int results_max, Db_provider p) {
public static void Select_by_word(Cancelable cancelable, ListAdp rv, Xodb_ctx db_ctx, byte[] search, int results_max, Db_provider p) {
Db_qry_select qry = Db_qry_.select_()
.Cols_(Xodb_search_title_word_tbl.Fld_stw_word_id)
.From_(Xodb_search_title_word_tbl.Tbl_name, "w")
@@ -54,7 +54,7 @@ public class Xodb_search_title_word_tbl {
Xodb_in_wkr_search_title_id wkr = new Xodb_in_wkr_search_title_id();
wkr.Init(words, rv);
wkr.Select_in(p, cancelable, wiki, 0, words.Count());
wkr.Select_in(p, cancelable, db_ctx, 0, words.Count());
}
public static final String Tbl_name = "search_title_word", Fld_stw_word_id = "stw_word_id", Fld_stw_word = "stw_word";
private static final String Tbl_sql = String_.Concat_lines_nl
@@ -85,7 +85,7 @@ class Xodb_in_wkr_search_title_id extends Xodb_in_wkr_base {
stmt.Val_int_(word_id.Val());
}
}
@Override public void Eval_rslts(Cancelable cancelable, Xow_wiki wiki, DataRdr rdr) {
@Override public void Eval_rslts(Cancelable cancelable, Xodb_ctx db_ctx, DataRdr rdr) {
while (rdr.MoveNextPeer()) {
if (cancelable.Canceled()) return;
int page_id = rdr.ReadInt(Xodb_search_title_page_tbl.Fld_stp_page_id);

2
400_xowa/src/gplx/xowa/dbs/tbls/Xodb_text_tbl.java
View File

@@ -50,7 +50,7 @@ public class Xodb_text_tbl {
ListAdp pages = ListAdp_.new_();
for (int i = 0; i < len; i++) {
Xodb_page page = (Xodb_page)hash.FetchAt(i);
if (page.Db_file_idx() == file.Id())
if (page.Text_db_id() == file.Id())
pages.Add(page);
}
len = pages.Count();

2
400_xowa/src/gplx/xowa/dbs/tbls/Xodb_xowa_cfg_tbl.java
View File

@@ -50,7 +50,7 @@ public class Xodb_xowa_cfg_tbl {
KeyVal kv = KeyVal_.new_(key, val);
tmp_list.Add(kv);
}
return (KeyVal[])tmp_list.XtoAry(KeyVal.class);
return (KeyVal[])tmp_list.Xto_ary(KeyVal.class);
}
finally {rdr.Rls(); tmp_list.Clear();}
} ListAdp tmp_list = ListAdp_.new_();

3
400_xowa/src/gplx/xowa/dbs/tbls/Xodb_xowa_db_tbl.java
View File

@@ -30,6 +30,7 @@ public class Xodb_xowa_db_tbl {
;
} finally {stmt.Rls();}
}
public void Commit_all(Xodb_fsys_mgr db_fs) {this.Commit_all(db_fs.Provider_core(), db_fs.Files_ary());}
public void Commit_all(Db_provider provider, Xodb_file[] ary) {
stmt_bldr.Init(provider);
try {
@@ -61,7 +62,7 @@ public class Xodb_xowa_db_tbl {
list.Add(db);
}
} finally {rdr.Rls();}
Xodb_file[] rv = (Xodb_file[])list.XtoAry(Xodb_file.class);
Xodb_file[] rv = (Xodb_file[])list.Xto_ary(Xodb_file.class);
Chk_sequential(rv);
return rv;
}

6
400_xowa/src/gplx/xowa/files/Xof_url_bldr.java
View File

@@ -55,9 +55,9 @@ public class Xof_url_bldr {
this.md5_dir_depth = repo.Dir_depth();
return this;
}
public byte[] Xto_bry() {Bld(); byte[] rv = bfr.XtoAryAndClear(); Clear(); return rv;}
public String Xto_str() {Bld(); String rv = bfr.XtoStr(); Clear(); return rv;}
public Io_url Xto_url() {Bld(); Io_url rv = Io_url_.new_fil_(bfr.XtoStr()); Clear(); return rv;}
public byte[] Xto_bry() {Bld(); byte[] rv = bfr.Xto_bry_and_clear(); Clear(); return rv;}
public String Xto_str() {Bld(); String rv = bfr.Xto_str(); Clear(); return rv;}
public Io_url Xto_url() {Bld(); Io_url rv = Io_url_.new_fil_(bfr.Xto_str()); Clear(); return rv;}
private void Bld() {
Add_core();
if (file_is_thumb) {

2
400_xowa/src/gplx/xowa/files/Xow_file_mgr.java
View File

@@ -105,7 +105,7 @@ public class Xow_file_mgr implements GfoInvkAble {
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_repos)) return repo_mgr;
else if (ctx.Match(k, Invk_metas)) return meta_mgr;
else if (ctx.Match(k, Invk_cfg_download)) return cfg_download;
else if (ctx.Match(k, Invk_cfg_download)) return cfg_download; // NOTE: documented for Schnark; https://sourceforge.net/p/xowa/tickets/344/
else if (ctx.Match(k, Invk_fsdb)) return fsdb_mgr;
else if (ctx.Match(k, Invk_wkrs)) return wkr_mgr;
else return GfoInvkAble_.Rv_unhandled;

4
400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr_mem.java
View File

@@ -123,7 +123,7 @@ public class Xof_fsdb_mgr_mem implements Xof_fsdb_mgr, Xof_bin_wkr {
bin_key_bfr .Add_byte(Byte_ascii.Ltr_f).Add_byte_pipe()
.Add(wiki).Add_byte_pipe()
.Add(ttl);
return bin_key_bfr.XtoAryAndClear();
return bin_key_bfr.Xto_bry_and_clear();
}
private byte[] Key_bld_thm(byte[] wiki, byte[] ttl, int w, double thumbtime) {
bin_key_bfr .Add_byte(Byte_ascii.Ltr_t).Add_byte_pipe()
@@ -132,7 +132,7 @@ public class Xof_fsdb_mgr_mem implements Xof_fsdb_mgr, Xof_bin_wkr {
.Add_int_variable(w).Add_byte_pipe()
.Add_int_variable(Xof_doc_thumb.X_int(thumbtime));
;
return bin_key_bfr.XtoAryAndClear();
return bin_key_bfr.Xto_bry_and_clear();
}
public void Rls() {bin_hash.Clear(); reg_hash.Clear();}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {

2
400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr_sql.java
View File

@@ -87,7 +87,7 @@ public class Xof_fsdb_mgr_sql implements Xof_fsdb_mgr, GfoInvkAble {
} private boolean init = false;
public boolean Reg_select_itm_exists(byte[] ttl) {return Xof_wiki_orig_tbl.Select_itm_exists(img_regy_provider, ttl);}
public void Reg_select_only(Xoa_page page, byte exec_tid, ListAdp itms, OrderedHash hash) {
Xof_wiki_orig_tbl.Select_list(wiki.App().Usr_dlg(), img_regy_provider, wiki, exec_tid, itms, hash, url_bldr, bin_mgr.Repo_mgr());
Xof_wiki_orig_tbl.Select_list(wiki.App().Usr_dlg(), img_regy_provider, wiki.Db_mgr().Db_ctx(), exec_tid, itms, hash, url_bldr, bin_mgr.Repo_mgr());
}
public void Reg_select(Xoa_page page, byte exec_tid, ListAdp itms) {
OrderedHash hash = OrderedHash_.new_bry_();

2
400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_fil_itm.java
View File

@@ -78,7 +78,7 @@ public class Cache_fil_itm implements CompareAble {
.Add_int_variable(fil_h).Add_byte_pipe()
.Add_int_variable(Xof_doc_thumb.X_int(fil_thumbtime))
;
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
public int compareTo(Object obj) {Cache_fil_itm comp = (Cache_fil_itm)obj; return -Long_.Compare(cache_time, comp.cache_time);} // - for DESC sort
public static final Cache_fil_itm Null = new Cache_fil_itm(); public Cache_fil_itm() {}

6
400_xowa/src/gplx/xowa/files/wiki_orig/Xof_wiki_orig_tbl.java
View File

@@ -16,16 +16,16 @@ 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.files.wiki_orig; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
import gplx.dbs.*; import gplx.xowa.files.fsdb.*;
import gplx.dbs.*; import gplx.xowa.dbs.*; import gplx.xowa.files.fsdb.*;
public class Xof_wiki_orig_tbl {
public static void Create_table(Db_provider p) {
Sqlite_engine_.Tbl_create(p, Tbl_name, Tbl_sql);
Sqlite_engine_.Idx_create(p, Idx_key);
}
public static void Select_list(Cancelable cancelable, Db_provider p, Xow_wiki wiki, byte exec_tid, ListAdp itms, OrderedHash hash, Xof_url_bldr url_bldr, Xow_repo_mgr repo_mgr) {
public static void Select_list(Cancelable cancelable, Db_provider p, Xodb_ctx db_ctx, byte exec_tid, ListAdp itms, OrderedHash hash, Xof_url_bldr url_bldr, Xow_repo_mgr repo_mgr) {
Xof_wiki_orig_tbl_in_wkr in_wkr = new Xof_wiki_orig_tbl_in_wkr();
in_wkr.Init(itms, hash);
in_wkr.Select_in(p, cancelable, wiki, 0, itms.Count());
in_wkr.Select_in(p, cancelable, db_ctx, 0, itms.Count());
Xof_wiki_orig_tbl_evaluator.Rdr_done(exec_tid, itms, hash, url_bldr, repo_mgr);
}
public static Xof_wiki_orig_itm Select_itm(Db_provider p, byte[] ttl) {

2
400_xowa/src/gplx/xowa/files/wiki_orig/Xof_wiki_orig_tbl_in_wkr.java
View File

@@ -37,7 +37,7 @@ class Xof_wiki_orig_tbl_in_wkr extends gplx.xowa.dbs.tbls.Xodb_in_wkr_base {
stmt.Val_str_by_bry_(itm.Lnki_ttl());
}
}
@Override public void Eval_rslts(Cancelable cancelable, Xow_wiki wiki, DataRdr rdr) {
@Override public void Eval_rslts(Cancelable cancelable, Xodb_ctx db_ctx, DataRdr rdr) {
while (rdr.MoveNextPeer()) {
if (cancelable.Canceled()) return;
Xof_wiki_orig_itm itm = Xof_wiki_orig_itm.load_(rdr);

2
400_xowa/src/gplx/xowa/fmtrs/Xoa_fmtr_itm.java
View File

@@ -35,7 +35,7 @@ public class Xoa_fmtr_itm implements GfoInvkAble {
eval_mgr.Invk_(itm_invk);
fmtr.Bld_bfr(bfr, Bry_.Ary_empty);
}
return bfr.XtoStrAndClear();
return bfr.Xto_str_and_clear();
}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_src)) return src;

2
400_xowa/src/gplx/xowa/fmtrs/Xoa_fmtr_sort_mgr.java
View File

@@ -30,7 +30,7 @@ public class Xoa_fmtr_sort_mgr implements GfoInvkAble {
}
}
public void Exec() {
wkr.Itms_((Xoa_fmtr_sort_itm[])itms.XtoAry(Xoa_fmtr_sort_itm.class));
wkr.Itms_((Xoa_fmtr_sort_itm[])itms.Xto_ary(Xoa_fmtr_sort_itm.class));
sort_able.Sort(wkr);
}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {

1
400_xowa/src/gplx/xowa/gui/Xoa_gui_mgr.java
View File

@@ -68,7 +68,6 @@ public class Xoa_gui_mgr implements GfoEvObj, GfoInvkAble {
menu_mgr.Menu_bldr().Init_by_kit(app, kit, app.User().Fsys_mgr().App_img_dir().GenSubDir_nest("window", "menu"));
menu_mgr.Init_by_kit();
bnd_mgr.Init_by_kit(app);
app.User().Wiki().Html_mgr().Init_by_kit();
GfoEvMgr_.SubSame_many(app.User(), this, Xou_user.Evt_lang_changed);
app.Sys_cfg().Lang_(app.Sys_cfg().Lang()); // NOTE: force refresh of lang. must occur after after gui_mgr init, else menu lbls will break
}

2
400_xowa/src/gplx/xowa/gui/menus/Xog_menu_mnu_src.java
View File

@@ -202,7 +202,7 @@ class Xog_menu_mgr_src {
class Xog_menu_bldr {
private int indent = 0;
private Bry_bfr bfr = Bry_bfr.reset_(0);
public String Gen_str() {return bfr.XtoStrAndClear();}
public String Gen_str() {return bfr.Xto_str_and_clear();}
private Xog_menu_bldr Indent_add() {indent += 2; return this;}
private Xog_menu_bldr Indent_del() {indent -= 2; return this;}
private void Indent() {

2
400_xowa/src/gplx/xowa/gui/urls/Xog_url_wkr.java
View File

@@ -118,7 +118,7 @@ public class Xog_url_wkr {
tmp_bfr.Add_byte(Byte_ascii.Slash);
}
tmp_bfr.Add(page_bry);
page_bry = tmp_bfr.Mkr_rls().XtoAryAndClear();
page_bry = tmp_bfr.Mkr_rls().Xto_bry_and_clear();
}
rv.Segs_ary_(Bry_.Ary_empty);
}

Some files were not shown because too many files have changed in this diff Show More