mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v1.9.2.1
This commit is contained in:
@@ -39,7 +39,7 @@ public class Xow_fsys_mgr {
|
||||
public Io_url Url_ns_fil(byte tid, int ns_id, int fil_idx) {
|
||||
Xow_dir_info dir_info = dir_regy[tid];
|
||||
String dir_name = dir_info.Name() + Xow_fsys_mgr.Wtr_dir(dir_info.Ext_tid());
|
||||
return Xow_fsys_mgr.Url_fil(ns_dir.GenSubDir_nest(Int_.XtoStr_PadBgn(ns_id, 3), dir_name), fil_idx, dir_regy[tid].Ext_bry());
|
||||
return Xow_fsys_mgr.Url_fil(ns_dir.GenSubDir_nest(Int_.Xto_str_pad_bgn(ns_id, 3), dir_name), fil_idx, dir_regy[tid].Ext_bry());
|
||||
}
|
||||
public Io_url Url_site_fil(byte tid, int fil_idx) {return Xow_fsys_mgr.Url_fil(Url_site_dir(tid), fil_idx, Xow_dir_info_.Bry_xdat);}
|
||||
public Io_url Url_site_reg(byte tid) {return Url_site_dir(tid).GenSubFil(Xow_dir_info_.Name_reg_fil);}
|
||||
|
||||
@@ -32,7 +32,7 @@ public class Xow_ns implements GfoInvkAble {
|
||||
this.name_db_w_colon = Bry_.Add(v, Byte_ascii.Colon);
|
||||
this.name_str = String_.new_utf8_(v);
|
||||
}
|
||||
this.num_str = Int_.XtoStr_PadBgn(id, 3);
|
||||
this.num_str = Int_.Xto_str_pad_bgn(id, 3);
|
||||
this.num_bry = Bry_.new_ascii_(num_str);
|
||||
this.name_enc = Xoa_url_encoder._.Encode(name_bry);
|
||||
this.name_txt = Bry_.Replace(name_enc, Byte_ascii.Underline, Byte_ascii.Space);
|
||||
|
||||
@@ -46,6 +46,7 @@ public class Xow_ns_mgr implements GfoInvkAble, gplx.lists.ComparerAble {
|
||||
public Xow_ns Ns_project() {return ns_project;} private Xow_ns ns_project;
|
||||
public Xow_ns Ns_module() {return ns_module;} private Xow_ns ns_module;
|
||||
public Xow_ns Ns_mediawiki() {return ns_mediawiki;} private Xow_ns ns_mediawiki;
|
||||
public int Ns_page_id() {return ns_page_id;} public void Ns_page_id_(int v) {ns_page_id = v;} private int ns_page_id = Int_.MinValue;
|
||||
public int Count() {return ns_count;} private int ns_count = 0;
|
||||
public Xow_ns[] Ords_ary() {return ords;} private Xow_ns[] ords = new Xow_ns[Xow_ns_mgr_.Ordinal_max];
|
||||
public int Ords_len() {return ords_len;} private int ords_len;
|
||||
|
||||
@@ -52,7 +52,7 @@ class Xow_ns_mgr_fxt {
|
||||
int ids_len = ids.length;
|
||||
for (int i = 0; i < ids_len; i++) {
|
||||
int id = ids[i];
|
||||
ns_mgr.Add_new(id, Int_.XtoStr(id));
|
||||
ns_mgr.Add_new(id, Int_.Xto_str(id));
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -222,7 +222,7 @@ public class Xow_wiki implements GfoInvkAble {
|
||||
Io_url sqlite_url = Xodb_mgr_sql.Find_core_url(this);
|
||||
if (sqlite_url != null) {
|
||||
Xodb_mgr_sql db_mgr_sql = this.Db_mgr_create_as_sql();
|
||||
db_mgr_sql.Init_load(gplx.dbs.Db_connect_.sqlite_(sqlite_url));
|
||||
db_mgr_sql.Init_load(gplx.dbs.Db_conn_info_.sqlite_(sqlite_url));
|
||||
db_mgr_sql.Html_db_enabled_(hdump_enabled);
|
||||
}
|
||||
if (!Xob_import_marker.Check(this)) {app.Wiki_mgr().Del(domain_bry); init_needed = false; return;} // NOTE: must call after Db_mgr_create_as_sql(); also, must delete wiki from mgr; DATE:2014-08-24
|
||||
|
||||
@@ -40,7 +40,7 @@ public class Xowc_xtn_pages implements GfoInvkAble {
|
||||
for (int i = 0; i < len; i++) { // Page / Index ns_ids are variable per wiki; iterate over ns, and set ns_id
|
||||
Xow_ns ns = ns_mgr.Ords_get_at(i); if (ns == null) continue;
|
||||
byte[] ns_name = ns.Name_enc();
|
||||
if (Bry_.Eq(ns_name, page_name)) ns_page_id = ns.Id();
|
||||
if (Bry_.Eq(ns_name, page_name)) {ns_page_id = ns.Id(); ns_mgr.Ns_page_id_(ns_page_id);}
|
||||
else if (Bry_.Eq(ns_name, page_talk_name)) ns_page_talk_id = ns.Id();
|
||||
else if (Bry_.Eq(ns_name, index_name)) ns_index_id = ns.Id();
|
||||
else if (Bry_.Eq(ns_name, index_talk_name)) ns_index_talk_id = ns.Id();
|
||||
@@ -56,9 +56,9 @@ public class Xowc_xtn_pages implements GfoInvkAble {
|
||||
private int Set_canonical(Xow_ns_mgr ns_mgr, int aliases_added, int id, byte[] name) {
|
||||
Xow_ns ns = ns_mgr.Ids_get_or_null(id);
|
||||
if ( ns == null // ns doesn't exist; should throw error;
|
||||
|| !Bry_.Eq(ns.Name_bry(), name) // ns exists, but name doesn't match canonical
|
||||
|| !Bry_.Eq(ns.Name_bry(), name) // ns exists, but name doesn't match canonical
|
||||
) {
|
||||
ns_mgr.Aliases_add(id, String_.new_ascii_(name));
|
||||
ns_mgr.Aliases_add(id, String_.new_ascii_(name));
|
||||
++aliases_added;
|
||||
}
|
||||
return aliases_added;
|
||||
|
||||
Reference in New Issue
Block a user