mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v2.8.3.1
This commit is contained in:
@@ -22,4 +22,5 @@ public class Dbui_btn_itm {
|
||||
public String Cmd() {return cmd;} private final String cmd;
|
||||
public String Img() {return img;} private final String img;
|
||||
public String Text() {return text;} private final String text;
|
||||
public static final Dbui_btn_itm[] Ary_empty = new Dbui_btn_itm[0];
|
||||
}
|
||||
|
||||
@@ -22,5 +22,5 @@ public class Dbui_col_itm {
|
||||
public String Key() {return key;} private final String key;
|
||||
public String Display() {return display;} private final String display;
|
||||
public int Width() {return width;} private final int width;
|
||||
public static final int Type_id_str = 1, Type_id_text = 2;
|
||||
public static final int Type_id_str = 1, Type_id_text = 2, Type_id_int = 3, Type_id_datetime = 4;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ public class Xowd_css_core_mgr {
|
||||
Db_conn conn = core_tbl.Conn();
|
||||
Io_url[] file_list = Io_mgr.I.QueryDir_args(css_dir).Recur_().ExecAsUrlAry();
|
||||
try {
|
||||
conn.Txn_bgn();
|
||||
conn.Txn_bgn("schema__css_core__set");
|
||||
int css_id = core_tbl.Select_id_by_key(key);
|
||||
DateAdp updated_on = DateAdp_.Now().XtoUtc();
|
||||
if (css_id == -1)
|
||||
|
||||
@@ -47,7 +47,7 @@ public class Xohd_hdump_rdr {
|
||||
synchronized (dbpg) {
|
||||
dbpg.Clear();
|
||||
if ( !Get_by_ttl__fill_hpg(rv, ttl)
|
||||
|| rv.Page_body() == null) { // occurs when row exists in page, but not in html
|
||||
|| rv.Page_body() == null) { // occurs when row exists in page_table, but not in html_table
|
||||
rv.Exists_n_();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -36,6 +36,12 @@ public class Xohd_hdump_wtr {
|
||||
Xowd_db_file hdump_db = Xowd_db_file.Null;
|
||||
if (html_db_id == -1) {
|
||||
hdump_db = core_data_mgr.Db__html();
|
||||
if (hdump_db == null) {
|
||||
hdump_db = core_data_mgr.Dbs__make_by_tid(Xowd_db_file_.Tid_html_data);
|
||||
Xowd_html_tbl tbl = hdump_db.Tbl__html();
|
||||
tbl.Create_tbl();
|
||||
}
|
||||
|
||||
html_db_id = hdump_db.Id();
|
||||
page.Revision_data().Html_db_id_(html_db_id);
|
||||
core_data_mgr.Tbl__page().Update__html_db_id(page.Revision_data().Id(), html_db_id);
|
||||
|
||||
@@ -127,7 +127,7 @@ public class Xohd_abrv_mgr {
|
||||
}
|
||||
}
|
||||
url_bldr.Init_by_root(img.Orig_repo_id() == Xof_repo_itm_.Repo_remote ? file_dir_comm : file_dir_wiki, Byte_ascii.Slash, false, false, 2);
|
||||
url_bldr.Init_by_itm(img.File_is_orig() ? Xof_repo_itm_.Mode_orig : Xof_repo_itm_.Mode_thumb, img.Lnki_ttl(), Xof_file_wkr_.Md5_(img.Lnki_ttl()), Xof_ext_.new_by_id_(img.Orig_ext()), img.File_w(), img.Lnki_time(), img.Lnki_page());
|
||||
url_bldr.Init_by_itm(img.File_is_orig() ? Xof_repo_itm_.Mode_orig : Xof_repo_itm_.Mode_thumb, img.Lnki_ttl(), Xof_file_wkr_.Md5(img.Lnki_ttl()), Xof_ext_.new_by_id_(img.Orig_ext()), img.File_w(), img.Lnki_time(), img.Lnki_page());
|
||||
byte[] img_src = url_bldr.Xto_bry();
|
||||
if (tid == Xohd_abrv_.Tid_img) {
|
||||
fmtr_img.Bld_bfr_many(bfr, img_src, img_view_w, img.Html_h());
|
||||
|
||||
@@ -48,7 +48,7 @@ class Xob_link_dump_tbl implements RlsAble {
|
||||
public void Rls() {
|
||||
stmt_insert = Db_stmt_.Rls(stmt_insert);
|
||||
}
|
||||
public void Insert_bgn() {conn.Txn_bgn();}
|
||||
public void Insert_bgn() {conn.Txn_bgn("bldr__link_dump");}
|
||||
public void Insert_end() {conn.Txn_end(); stmt_insert = Db_stmt_.Rls(stmt_insert);}
|
||||
public void Insert_cmd_by_batch(int src_page_id, int src_html_uid, int trg_ns, byte[] trg_ttl) {
|
||||
if (stmt_insert == null) stmt_insert = conn.Stmt_insert(Tbl_name, flds.To_str_ary_wo_autonum());
|
||||
|
||||
@@ -40,7 +40,7 @@ public class Xob_redlink_mkr_cmd extends Xob_itm_basic_base implements Xob_cmd {
|
||||
if (html_db_id != cur_html_db_id) {
|
||||
if (html_dump_tbl != null) html_dump_tbl.Conn().Txn_end();
|
||||
html_dump_tbl = wiki.Data__core_mgr().Dbs__get_at(html_db_id).Tbl__html();
|
||||
html_dump_tbl.Conn().Txn_bgn();
|
||||
html_dump_tbl.Conn().Txn_bgn("bldr__redlink");
|
||||
cur_html_db_id = html_db_id;
|
||||
}
|
||||
// commit page_id if needed
|
||||
|
||||
@@ -226,7 +226,7 @@ public class Xow_hzip_itm__anchor {
|
||||
;
|
||||
private static final byte Href_tid_wiki = 1, Href_tid_site = 2;
|
||||
private static final int Href_bry_len = 6; // "/wiki/".length
|
||||
private static final Btrie_fast_mgr btrie_href = Btrie_fast_mgr.cs_()
|
||||
private static final Btrie_fast_mgr btrie_href = Btrie_fast_mgr.cs()
|
||||
.Add_str_byte("/wiki/", Href_tid_wiki)
|
||||
.Add_str_byte("/site/", Href_tid_site);
|
||||
private static final int
|
||||
|
||||
@@ -102,7 +102,7 @@ public class Xow_portal_mgr implements GfoInvkAble {
|
||||
public byte[] Div_home_bry() {return api_skin != null && api_skin.Sidebar_home_enabled() ? div_home_bry : Bry_.Empty;} private byte[] div_home_bry = Bry_.Empty;
|
||||
public byte[] Div_wikis_bry(Bry_bfr_mkr bfr_mkr) {
|
||||
if (toggle_itm == null) // TEST:lazy-new b/c Init_by_wiki
|
||||
toggle_itm = wiki.Appe().Api_root().Html().Page().Toggle_mgr().Get_or_new("offline-wikis").Init(wiki.Appe().Usere().Wiki(), Bry_.new_a7("Wikis"));
|
||||
toggle_itm = wiki.Appe().Api_root().Html().Page().Toggle_mgr().Get_or_new("offline-wikis").Init(Bry_.new_a7("Wikis"));
|
||||
Bry_bfr tmp_bfr = bfr_mkr.Get_k004();
|
||||
div_wikis_fmtr.Bld_bfr_many(tmp_bfr, toggle_itm.Html_toggle_btn(), toggle_itm.Html_toggle_hdr());
|
||||
return tmp_bfr.To_bry_and_rls();
|
||||
|
||||
Reference in New Issue
Block a user