1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
This commit is contained in:
gnosygnu
2014-09-07 22:38:50 -04:00
parent be63adc5af
commit a022d7f26c
293 changed files with 2546 additions and 1942 deletions

View File

@@ -31,7 +31,7 @@ public class Xoa_url_arg_hash {
Gfo_url_arg arg = (Gfo_url_arg)hash.Fetch(key);
return arg == null ? or : String_.new_utf8_(arg.Val_bry());
}
public void Set_val_by_int(byte[] key, int val) {Set_val_by_bry(key, Bry_.new_ascii_(Int_.XtoStr(val)));}
public void Set_val_by_int(byte[] key, int val) {Set_val_by_bry(key, Bry_.new_ascii_(Int_.Xto_str(val)));}
public void Set_val_by_bry(byte[] key, byte[] val) {
Gfo_url_arg arg = (Gfo_url_arg)hash.Fetch(key);
if (arg == null) {

View File

@@ -78,18 +78,11 @@ public class Xoh_href_parser {
public void Build_to_bfr(Bry_bfr bfr, Xow_wiki wiki, Xoa_ttl ttl, boolean force_site) {
byte[] page = ttl.Full_txt_raw();
Xow_xwiki_itm xwiki = ttl.Wik_itm();
if (xwiki == null) { // not an xwiki; EX: [[wikt:Word]]
if (ttl.Leaf_bgn() != Bry_.NotFound) { // NOTE: this is strange logic to handle urls of for form [[../a]]; need to revisit why (a) only Raw has resolved title and (b) why it's not encoded
encoder.Encode(bfr_encoder, ttl.Raw());
}
else { // regular page; encode;
Build_to_bfr_page(ttl, page, 0);
}
}
else { // xwiki; skip wiki and encode page only;
if (xwiki == null) // not an xwiki; EX: [[wikt:Word]]
Build_to_bfr_page(ttl, page, 0); // write page only; NOTE: changed to remove leaf logic DATE:2014-09-07
else { // xwiki; skip wiki and encode page only;
byte[] wik_txt = ttl.Wik_txt();
Build_to_bfr_page(ttl, page, wik_txt.length + 1);
// encoder.Encode(bfr_encoder, page, wik_txt.length + 1, page.length);
}
if (xwiki == null) { // not an xwiki
if (ttl.Anch_bgn() != 1) { // not an anchor-only; EX: "#A"