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

v2.11.2.1

Browse Source
This commit is contained in:
gnosygnu
2015-11-08 23:48:07 -05:00
parent b990ec409f
commit d9f45cec19
298 changed files with 3908 additions and 2141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
400_xowa/src/gplx/xowa/specials/Xows_special_meta.java
View File

@@ -30,6 +30,6 @@ public class Xows_special_meta {
public String Ttl_str() {return ttl_str;} private final String ttl_str;
public byte[] Ttl_bry() {return ttl_bry;} private final byte[] ttl_bry;
public boolean Match_ttl(Xoa_ttl ttl) {
return ttl.Ns().Id_special() && Bry_.Eq(ttl.Root_txt(), key_bry);
return ttl.Ns().Id_is_special() && Bry_.Eq(ttl.Root_txt(), key_bry);
}
}

4
400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages.java
View File

@@ -98,7 +98,7 @@ public class Xows_page_allpages implements GfoInvkAble, Bry_fmtr_arg, Xows_page
rslt_list_len = 0;
rslt_nxt = rslt_prv = null;
Xoa_ttl from_ttl = Xoa_ttl.parse(wiki, from_val); if (from_ttl == null) return false;
if (!from_ttl.Ns().Id_main()) { // ns specified in title
if (!from_ttl.Ns().Id_is_main()) { // ns specified in title
init_ns = from_ttl.Ns();
arg_hash.Set_val_by_int(Bry_arg_ns, init_ns.Id());
arg_hash.Set_val_by_bry(Bry_arg_from, from_ttl.Page_db());
@@ -140,7 +140,7 @@ public class Xows_page_allpages implements GfoInvkAble, Bry_fmtr_arg, Xows_page
}
public static Xoa_ttl ttl_(Xowe_wiki wiki, Xow_ns ns, Xowd_page_itm itm) {
byte[] ttl_bry = itm.Ttl_page_db();
if (!ns.Id_main()) ttl_bry = Bry_.Add(ns.Name_db_w_colon(), ttl_bry);
if (!ns.Id_is_main()) ttl_bry = Bry_.Add(ns.Name_db_w_colon(), ttl_bry);
return Xoa_ttl.parse(wiki, ttl_bry);
}
public void Fmt__do(Bry_bfr bfr) {

2
400_xowa/src/gplx/xowa/specials/movePage/Move_page.java
View File

@@ -133,7 +133,7 @@ class Move_trg_ns_list_fmtr implements Bry_fmtr_arg {
Xow_ns ns = ns_mgr.Ids_get_at(i);
if (ns.Is_meta()) continue; // ignore [[Special:]] and [[Media:]]
byte[] bry_selected = ttl.Ns().Id() == ns.Id() ? Bry_selected : Bry_.Empty;
fmtr.Bld_bfr_many(bfr, ns.Id(), bry_selected, ns.Name_ui());
fmtr.Bld_bfr_many(bfr, ns.Id(), bry_selected, ns.Name_combo());
}
}
private static final byte[] Bry_selected = Bry_.new_a7(" selected=''");

2
400_xowa/src/gplx/xowa/specials/search/Xog_search_suggest_mgr.java
View File

@@ -41,7 +41,7 @@ public class Xog_search_suggest_mgr implements GfoInvkAble {
args_default = tmp_url.Qargs();
}
private String args_default_str = "";// default args for search
public static final int[] Ns_default_main = new int[] {Xow_ns_.Id_main};
public static final int[] Ns_default_main = new int[] {Xow_ns_.Tid__main};
public void Cancel() {
cur_cmd.Cancel();
long prv_time = Env_.TickCount();

4
400_xowa/src/gplx/xowa/specials/search/Xosrh_core_tst.java
View File

@@ -101,7 +101,7 @@ public class Xosrh_core_tst {
// public Xobl_regy_itm regy_itm_(int id, String bgn, String end, int count) {return new Xobl_regy_itm(id, Bry_.new_u8(bgn), Bry_.new_u8(end), count);}
// public Xowd_page_itm data_ttl_(int id, String ttl) {return data_ttl_(id, 0, 0, false, 0, ttl);}
// public Xowd_page_itm data_ttl_(int id, int fil, int row, boolean redirect, int len, String ttl) {return new Xowd_page_itm().Init(id, Bry_.new_u8(ttl), redirect, len, fil, row);}
// public Xowd_page_itm data_id_(int id, String ttl) {return data_id_(id, Xow_ns_.Id_main, ttl);}
// public Xowd_page_itm data_id_(int id, String ttl) {return data_id_(id, Xow_ns_.Tid__main, ttl);}
// public Xowd_page_itm data_id_(int id, int ns, String ttl) {return new Xowd_page_itm().Id_(id).Ns_id_(ns).Ttl_page_db_(Bry_.new_u8(ttl)).Text_db_id_(0).Text_len_(0);}
// public Xobl_search_ttl data_sttl_(String word, params int[] ids) {return new Xobl_search_ttl(Bry_.new_u8(word), data_ttl_word_page_ary_(ids));}
// public Xobl_search_ttl_page[] data_ttl_word_page_ary_(params int[] ids) {
@@ -135,7 +135,7 @@ public class Xosrh_core_tst {
// }
// public void Init_basic() {
// this.Init_regy_ns(wiki.Ns_mgr().Ns_main().Num_str(), Xotdb_dir_info_.Tid_search_ttl, this.regy_itm_(0, "A", "C", 5));
// this.Init_data(wiki.Tdb_fsys_mgr().Url_ns_fil(Xotdb_dir_info_.Tid_search_ttl, Xow_ns_.Id_main, 0)
// this.Init_data(wiki.Tdb_fsys_mgr().Url_ns_fil(Xotdb_dir_info_.Tid_search_ttl, Xow_ns_.Tid__main, 0)
// , this.data_sttl_("a" , 0)
// , this.data_sttl_("b1" , 1, 11, 21)
// , this.data_sttl_("b2" , 2, 12, 22)

2
400_xowa/src/gplx/xowa/specials/search/Xosrh_page_mgr_tst.java
View File

@@ -47,7 +47,7 @@ class Xosrh_page_mgr_fxt {
for (int i = bgn; i < end; i++) {
byte[] id_bry = new byte[5]; // NOTE: do not reuse; will break hive_mgr
Base85_.Set_bry(i, id_bry, 0, 5);
tmp_itm.Ns_id_(Xow_ns_.Id_main).Init(i, Bry_.To_a7_bry(i, 0), false, 10, 0, i - bgn);
tmp_itm.Ns_id_(Xow_ns_.Tid__main).Init(i, Bry_.To_a7_bry(i, 0), false, 10, 0, i - bgn);
Xotdb_page_itm_.Txt_id_save(tmp_bfr, tmp_itm);
hive_mgr.Create(id_bry, tmp_bfr.To_bry_and_clear(), null);
}

6
400_xowa/src/gplx/xowa/specials/search/Xows_ns_mgr.java
View File

@@ -27,7 +27,7 @@ public class Xows_ns_mgr {
}
public boolean Has(int ns_id) {
return ns_all // all flag set
|| ns_main && ns_id == Xow_ns_.Id_main // main flag set
|| ns_main && ns_id == Xow_ns_.Tid__main // main flag set
|| ns_hash.Has(tmp_ns_id.Val_(ns_id)) // check against ns_hash
;
}
@@ -37,8 +37,8 @@ public class Xows_ns_mgr {
ns_hash.Add_as_key_and_val(Int_obj_ref.new_(ns_id));
}
public void Add_by_name(byte[] ns_name) {
int id = Xow_ns_.Canonical_id(ns_name);
if (id != Xow_ns_.Id_null)
int id = Xow_ns_canonical_.To_id(ns_name);
if (id != Xow_ns_.Tid__null)
Add_by_id(id);
}
public void Add_all() {

2
400_xowa/src/gplx/xowa/specials/search/Xows_paging_parser.java
View File

@@ -19,7 +19,7 @@ package gplx.xowa.specials.search; import gplx.*; import gplx.xowa.*; import gpl
import gplx.core.brys.*;
class Xows_paging_parser {
private final List_adp itm_list = List_adp_.new_();
private final Bry_rdr rdr = new Bry_rdr();
private final Bry_rdr_old rdr = new Bry_rdr_old();
public Xows_paging_itm[] Parse(byte[] raw) { // EX: en.wikipedia.org|41|60;en.wiktionary.org|21|40;
rdr.Init(raw);
while (!rdr.Pos_is_eos()) {

2
400_xowa/src/gplx/xowa/specials/statistics/Xop_statistics_page.java
View File

@@ -91,7 +91,7 @@ class Xop_statistics_stats_ns_itm implements Bry_fmtr_arg {
Xow_ns ns = ns_mgr.Ids_get_at(i);
if (ns.Is_meta()) continue;
if (ns.Count() == 0) continue;
byte[] ns_name = ns.Id_main() ? wiki.Msg_mgr().Val_by_id(Xol_msg_itm_.Id_ns_blankns) : ns.Name_txt();
byte[] ns_name = ns.Id_is_main() ? wiki.Msg_mgr().Val_by_id(Xol_msg_itm_.Id_ns_blankns) : ns.Name_ui();
fmtr_ns_itm.Bld_bfr_many(bfr, ns_name, wiki.Lang().Num_mgr().Format_num(ns.Count()));
}
}

2
400_xowa/src/gplx/xowa/specials/xowa/popup_history/Popup_history_page.java
View File

@@ -34,7 +34,7 @@ public class Popup_history_page implements Xows_page {
}
private Bry_fmtr fmtr_main = Bry_fmtr.new_("<a href='~{href}'>~{ttl}</a>\n\n", "href", "ttl"); // NOTE: need to use anchor (as opposed to lnki or lnke) b/c xwiki will not work on all wikis
public static boolean Ttl_chk(Xoa_ttl ttl) {
return ttl.Ns().Id_special()
return ttl.Ns().Id_is_special()
&& Bry_.Eq(ttl.Page_db(), Xows_special_meta_.Itm__popup_history.Key_bry());
}
}