mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v2.3.2.1
This commit is contained in:
@@ -24,7 +24,7 @@ class Xofo_lnki {
|
||||
public int Lnki_w() {return lnki_w;} public Xofo_lnki Lnki_w_(int v) {lnki_w = v; return this;} private int lnki_w;
|
||||
public int Lnki_h() {return lnki_h;} public Xofo_lnki Lnki_h_(int v) {lnki_h = v; return this;} private int lnki_h;
|
||||
public double Lnki_upright() {return lnki_upright;} public Xofo_lnki Lnki_upright_(double v) {lnki_upright = v; return this;} double lnki_upright = Xop_lnki_tkn.Upright_null;
|
||||
public double Lnki_thumbtime() {return lnki_thumbtime;} public Xofo_lnki Lnki_thumbtime_(double v) {lnki_thumbtime = v; return this;} private double lnki_thumbtime = Xof_doc_thumb.Null;
|
||||
public double Lnki_thumbtime() {return lnki_thumbtime;} public Xofo_lnki Lnki_thumbtime_(double v) {lnki_thumbtime = v; return this;} private double lnki_thumbtime = Xof_lnki_time.Null;
|
||||
public byte Xfer_status() {return xfer_status;} public Xofo_lnki Xfer_status_(byte v) {xfer_status = v; return this;} private byte xfer_status; public static final byte Xfer_status_none = 0, Xfer_status_xfer_pass = 1, Xfer_status_xfer_fail = 2, Xfer_status_convert_pass = 3, Xfer_status_convert_fail = 4;
|
||||
public Xofo_lnki Xfer_status_(boolean v) {return Xfer_status_(v ? Xfer_status_xfer_pass : Xfer_status_xfer_fail);}
|
||||
public boolean Orig() {return !thumb;}
|
||||
@@ -47,8 +47,8 @@ class Xofo_lnki {
|
||||
wtr.Write_bry_escape_fld(ttl);
|
||||
wtr.Bfr()
|
||||
.Add_int_variable(lnki.Lnki_type()).Add_byte(Byte_ascii.Comma)
|
||||
.Add_int_variable(lnki.Lnki_w()).Add_byte(Byte_ascii.Comma)
|
||||
.Add_int_variable(lnki.Lnki_h())
|
||||
.Add_int_variable(lnki.W()).Add_byte(Byte_ascii.Comma)
|
||||
.Add_int_variable(lnki.H())
|
||||
;
|
||||
boolean upright_exists = lnki.Upright() != Xop_lnki_tkn.Upright_null;
|
||||
if (upright_exists) {
|
||||
|
||||
@@ -68,7 +68,7 @@ class Xofo_lnki_parser extends Obj_ary_parser_base {
|
||||
else if (Bry_.Match(bry, fld_bgn, eq_pos, Xop_lnki_arg_parser.Bry_thumbtime)) {
|
||||
fld_val = Bry_.Xto_int_or(bry, eq_pos + 1, i, Int_.MinValue); // +1 to position after eq
|
||||
if (fld_val == Int_.MinValue) throw Err_.new_fmt_("invalid int: {0}", String_.new_utf8_(bry, eq_pos + 1, i));
|
||||
lnki.Lnki_thumbtime_(Xof_doc_thumb.X_int(fld_val));
|
||||
lnki.Lnki_thumbtime_(Xof_lnki_time.X_int(fld_val));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ class Xofo_lnki_chkr implements Tst_chkr {
|
||||
rv += mgr.Tst_val(lnki_w == -1, path, "lnki_w", lnki_w, actl.Lnki_w());
|
||||
rv += mgr.Tst_val(lnki_h == -1, path, "lnki_h", lnki_h, actl.Lnki_h());
|
||||
rv += mgr.Tst_val(lnki_upright == -1, path, "lnki_upright", lnki_upright, actl.Lnki_upright());
|
||||
rv += mgr.Tst_val(lnki_thumbtime == -1, path, "lnki_thumbtime", lnki_thumbtime, Xof_doc_thumb.X_int(actl.Lnki_thumbtime()));
|
||||
rv += mgr.Tst_val(lnki_thumbtime == -1, path, "lnki_thumbtime", lnki_thumbtime, Xof_lnki_time.X_int(actl.Lnki_thumbtime()));
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,11 +57,11 @@ public class Xofw_wiki_wkr_base implements Xofw_wiki_finder {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
} static final Xodb_page tmp_db_page = Xodb_page.tmp_();
|
||||
} static final Xodb_page tmp_db_page = Xodb_page.new_tmp();
|
||||
byte[] Get_redirect(Xowe_wiki wiki, Xow_ns file_ns, Xodb_page db_page) {
|
||||
if (db_page.Type_redirect()) {
|
||||
if (db_page.Redirected()) {
|
||||
wiki.Db_mgr().Load_mgr().Load_page(db_page, file_ns, false);
|
||||
byte[] src = db_page.Text();
|
||||
byte[] src = db_page.Wtxt();
|
||||
Xoa_ttl redirect_ttl = wiki.Redirect_mgr().Extract_redirect(src, src.length);
|
||||
return redirect_ttl == Xop_redirect_mgr.Redirect_null_ttl ? Xop_redirect_mgr.Redirect_null_bry : redirect_ttl.Page_db();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user