"
+ , "
~{hdr}
"
+ , "
"
+ , " "
+ ), "hdr", "itms");
+}
+class Wdata_fmtr__toc_itm implements Bry_fmtr_arg {
+ private byte[][] hdrs; private Url_encoder href_encoder;
+ public void Init_by_ctor(Url_encoder href_encoder) {this.href_encoder = href_encoder;}
+ public void Init_by_page(byte[][] hdrs) {this.hdrs = hdrs;}
+ public void XferAry(Bry_bfr bfr, int idx) {
+ int len = hdrs.length;
+ for (int i = 0; i < len; ++i) {
+ byte[] hdr = hdrs[i];
+ fmtr.Bld_bfr_many(bfr, i + ListAdp_.Base1, href_encoder.Encode(hdr), hdr);
+ }
+ }
+ private Bry_fmtr fmtr = Bry_fmtr.new_
+ ( "
~{idx} ~{hdr}"
+ , "idx", "href", "text");
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtrs.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtrs.java
new file mode 100644
index 000000000..62d0825a1
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtrs.java
@@ -0,0 +1,216 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
.
+*/
+package gplx.xowa.xtns.wdatas.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.html.*; import gplx.xowa.xtns.wdatas.core.*; import gplx.xowa.xtns.wdatas.parsers.*;
+import gplx.xowa.wikis.*;
+interface Wdata_fmtr__row extends Bry_fmtr_arg {
+ void Init_by_page(OrderedHash list);
+}
+class Wdata_fmtr__langtext_tbl implements Bry_fmtr_arg {
+ private Wdata_fmtr__row fmtr_row;
+ private byte[] tbl_hdr, col_hdr_lang, col_hdr_text; private int list_len;
+ public void Init_by_ctor(Wdata_fmtr__row fmtr_row) {this.fmtr_row = fmtr_row;}
+ public void Init_by_lang(byte[] tbl_hdr, byte[] col_hdr_lang, byte[] col_hdr_text) {
+ this.tbl_hdr = tbl_hdr; this.col_hdr_lang = col_hdr_lang; this.col_hdr_text = col_hdr_text;
+ }
+ public void Init_by_wdoc(Wdata_fmtr__toc_div fmtr_toc, OrderedHash list) {
+ this.list_len = list.Count(); if (list_len == 0) return;
+ fmtr_toc.Add(tbl_hdr);
+ fmtr_row.Init_by_page(list);
+ }
+ public void XferAry(Bry_bfr bfr, int idx) {
+ if (list_len == 0) return;
+ fmtr.Bld_bfr_many(bfr, tbl_hdr, col_hdr_lang, col_hdr_text, fmtr_row);
+ }
+ private Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
~{hdr}
"
+ , ""
+ , "
"
+ , " "
+ , " | ~{lang_lbl} | "
+ , " ~{text_lbl} | "
+ , "
~{rows}"
+ , "
"
+ ), "hdr", "lang_lbl", "text_lbl", "rows");
+}
+class Wdata_fmtr__langtext_row implements Wdata_fmtr__row {
+ private OrderedHash list;
+ public void Init_by_page(OrderedHash list) {this.list = list;}
+ public void XferAry(Bry_bfr bfr, int idx) {
+ int len = list.Count();
+ for (int i = 0; i < len; ++i) {
+ Wdata_langtext_itm itm = (Wdata_langtext_itm)list.FetchAt(i);
+ row_fmtr.Bld_bfr_many(bfr, itm.Lang(), Html_utl.Escape_html_as_bry(itm.Text()));
+ }
+ }
+ private Bry_fmtr row_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
"
+ , " ~{lang} | "
+ , " ~{text} | "
+ , "
"
+ ), "lang", "text");
+}
+class Wdata_fmtr__alias_row implements Wdata_fmtr__row {
+ private OrderedHash list; private Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
+ public void Init_by_page(OrderedHash list) {this.list = list;}
+ public void XferAry(Bry_bfr bfr, int idx) {
+ int len = list.Count();
+ for (int i = 0; i < len; ++i) {
+ Wdata_alias_itm itm = (Wdata_alias_itm)list.FetchAt(i);
+ byte[][] vals_ary = itm.Vals();
+ int vals_len = vals_ary.length;
+ for (int j = 0; j < vals_len; ++j) {
+ byte[] val = vals_ary[j];
+ if (j != 0) tmp_bfr.Add(Html_tag_.Br_inl);
+ tmp_bfr.Add(Html_utl.Escape_html_as_bry(val));
+ }
+ row_fmtr.Bld_bfr_many(bfr, itm.Lang(), tmp_bfr.XtoAryAndClear());
+ }
+ }
+ private Bry_fmtr row_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
"
+ , " ~{lang} | "
+ , " ~{text} | "
+ , "
"
+ ), "lang", "text");
+}
+class Wdata_fmtr__claim_tbl implements Bry_fmtr_arg {
+ public Wdata_fmtr__claim_row Fmtr_row() {return fmtr_row;} private Wdata_fmtr__claim_row fmtr_row = new Wdata_fmtr__claim_row(); private int list_len;
+ private byte[] tbl_hdr, col_hdr_prop_id, col_hdr_prop_name, col_hdr_val, col_hdr_ref, col_hdr_qual, col_hdr_rank;
+ public void Init_by_ctor(Wdata_lbl_mgr lbl_regy) {fmtr_row.Init_by_ctor(lbl_regy);}
+ public void Init_by_lang(Wdata_hwtr_msgs msgs, byte[] tbl_hdr, byte[] col_hdr_prop_id, byte[] col_hdr_prop_name, byte[] col_hdr_val, byte[] col_hdr_ref, byte[] col_hdr_qual, byte[] col_hdr_rank) {
+ fmtr_row.Init_by_lang(msgs);
+ this.tbl_hdr = tbl_hdr; this.col_hdr_prop_id = col_hdr_prop_id; this.col_hdr_prop_name = col_hdr_prop_name;
+ this.col_hdr_val = col_hdr_val; this.col_hdr_ref = col_hdr_ref; this.col_hdr_qual = col_hdr_qual; this.col_hdr_rank = col_hdr_rank;
+ }
+ public void Init_by_wdoc(Wdata_fmtr__toc_div fmtr_toc, OrderedHash list) {
+ this.list_len = list.Count(); if (list_len == 0) return;
+ fmtr_toc.Add(tbl_hdr);
+ fmtr_row.Init_by_page(list);
+ }
+ public void XferAry(Bry_bfr bfr, int idx) {
+ if (list_len == 0) return;
+ fmtr.Bld_bfr_many(bfr, tbl_hdr, col_hdr_prop_id, col_hdr_prop_name, col_hdr_val, col_hdr_ref, col_hdr_qual, col_hdr_rank, fmtr_row);
+ }
+ private Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
~{hdr}
"
+ , ""
+ , "
"
+ , " "
+ , " | ~{prop_id} | "
+ , " ~{prop_name} | "
+ , " ~{val} | "
+ , " ~{ref} | "
+ , " ~{qual} | "
+ , " ~{rank} | "
+ , "
~{rows}"
+ , "
"
+ ), "hdr", "prop_id", "prop_name", "val", "ref", "qual", "rank", "rows");
+}
+class Wdata_fmtr__claim_row implements Wdata_fmtr__row {
+ private Wdata_lbl_mgr lbl_regy; private Wdata_hwtr_msgs msgs;
+ private OrderedHash list; private Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
+ public void Init_by_ctor(Wdata_lbl_mgr lbl_regy) {this.lbl_regy = lbl_regy;}
+ public void Init_by_lang(Wdata_hwtr_msgs msgs) {this.msgs = msgs;}
+ public void Init_by_page(OrderedHash list) {this.list = list;}
+ public void XferAry(Bry_bfr bfr, int idx) {
+ lbl_regy.getClass();
+ int len = list.Count();
+ for (int i = 0; i < len; ++i) {
+ Wdata_claim_grp grp = (Wdata_claim_grp)list.FetchAt(i);
+ int grp_len = grp.Len();
+ for (int j = 0; j < grp_len; ++j) {
+ Wdata_claim_itm_core itm = grp.Get_at(j);
+ byte[] val = Calc_val(itm);
+ byte[] pid_name = lbl_regy.Pid_regy().Get_text_or_empty(itm.Pid());
+ row_fmtr.Bld_bfr_many(bfr, itm.Pid(), pid_name, val, "", "", Wdata_dict_rank.Xto_str(itm.Rank_tid()));
+ }
+ }
+ }
+ public byte[] Calc_val(Wdata_claim_itm_core itm) {
+ switch (itm.Val_tid()) {
+ case Wdata_dict_val_tid.Tid_string:
+ return ((Wdata_claim_itm_str)itm).Val_str();
+ case Wdata_dict_val_tid.Tid_monolingualtext:
+ Wdata_claim_itm_monolingualtext monolingual = (Wdata_claim_itm_monolingualtext)itm;
+ tmp_bfr.Add_byte(Byte_ascii.Brack_bgn).Add(monolingual.Lang()).Add_byte(Byte_ascii.Brack_end).Add_byte(Byte_ascii.Space);
+ tmp_bfr.Add(monolingual.Text());
+ return tmp_bfr.XtoAryAndClear();
+ case Wdata_dict_val_tid.Tid_time:
+ Wdata_claim_itm_time time = (Wdata_claim_itm_time)itm;
+ Wdata_date date = time.Time_as_date();
+ tmp_bfr.Add_long_variable(date.Year());
+ tmp_bfr.Add_byte(Byte_ascii.Dash) .Add_int_fixed(date.Month() , 2);
+ tmp_bfr.Add_byte(Byte_ascii.Dash) .Add_int_fixed(date.Day() , 2);
+ tmp_bfr.Add_byte(Byte_ascii.Space) .Add_int_fixed(date.Hour() , 2);
+ tmp_bfr.Add_byte(Byte_ascii.Colon) .Add_int_fixed(date.Minute(), 2);
+ tmp_bfr.Add_byte(Byte_ascii.Colon) .Add_int_fixed(date.Second(), 2);
+ return tmp_bfr.XtoAryAndClear();
+ case Wdata_dict_val_tid.Tid_quantity:
+ Wdata_claim_itm_quantity quantity = (Wdata_claim_itm_quantity)itm;
+ long amount = quantity.Amount_as_long();
+ long ubound = quantity.Ubound_as_long();
+ long lbound = quantity.Lbound_as_long();
+ long udiff = ubound - amount;
+ long ldiff = amount - lbound;
+ tmp_bfr.Add(quantity.Amount()).Add_byte_space();
+ if (udiff == ldiff) { // delta is same in both directions; EX: amount=50 ubound=60 lbound=40 -> udiff == ldiff == 10
+ if (udiff != 0) // skip if 0
+ tmp_bfr.Add(msgs.Sym_plusminus()).Add_long_variable(udiff);
+ }
+ else { // delta is diff in both directions; EX: amount=50 ubound=60 lbound=30 -> udiff == 10, ldiff == 20
+ if (udiff != 0) // skip if 0
+ tmp_bfr.Add(msgs.Sym_plus()).Add_long_variable(udiff);
+ if (ldiff != 0) { // skip if 0
+ if (udiff != 0) tmp_bfr.Add(Time_plus_minus_spr);
+ tmp_bfr.Add(msgs.Sym_minus()).Add_long_variable(ldiff);
+ }
+ }
+ byte[] unit = quantity.Unit();
+ if (!Bry_.Eq(unit, Wdata_claim_itm_quantity.Unit_1))
+ tmp_bfr.Add_byte_space().Add(unit);
+ return tmp_bfr.XtoAryAndClear();
+ case Wdata_dict_val_tid.Tid_globecoordinate:
+ case Wdata_dict_val_tid.Tid_bad:
+ // Wdata_claim_itm_globecoordinate globecoordinate = (Wdata_claim_itm_globecoordinate)itm;
+ break;
+ case Wdata_dict_val_tid.Tid_entity:
+ Wdata_claim_itm_entity entity = (Wdata_claim_itm_entity)itm;
+ return lbl_regy.Qid_regy().Get_text_or_empty(entity.Entity_id());
+ case Wdata_dict_val_tid.Tid_unknown:
+ return Wdata_dict_val_tid.Bry_unknown;
+ }
+ return null;
+ } private static final byte[] Time_plus_minus_spr = Bry_.new_ascii_(" / ");
+ private Bry_fmtr row_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
"
+ , " | ~{prop_id} | "
+ , " ~{prop_name} | "
+ , " ~{val} | "
+ , " ~{ref} | "
+ , " ~{qual} | "
+ , " ~{rank} | "
+ , "
"
+ ), "prop_id", "prop_name", "val", "ref", "qual", "rank"
+ );
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_mgr.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_mgr.java
new file mode 100644
index 000000000..2f586c417
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_mgr.java
@@ -0,0 +1,65 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
.
+*/
+package gplx.xowa.xtns.wdatas.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.json.*;
+public class Wdata_hwtr_mgr {
+ private final Bry_bfr bfr = Bry_bfr.reset_(Io_mgr.Len_mb);
+ @gplx.Internal protected Wdata_fmtr__toc_div Fmtr_toc() {return fmtr_toc;} private final Wdata_fmtr__toc_div fmtr_toc = new Wdata_fmtr__toc_div();
+ @gplx.Internal protected Wdata_fmtr__json Fmtr_json() {return fmtr_json;} private final Wdata_fmtr__json fmtr_json = new Wdata_fmtr__json();
+ @gplx.Internal protected Wdata_fmtr__claim_tbl Fmtr_claim() {return fmtr_claim;} private final Wdata_fmtr__claim_tbl fmtr_claim = new Wdata_fmtr__claim_tbl();
+ private final Wdata_fmtr__langtext_tbl fmtr_label = new Wdata_fmtr__langtext_tbl();
+ private final Wdata_fmtr__langtext_tbl fmtr_descr = new Wdata_fmtr__langtext_tbl();
+ private final Wdata_fmtr__langtext_tbl fmtr_alias = new Wdata_fmtr__langtext_tbl();
+ private final Wdata_fmtr__sitelink_tbl fmtr_slink = new Wdata_fmtr__sitelink_tbl();
+ public Bry_fmtr Fmtr_main() {return fmtr_main;} private final Bry_fmtr fmtr_main = Bry_fmtr.new_("~{toc}~{claims}~{labels}~{aliases}~{descriptions}~{links}~{json}", "toc", "claims", "labels", "aliases", "descriptions", "links", "json");
+ public Wdata_hwtr_msgs Msgs() {return msgs;} private Wdata_hwtr_msgs msgs;
+ @gplx.Internal protected Wdata_lbl_mgr Lbl_mgr() {return lbl_mgr;} private final Wdata_lbl_mgr lbl_mgr = new Wdata_lbl_mgr();
+ @gplx.Internal protected void Init_by_ctor(Json_parser jdoc_parser, Wdata_lbl_wkr lbl_wkr, Url_encoder href_encoder) {
+ lbl_mgr.Wkr_(lbl_wkr);
+ fmtr_toc.Init_by_ctor(href_encoder);
+ fmtr_claim.Init_by_ctor(lbl_mgr);
+ fmtr_label.Init_by_ctor(new Wdata_fmtr__langtext_row());
+ fmtr_alias.Init_by_ctor(new Wdata_fmtr__alias_row());
+ fmtr_descr.Init_by_ctor(new Wdata_fmtr__langtext_row());
+ fmtr_slink.Init_by_ctor(lbl_mgr);
+ fmtr_json.Init_by_ctor(jdoc_parser);
+ }
+ public void Init_by_lang(Wdata_hwtr_msgs msgs) {
+ this.msgs = msgs;
+ fmtr_claim.Init_by_lang(msgs, msgs.Claim_tbl_hdr(), msgs.Claim_col_hdr_prop_id(), msgs.Claim_col_hdr_prop_name(), msgs.Claim_col_hdr_val(), msgs.Claim_col_hdr_ref(), msgs.Claim_col_hdr_qual(), msgs.Claim_col_hdr_rank());
+ fmtr_label.Init_by_lang(msgs.Label_tbl_hdr(), msgs.Label_col_hdr_lang(), msgs.Label_col_hdr_text());
+ fmtr_alias.Init_by_lang(msgs.Alias_tbl_hdr(), msgs.Alias_col_hdr_lang(), msgs.Alias_col_hdr_text());
+ fmtr_descr.Init_by_lang(msgs.Descr_tbl_hdr(), msgs.Descr_col_hdr_lang(), msgs.Descr_col_hdr_text());
+ fmtr_slink.Init_by_lang(msgs);
+ fmtr_json.Init_by_lang(msgs.Json_tbl_hdr());
+ }
+ public void Init_by_wdoc(Wdata_doc wdoc) {
+ fmtr_toc .Init_by_wdoc(wdoc);
+ fmtr_claim.Init_by_wdoc(fmtr_toc, wdoc.Claim_list());
+ fmtr_label.Init_by_wdoc(fmtr_toc, wdoc.Label_list());
+ fmtr_alias.Init_by_wdoc(fmtr_toc, wdoc.Alias_list());
+ fmtr_descr.Init_by_wdoc(fmtr_toc, wdoc.Descr_list());
+ fmtr_slink.Init_by_wdoc(fmtr_toc, wdoc.Slink_list());
+ fmtr_json.Init_by_wdoc (fmtr_toc, wdoc.Jdoc());
+ lbl_mgr.Gather_labels(wdoc);
+ }
+ public byte[] Write(Wdata_doc wdoc) {
+ fmtr_main.Bld_bfr_many(bfr, "", fmtr_claim, fmtr_label, fmtr_alias, fmtr_descr, fmtr_slink, fmtr_json);
+ return bfr.XtoAryAndClear();
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_mgr_tst.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_mgr_tst.java
new file mode 100644
index 000000000..7a72335b2
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_mgr_tst.java
@@ -0,0 +1,264 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
.
+*/
+package gplx.xowa.xtns.wdatas.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import org.junit.*;
+import gplx.json.*; import gplx.xowa.xtns.wdatas.core.*; import gplx.xowa.xtns.wdatas.parsers.*;
+public class Wdata_hwtr_mgr_tst {
+ @Before public void init() {fxt.init();} private Wdata_hwtr_mgr_fxt fxt = new Wdata_hwtr_mgr_fxt();
+ @Test public void Write_label() {
+ fxt.Test_doc(fxt.Wdoc_bldr()
+ .Add_label("en", "en_label")
+ .Add_label("de", "de_label").Xto_wdoc(), String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
Labels
"
+ , ""
+ , "
"
+ , " "
+ , " | Language | "
+ , " Label | "
+ , "
"
+ , " "
+ , " en | "
+ , " en_label | "
+ , "
"
+ , " "
+ , " de | "
+ , " de_label | "
+ , "
"
+ , "
"
+ ));
+ }
+ @Test public void Write_descr() {
+ fxt.Test_doc(fxt.Wdoc_bldr()
+ .Add_description("en", "en_descr")
+ .Add_description("de", "de_descr").Xto_wdoc(), String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
Descriptions
"
+ , ""
+ , "
"
+ , " "
+ , " | Language | "
+ , " Description | "
+ , "
"
+ , " "
+ , " en | "
+ , " en_descr | "
+ , "
"
+ , " "
+ , " de | "
+ , " de_descr | "
+ , "
"
+ , "
"
+ ));
+ }
+ @Test public void Write_alias() {
+ fxt.Test_doc(fxt.Wdoc_bldr()
+ .Add_alias("en", "en_1", "en_2")
+ .Add_alias("de", "de_1").Xto_wdoc(), String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
Aliases
"
+ , ""
+ , "
"
+ , " "
+ , " | Language | "
+ , " Alias | "
+ , "
"
+ , " "
+ , " en | "
+ , " en_1
en_2 | "
+ , "
"
+ , " "
+ , " de | "
+ , " de_1 | "
+ , "
"
+ , "
"
+ ));
+ }
+ @Test public void Write_slink() {
+ fxt.Test_doc(fxt.Wdoc_bldr()
+ .Add_sitelink("enwiki", "Earth")
+ .Add_sitelink("dewiki", "Erde").Xto_wdoc(), String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
Links
"
+ , ""
+ , "
"
+ , " "
+ , " | Site | "
+ , " Link | "
+ , " Badges | "
+ , "
"
+ , " "
+ , " enwiki | "
+ , " Earth | "
+ , "
"
+ , " "
+ , " dewiki | "
+ , " Erde | "
+ , "
"
+ , "
"
+ ));
+ }
+ @Test public void Write_claim() {
+ fxt
+ .Init_resolved_pid(1, "prop_1")
+ .Test_doc(fxt.Wdoc_bldr()
+ .Add_claims
+ ( fxt.Wdata_fxt().Make_claim_str(1, "abc")
+ ).Xto_wdoc(), String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
Claims
"
+ , ""
+ , "
"
+ , " "
+ , " | Id | "
+ , " Name | "
+ , " Value | "
+ , " References | "
+ , " Qualifiers | "
+ , " Rank | "
+ , "
"
+ , " "
+ , " | 1 | "
+ , " prop_1 | "
+ , " abc | "
+ , " | "
+ , " | "
+ , " normal | "
+ , "
"
+ , "
"
+ ));
+ }
+ @Test public void Write_claim_monolingualtext() {
+ fxt
+ .Test_claim_val
+ ( fxt.Wdata_fxt().Make_claim_monolingual(1, "en", "Motto")
+ , "[en] Motto"
+ );
+ }
+ @Test public void Write_claim_time() {
+ fxt
+ .Test_claim_val
+ ( fxt.Wdata_fxt().Make_claim_time(1, "2001-02-03 04:05:06")
+ , "2001-02-03 04:05:06"
+ );
+ }
+ @Test public void Write_claim_quantity_ubound_lbound() {
+ fxt
+ .Test_claim_val
+ ( fxt.Wdata_fxt().Make_claim_quantity(1, "50", "units", "60", "30")
+ , "50 +10 / -20 units"
+ );
+ }
+ @Test public void Write_claim_quantity_same() {
+ fxt
+ .Test_claim_val
+ ( fxt.Wdata_fxt().Make_claim_quantity(1, "50", "units", "60", "40")
+ , "50 ±10 units"
+ );
+ }
+ @Test public void Write_claim_entity() {
+ fxt
+ .Init_resolved_qid(1, "item_1")
+ .Test_claim_val
+ ( fxt.Wdata_fxt().Make_claim_entity(1, 1)
+ , "item_1"
+ );
+ }
+ @Test public void Write_json() {
+ Json_doc jdoc = Json_doc.new_apos_("{ 'node':['val_0', 'val_1'] }");
+ Wdata_doc wdoc = new Wdata_doc(Bry_.Empty, null, jdoc);
+ fxt.Test_json(wdoc, String_.Concat_lines_nl_skip_last
+ ( ""
+ , "
JSON
"
+ , ""
+ , "
"
+ , "{ \"node\":"
+ , " [ \"val_0\""
+ , " , \"val_1\""
+ , " ]"
+ , "}"
+ , ""
+ ));
+ }
+}
+class Wdata_hwtr_mgr_fxt {
+ private Wdata_hwtr_mgr doc_hwtr; private OrderedHash resolved_pids = OrderedHash_.new_bry_(), resolved_qids = OrderedHash_.new_bry_();
+ public Wdata_wiki_mgr_fxt Wdata_fxt() {return wdata_fxt;} private Wdata_wiki_mgr_fxt wdata_fxt = new Wdata_wiki_mgr_fxt();
+ public void init() {
+ if (doc_hwtr == null) {
+ doc_hwtr = new Wdata_hwtr_mgr();
+ Wdata_hwtr_msgs msgs = new Wdata_hwtr_msgs(Make_msgs());
+ doc_hwtr.Init_by_ctor(new Json_parser(), new Wdata_lbl_wkr__test(resolved_pids, resolved_qids), Url_encoder.new_html_href_mw_());
+ doc_hwtr.Init_by_lang(msgs);
+ }
+ resolved_pids.Clear();
+ resolved_qids.Clear();
+ }
+ private byte[][] Make_msgs() {
+ return Bry_.Ary
+ ( "Contents"
+ , "Labels", "Language", "Label"
+ , "Aliases", "Language", "Alias"
+ , "Descriptions", "Language", "Description"
+ , "Links"
+ , "Links (Wikipedia)", "Links (Wiktionary)", "Links (Wikisource)", "Links (Wikivoyage)"
+ , "Links (Wikiquote)", "Links (Wikibooks)", "Links (Wikiversity)", "Links (Wikinews)", "Links (Special wikis)"
+ , "Site", "Link", "Badges"
+ , "Claims", "Id", "Name", "Value", "References", "Qualifiers", "Rank"
+ , "JSON"
+ , ", ", " ", "(~{0})"
+ , "+", "-", "±"
+ , "—", "?"
+ , "preferred", "normal", "deprecated"
+ , "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ , "~{0}0s", "~{0}. century", "~{0}. millenium", "~{0}0,000 years", "~{0}00,000 years", "~{0} million years", "~{0}0 million years", "~{0}00 million years", "~{0} billion years"
+ , "~{0} BC", "~{0} ago", "in ~{0}", "
jul"
+ , "N", "S", "E", "W"
+ , "°", "′", "″"
+ , " m"
+ );
+ }
+ public Wdata_doc_bldr Wdoc_bldr() {return wdoc_bldr;} private Wdata_doc_bldr wdoc_bldr = new Wdata_doc_bldr();
+ public Wdata_hwtr_mgr_fxt Init_resolved_pid(int pid, String lbl) {resolved_pids.Add(Wdata_lbl_itm.Make_ttl(Bool_.Y, pid), new Wdata_langtext_itm(Bry_.new_ascii_("en"), Bry_.new_ascii_(lbl))); return this;}
+ public Wdata_hwtr_mgr_fxt Init_resolved_qid(int qid, String lbl) {resolved_qids.Add(Wdata_lbl_itm.Make_ttl(Bool_.N, qid), new Wdata_langtext_itm(Bry_.new_ascii_("en"), Bry_.new_ascii_(lbl))); return this;}
+ public void Test_doc(Wdata_doc wdoc, String expd) {
+ doc_hwtr.Init_by_wdoc(wdoc);
+ byte[] actl = doc_hwtr.Write(wdoc);
+ Tfds.Eq_str_lines(expd, String_.new_utf8_(actl));
+ }
+ public void Test_claim_val(Wdata_claim_itm_core claim, String expd) {
+ doc_hwtr.Init_by_wdoc(wdoc_bldr.Add_claims(claim).Xto_wdoc());
+ byte[] actl = doc_hwtr.Fmtr_claim().Fmtr_row().Calc_val(claim);
+ Tfds.Eq(expd, String_.new_utf8_(actl));
+ }
+ public void Test_json(Wdata_doc wdoc, String expd) {
+ Wdata_fmtr__json fmtr_json = doc_hwtr.Fmtr_json();
+ fmtr_json.Init_by_wdoc(doc_hwtr.Fmtr_toc(), wdoc.Jdoc());
+ Bry_bfr tmp_bfr = Bry_bfr.new_();
+ fmtr_json.XferAry(tmp_bfr, 0);
+ Tfds.Eq_str_lines(expd, tmp_bfr.XtoStrAndClear());
+ }
+}
+class Wdata_lbl_wkr__test implements Wdata_lbl_wkr {
+ private OrderedHash resolved_pids, resolved_qids;
+ public Wdata_lbl_wkr__test(OrderedHash resolved_pids, OrderedHash resolved_qids) {this.resolved_pids = resolved_pids; this.resolved_qids = resolved_qids;}
+ public void Resolve(Wdata_lbl_list pid_regy, Wdata_lbl_list qid_regy) {
+ pid_regy.Resolve(resolved_pids);
+ qid_regy.Resolve(resolved_qids);
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_msgs.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_msgs.java
new file mode 100644
index 000000000..0c1387ae1
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_msgs.java
@@ -0,0 +1,206 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
.
+*/
+package gplx.xowa.xtns.wdatas.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.xowa.langs.msgs.*;
+public class Wdata_hwtr_msgs {
+ public Wdata_hwtr_msgs(byte[][] brys) { int offset = 0; // String[] strs = String_.Ary(brys); // TEST
+ toc_tbl_hdr = brys[offset + 0];
+ label_tbl_hdr = brys[offset + 1];
+ label_col_hdr_lang = brys[offset + 2];
+ label_col_hdr_text = brys[offset + 3];
+ alias_tbl_hdr = brys[offset + 4];
+ alias_col_hdr_lang = brys[offset + 5];
+ alias_col_hdr_text = brys[offset + 6];
+ descr_tbl_hdr = brys[offset + 7];
+ descr_col_hdr_lang = brys[offset + 8];
+ descr_col_hdr_text = brys[offset + 9]; offset += 10;
+ slink_tbl_hdr = brys[offset + 0];
+ slink_tbl_hdr_w = brys[offset + 1];
+ slink_tbl_hdr_d = brys[offset + 2];
+ slink_tbl_hdr_s = brys[offset + 3];
+ slink_tbl_hdr_v = brys[offset + 4];
+ slink_tbl_hdr_q = brys[offset + 5];
+ slink_tbl_hdr_b = brys[offset + 6];
+ slink_tbl_hdr_u = brys[offset + 7];
+ slink_tbl_hdr_n = brys[offset + 8];
+ slink_tbl_hdr_x = brys[offset + 9]; offset += 10;
+ slink_col_hdr_site = brys[offset + 0];
+ slink_col_hdr_text = brys[offset + 1];
+ slink_col_hdr_bdgs = brys[offset + 2];
+ claim_tbl_hdr = brys[offset + 3];
+ claim_col_hdr_prop_id = brys[offset + 4];
+ claim_col_hdr_prop_name = brys[offset + 5];
+ claim_col_hdr_val = brys[offset + 6];
+ claim_col_hdr_ref = brys[offset + 7];
+ claim_col_hdr_qual = brys[offset + 8];
+ claim_col_hdr_rank = brys[offset + 9];
+ json_tbl_hdr = brys[offset + 10]; offset += 11;
+ sym_list_comma = brys[offset + 0];
+ sym_list_word = brys[offset + 1];
+ sym_fmt_parentheses = brys[offset + 2];
+ sym_plus = brys[offset + 3];
+ sym_minus = brys[offset + 4];
+ sym_plusminus = brys[offset + 5]; offset += 6;
+ val_tid_novalue = brys[offset + 0];
+ val_tid_somevalue = brys[offset + 1];
+ rank_preferred = brys[offset + 2];
+ rank_normal = brys[offset + 3];
+ rank_deprecated = brys[offset + 4]; offset += 5;
+ time_month_01 = brys[offset + 0];
+ time_month_02 = brys[offset + 1];
+ time_month_03 = brys[offset + 2];
+ time_month_04 = brys[offset + 3];
+ time_month_05 = brys[offset + 4];
+ time_month_06 = brys[offset + 5];
+ time_month_07 = brys[offset + 6];
+ time_month_08 = brys[offset + 7];
+ time_month_09 = brys[offset + 8];
+ time_month_10 = brys[offset + 9];
+ time_month_11 = brys[offset + 10];
+ time_month_12 = brys[offset + 11]; offset += 12;
+ time_year_1e10_01 = brys[offset + 0];
+ time_year_1e10_02 = brys[offset + 1];
+ time_year_1e10_03 = brys[offset + 2];
+ time_year_1e10_04 = brys[offset + 3];
+ time_year_1e10_05 = brys[offset + 4];
+ time_year_1e10_06 = brys[offset + 5];
+ time_year_1e10_07 = brys[offset + 6];
+ time_year_1e10_08 = brys[offset + 7];
+ time_year_1e10_09 = brys[offset + 8]; offset += 9;
+ time_relative_bc = brys[offset + 0];
+ time_relative_ago = brys[offset + 1];
+ time_relative_in = brys[offset + 2];
+ time_julian = brys[offset + 3]; offset += 4;
+ geo_dir_n = brys[offset + 0];
+ geo_dir_s = brys[offset + 1];
+ geo_dir_e = brys[offset + 2];
+ geo_dir_w = brys[offset + 3];
+ geo_unit_degree = brys[offset + 4];
+ geo_unit_minute = brys[offset + 5];
+ geo_unit_second = brys[offset + 6];
+ geo_meters = brys[offset + 7];
+ }
+ public static Wdata_hwtr_msgs new_(Xow_wiki wiki) {
+ byte[][] brys = new_brys(wiki
+ , "toc"
+ , "xowa-wikidata-labels" , "xowa-wikidata-language" , "xowa-wikidata-label"
+ , "xowa-wikidata-aliasesHead" , "xowa-wikidata-language" , "xowa-wikidata-aliases"
+ , "xowa-wikidata-descriptions" , "xowa-wikidata-language" , "xowa-wikidata-description"
+ , "xowa-wikidata-links"
+ , "xowa-wikidata-links-wiki" , "xowa-wikidata-links-wiktionary" , "xowa-wikidata-links-wikisource", "xowa-wikidata-links-wikivoyage"
+ , "xowa-wikidata-links-wikiquote" , "xowa-wikidata-links-wikibooks" , "xowa-wikidata-links-wikiversity", "xowa-wikidata-links-wikinews", "xowa-wikidata-links-special"
+ , "xowa-wikidata-wiki" , "xowa-wikidata-link" , "xowa-wikidata-badges"
+ , "xowa-wikidata-claims" , "xowa-wikidata-property-id" , "xowa-wikidata-property", "xowa-wikidata-value", "xowa-wikidata-references", "xowa-wikidata-qualifiers", "Wikibase-diffview-rank"
+ , "xowa-wikidata-json"
+ , "comma-separator", "word-separator", "parentheses"
+ , "xowa-wikidata-plus", "xowa-wikidata-minus", "xowa-wikidata-plusminus"
+ , "xowa-wikidata-novalue", "xowa-wikidata-somevalue"
+ , "xowa-wikidata-preferred", "xowa-wikidata-normal", "xowa-wikidata-deprecated"
+ , "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"
+ , "xowa-wikidata-decade", "xowa-wikidata-century", "xowa-wikidata-millenium", "xowa-wikidata-years1e4", "xowa-wikidata-years1e5", "xowa-wikidata-years1e6", "xowa-wikidata-years1e7", "xowa-wikidata-years1e8", "xowa-wikidata-years1e9"
+ , "ago", "xowa-wikidata-bc", "xowa-wikidata-inTime"
+ , "xowa-wikidata-julian"
+ , "xowa-wikidata-north", "xowa-wikidata-south", "xowa-wikidata-east", "xowa-wikidata-west"
+ , "xowa-wikidata-degree", "xowa-wikidata-minute", "xowa-wikidata-second"
+ , "xowa-wikidata-meters"
+ );
+ return new Wdata_hwtr_msgs(brys);
+ }
+ private static byte[][] new_brys(Xow_wiki wiki, String... ids) {
+ int len = ids.length;
+ byte[][] rv = new byte[len][];
+ for (int i = 0; i < len; ++i)
+ rv[i] = gplx.html.Html_utl.Escape_html_as_bry(wiki.Msg_mgr().Val_by_key_obj(ids[i]));
+ return rv;
+ }
+ public byte[] Toc_tbl_hdr() {return toc_tbl_hdr;} private final byte[] toc_tbl_hdr;
+ public byte[] Label_tbl_hdr() {return label_tbl_hdr;} private final byte[] label_tbl_hdr;
+ public byte[] Label_col_hdr_lang() {return label_col_hdr_lang;} private final byte[] label_col_hdr_lang;
+ public byte[] Label_col_hdr_text() {return label_col_hdr_text;} private final byte[] label_col_hdr_text;
+ public byte[] Alias_tbl_hdr() {return alias_tbl_hdr;} private final byte[] alias_tbl_hdr;
+ public byte[] Alias_col_hdr_lang() {return alias_col_hdr_lang;} private final byte[] alias_col_hdr_lang;
+ public byte[] Alias_col_hdr_text() {return alias_col_hdr_text;} private final byte[] alias_col_hdr_text;
+ public byte[] Descr_tbl_hdr() {return descr_tbl_hdr;} private final byte[] descr_tbl_hdr;
+ public byte[] Descr_col_hdr_lang() {return descr_col_hdr_lang;} private final byte[] descr_col_hdr_lang;
+ public byte[] Descr_col_hdr_text() {return descr_col_hdr_text;} private final byte[] descr_col_hdr_text;
+ public byte[] Slink_tbl_hdr() {return slink_tbl_hdr;} private final byte[] slink_tbl_hdr;
+ public byte[] Slink_tbl_hdr_w() {return slink_tbl_hdr_w;} private final byte[] slink_tbl_hdr_w;
+ public byte[] Slink_tbl_hdr_d() {return slink_tbl_hdr_d;} private final byte[] slink_tbl_hdr_d;
+ public byte[] Slink_tbl_hdr_s() {return slink_tbl_hdr_s;} private final byte[] slink_tbl_hdr_s;
+ public byte[] Slink_tbl_hdr_v() {return slink_tbl_hdr_v;} private final byte[] slink_tbl_hdr_v;
+ public byte[] Slink_tbl_hdr_q() {return slink_tbl_hdr_q;} private final byte[] slink_tbl_hdr_q;
+ public byte[] Slink_tbl_hdr_b() {return slink_tbl_hdr_b;} private final byte[] slink_tbl_hdr_b;
+ public byte[] Slink_tbl_hdr_u() {return slink_tbl_hdr_u;} private final byte[] slink_tbl_hdr_u;
+ public byte[] Slink_tbl_hdr_n() {return slink_tbl_hdr_n;} private final byte[] slink_tbl_hdr_n;
+ public byte[] Slink_tbl_hdr_x() {return slink_tbl_hdr_x;} private final byte[] slink_tbl_hdr_x;
+ public byte[] Slink_col_hdr_site() {return slink_col_hdr_site;} private final byte[] slink_col_hdr_site;
+ public byte[] Slink_col_hdr_text() {return slink_col_hdr_text;} private final byte[] slink_col_hdr_text;
+ public byte[] Slink_col_hdr_bdgs() {return slink_col_hdr_bdgs;} private final byte[] slink_col_hdr_bdgs;
+ public byte[] Claim_tbl_hdr() {return claim_tbl_hdr;} private final byte[] claim_tbl_hdr;
+ public byte[] Claim_col_hdr_prop_id() {return claim_col_hdr_prop_id;} private final byte[] claim_col_hdr_prop_id;
+ public byte[] Claim_col_hdr_prop_name() {return claim_col_hdr_prop_name;} private final byte[] claim_col_hdr_prop_name;
+ public byte[] Claim_col_hdr_val() {return claim_col_hdr_val;} private final byte[] claim_col_hdr_val;
+ public byte[] Claim_col_hdr_ref() {return claim_col_hdr_ref;} private final byte[] claim_col_hdr_ref;
+ public byte[] Claim_col_hdr_qual() {return claim_col_hdr_qual;} private final byte[] claim_col_hdr_qual;
+ public byte[] Claim_col_hdr_rank() {return claim_col_hdr_rank;} private final byte[] claim_col_hdr_rank;
+ public byte[] Json_tbl_hdr() {return json_tbl_hdr;} private final byte[] json_tbl_hdr;
+ public byte[] Val_tid_novalue() {return val_tid_novalue;} private final byte[] val_tid_novalue;
+ public byte[] Val_tid_somevalue() {return val_tid_somevalue;} private final byte[] val_tid_somevalue;
+ public byte[] Rank_preferred() {return rank_preferred;} private final byte[] rank_preferred;
+ public byte[] Rank_normal() {return rank_normal;} private final byte[] rank_normal;
+ public byte[] Rank_deprecated() {return rank_deprecated;} private final byte[] rank_deprecated;
+ public byte[] Sym_list_comma() {return sym_list_comma;} private final byte[] sym_list_comma;
+ public byte[] Sym_list_word() {return sym_list_word;} private final byte[] sym_list_word;
+ public byte[] Sym_fmt_parentheses() {return sym_fmt_parentheses;} private final byte[] sym_fmt_parentheses;
+ public byte[] Sym_plus() {return sym_plus;} private final byte[] sym_plus;
+ public byte[] Sym_minus() {return sym_minus;} private final byte[] sym_minus;
+ public byte[] Sym_plusminus() {return sym_plusminus;} private final byte[] sym_plusminus;
+ public byte[] Time_month_01() {return time_month_01;} private final byte[] time_month_01;
+ public byte[] Time_month_02() {return time_month_02;} private final byte[] time_month_02;
+ public byte[] Time_month_03() {return time_month_03;} private final byte[] time_month_03;
+ public byte[] Time_month_04() {return time_month_04;} private final byte[] time_month_04;
+ public byte[] Time_month_05() {return time_month_05;} private final byte[] time_month_05;
+ public byte[] Time_month_06() {return time_month_06;} private final byte[] time_month_06;
+ public byte[] Time_month_07() {return time_month_07;} private final byte[] time_month_07;
+ public byte[] Time_month_08() {return time_month_08;} private final byte[] time_month_08;
+ public byte[] Time_month_09() {return time_month_09;} private final byte[] time_month_09;
+ public byte[] Time_month_10() {return time_month_10;} private final byte[] time_month_10;
+ public byte[] Time_month_11() {return time_month_11;} private final byte[] time_month_11;
+ public byte[] Time_month_12() {return time_month_12;} private final byte[] time_month_12;
+ public byte[] Time_year_1e10_01() {return time_year_1e10_01;} private final byte[] time_year_1e10_01;
+ public byte[] Time_year_1e10_02() {return time_year_1e10_02;} private final byte[] time_year_1e10_02;
+ public byte[] Time_year_1e10_03() {return time_year_1e10_03;} private final byte[] time_year_1e10_03;
+ public byte[] Time_year_1e10_04() {return time_year_1e10_04;} private final byte[] time_year_1e10_04;
+ public byte[] Time_year_1e10_05() {return time_year_1e10_05;} private final byte[] time_year_1e10_05;
+ public byte[] Time_year_1e10_06() {return time_year_1e10_06;} private final byte[] time_year_1e10_06;
+ public byte[] Time_year_1e10_07() {return time_year_1e10_07;} private final byte[] time_year_1e10_07;
+ public byte[] Time_year_1e10_08() {return time_year_1e10_08;} private final byte[] time_year_1e10_08;
+ public byte[] Time_year_1e10_09() {return time_year_1e10_09;} private final byte[] time_year_1e10_09;
+ public byte[] Time_relative_bc() {return time_relative_bc;} private final byte[] time_relative_bc;
+ public byte[] Time_relative_ago() {return time_relative_ago;} private final byte[] time_relative_ago;
+ public byte[] Time_relative_in() {return time_relative_in;} private final byte[] time_relative_in;
+ public byte[] Time_julian() {return time_julian;} private final byte[] time_julian;
+ public byte[] Geo_dir_n() {return geo_dir_n;} private final byte[] geo_dir_n;
+ public byte[] Geo_dir_s() {return geo_dir_s;} private final byte[] geo_dir_s;
+ public byte[] Geo_dir_e() {return geo_dir_e;} private final byte[] geo_dir_e;
+ public byte[] Geo_dir_w() {return geo_dir_w;} private final byte[] geo_dir_w;
+ public byte[] Geo_unit_degree() {return geo_unit_degree;} private final byte[] geo_unit_degree;
+ public byte[] Geo_unit_minute() {return geo_unit_minute;} private final byte[] geo_unit_minute;
+ public byte[] Geo_unit_second() {return geo_unit_second;} private final byte[] geo_unit_second;
+ public byte[] Geo_meters() {return geo_meters;} private final byte[] geo_meters;
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_lang_sorter.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_lang_sorter.java
new file mode 100644
index 000000000..6d069de12
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_lang_sorter.java
@@ -0,0 +1,45 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
.
+*/
+package gplx.xowa.xtns.wdatas.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.xowa.xtns.wdatas.core.*;
+class Wdata_lang_sorter implements gplx.lists.ComparerAble {
+ private Hash_adp_bry hash = Hash_adp_bry.cs_();
+ public void Langs_(byte[][] langs) {
+ hash.Clear();
+ int len = langs.length;
+ for (int i = 0; i < len; ++i) {
+ byte[] lang = langs[i];
+ Wdata_lang_sorter_itm itm = new Wdata_lang_sorter_itm(i, lang);
+ hash.Add_if_new(lang, itm);
+ }
+ }
+ public int compare(Object lhsObj, Object rhsObj) {
+ Wdata_sortable lhs = (Wdata_sortable)lhsObj; if (lhs.Sort() == -1) Sort_calc(lhs);
+ Wdata_sortable rhs = (Wdata_sortable)rhsObj; if (rhs.Sort() == -1) Sort_calc(rhs);
+ return Int_.Compare(lhs.Sort(), rhs.Sort());
+ }
+ private void Sort_calc(Wdata_sortable data_itm) {
+ Wdata_lang_sorter_itm sort_itm = (Wdata_lang_sorter_itm)hash.Fetch(data_itm.Lang());
+ if (sort_itm != null) data_itm.Sort_(sort_itm.Sort());
+ }
+}
+class Wdata_lang_sorter_itm {
+ public Wdata_lang_sorter_itm(int sort, byte[] lang) {this.sort = sort; this.lang = lang;}
+ public int Sort() {return sort;} private final int sort;
+ public byte[] Lang() {return lang;} private final byte[] lang;
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_lbl_list.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_lbl_list.java
new file mode 100644
index 000000000..526c3fe64
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_lbl_list.java
@@ -0,0 +1,64 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
.
+*/
+package gplx.xowa.xtns.wdatas.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.xowa.xtns.wdatas.core.*;
+class Wdata_lbl_list {
+ private HashAdp hash = HashAdp_.new_(); private Int_obj_ref hash_temp_key = Int_obj_ref.neg1_();
+ public Wdata_lbl_list(boolean is_pid) {this.is_pid = is_pid;} private boolean is_pid;
+ public ListAdp Queue() {return queue;} private ListAdp queue = ListAdp_.new_();
+ public byte[] Get_text_or_empty(int id) {
+ Wdata_lbl_itm rv_itm = (Wdata_lbl_itm)hash.Fetch(hash_temp_key.Val_(id));
+ return rv_itm == null ? Bry_.Empty : rv_itm.Text();
+ }
+ public void Queue_if_missing(int id) {
+ boolean has = hash.Has(hash_temp_key.Val_(id));
+ if (!has) {
+ Wdata_lbl_itm itm = new Wdata_lbl_itm(is_pid, id);
+ hash.Add(Int_obj_ref.new_(id), itm);
+ queue.Add(itm);
+ }
+ }
+ public void Resolve(OrderedHash found) {
+ int len = queue.Count();
+ for (int i = 0; i < len; ++i) {
+ Wdata_lbl_itm pending_itm = (Wdata_lbl_itm)queue.FetchAt(i);
+ Wdata_langtext_itm found_itm = (Wdata_langtext_itm)found.Fetch(pending_itm.Ttl());
+ if (found_itm != null)
+ pending_itm.Load_vals(found_itm.Lang(), found_itm.Text());
+ }
+ queue.Clear();
+ }
+}
+class Wdata_lbl_itm {
+ public Wdata_lbl_itm(boolean is_pid, int id) {
+ this.is_pid = is_pid; this.id = id; this.ttl = Make_ttl(is_pid, id);
+ }
+ public boolean Is_pid() {return is_pid;} private final boolean is_pid;
+ public int Id() {return id;} private final int id;
+ public byte[] Ttl() {return ttl;} private final byte[] ttl;
+ public byte[] Lang() {return lang;} private byte[] lang;
+ public byte[] Text() {return text;} private byte[] text;
+ public void Load_vals(byte[] lang, byte[] text) {this.lang = lang; this.text = text;}
+ public static byte[] Make_ttl(boolean is_pid, int id) {
+ return is_pid
+ ? Bry_.Add(Ttl_prefix_pid, Int_.Xto_bry(id))
+ : Bry_.Add(Ttl_prefix_qid, Int_.Xto_bry(id))
+ ;
+ }
+ private static final byte[] Ttl_prefix_pid = Bry_.new_ascii_("Property:P"), Ttl_prefix_qid = Bry_.new_ascii_("Q");
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_lbl_mgr.java b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_lbl_mgr.java
new file mode 100644
index 000000000..e1627c04c
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_lbl_mgr.java
@@ -0,0 +1,46 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
.
+*/
+package gplx.xowa.xtns.wdatas.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.xowa.xtns.wdatas.core.*;
+class Wdata_lbl_mgr {
+ public Wdata_lbl_list Pid_regy() {return pid_regy;} private Wdata_lbl_list pid_regy = new Wdata_lbl_list(Bool_.Y);
+ public Wdata_lbl_list Qid_regy() {return qid_regy;} private Wdata_lbl_list qid_regy = new Wdata_lbl_list(Bool_.N);
+ public void Wkr_(Wdata_lbl_wkr v) {this.wkr = v;} private Wdata_lbl_wkr wkr;
+ public void Gather_labels(Wdata_doc wdoc) {
+ OrderedHash claim_list = wdoc.Claim_list();
+ int len = claim_list.Count();
+ for (int i = 0; i < len; ++i) {
+ Wdata_claim_grp grp = (Wdata_claim_grp)claim_list.FetchAt(i);
+ int grp_len = grp.Len();
+ for (int j = 0; j < grp_len; ++j) {
+ Wdata_claim_itm_base itm = (Wdata_claim_itm_base)grp.Get_at(j);
+ pid_regy.Queue_if_missing(itm.Pid());
+ switch (itm.Val_tid()) {
+ case Wdata_dict_val_tid.Tid_entity:
+ Wdata_claim_itm_entity entity = (Wdata_claim_itm_entity)itm;
+ qid_regy.Queue_if_missing(entity.Entity_id());
+ break;
+ }
+ }
+ }
+ wkr.Resolve(pid_regy, qid_regy);
+ }
+}
+interface Wdata_lbl_wkr {
+ void Resolve(Wdata_lbl_list pid_regy, Wdata_lbl_list qid_regy);
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xob_wdata_db_cmd.java b/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xob_wdata_db_cmd.java
index dc5c2e16d..38fdea05c 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xob_wdata_db_cmd.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/imports/Xob_wdata_db_cmd.java
@@ -178,7 +178,7 @@ class Wdata_description_tbl extends Wdata_tbl_base {
);
}
@Override public Db_idx_itm[] Idx_ary() {return new Db_idx_itm[] {Db_idx_itm.sql_("CREATE INDEX IF NOT EXISTS wdata_description__main ON wdata_description (page_id, lang_key);")};}
- @Override public void Exec_insert_by_wdoc(byte[] lang_key, Wdata_wiki_mgr wdata_mgr, int page_id, Wdata_doc wdoc) {Exec_insert_kvs(this.Insert_stmt(), page_id, wdoc.Description_list());}
+ @Override public void Exec_insert_by_wdoc(byte[] lang_key, Wdata_wiki_mgr wdata_mgr, int page_id, Wdata_doc wdoc) {Exec_insert_kvs(this.Insert_stmt(), page_id, wdoc.Descr_list());}
@Override public String[] Fld_ary() {return new String[] {Fld_page_id, Fld_lang_key, Fld_val};}
private static final String Fld_page_id = "page_id", Fld_lang_key = "lang_key", Fld_val = "val";
}
@@ -196,7 +196,7 @@ class Wdata_link_tbl extends Wdata_tbl_base {
@Override public Db_idx_itm[] Idx_ary() {return new Db_idx_itm[] {Db_idx_itm.sql_("CREATE INDEX IF NOT EXISTS wdata_link__main ON wdata_link (page_id, wiki_key);")};}
@Override public String[] Fld_ary() {return new String[] {Fld_page_id, Fld_wiki_key, Fld_val};}
@Override public void Exec_insert_by_wdoc(byte[] lang_key, Wdata_wiki_mgr wdata_mgr, int page_id, Wdata_doc wdoc) {
- OrderedHash hash = wdoc.Sitelink_list();
+ OrderedHash hash = wdoc.Slink_list();
int len = hash.Count();
Db_stmt insert_stmt = this.Insert_stmt();
for (int i = 0; i < len; i++) {
@@ -251,11 +251,11 @@ class Wdata_claim_tbl extends Wdata_tbl_base {
int list_len = list.Count();
for (int i = 0; i < list_len; i++) {
Wdata_claim_grp claim_grp = (Wdata_claim_grp)list.FetchAt(i);
- int itms_len = claim_grp.Itms_len();
+ int itms_len = claim_grp.Len();
int entity_id = -1;
byte[] claim_val = Bry_.Empty;
for (int j = 0; j < itms_len; j++) {
- Wdata_claim_itm_core claim = claim_grp.Itms_get_at(j);
+ Wdata_claim_itm_core claim = claim_grp.Get_at(j);
byte val_tid = claim.Val_tid();
switch (val_tid) {
case Wdata_dict_val_tid.Tid_string:
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_claims_parser_v2.java b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_claims_parser_v2.java
new file mode 100644
index 000000000..5e4b629fa
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_claims_parser_v2.java
@@ -0,0 +1,243 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
.
+*/
+package gplx.xowa.xtns.wdatas.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.json.*; import gplx.xowa.xtns.wdatas.core.*;
+class Wdata_claims_parser_v2 {
+ public void Make_claim_itms(byte[] qid, ListAdp claim_itms_list, byte[] src, Json_itm_kv claim_grp) {
+ Json_itm_ary claim_itms_ary = Json_itm_ary.cast_(claim_grp.Val());
+ int claim_itms_len = claim_itms_ary.Subs_len();
+ int pid = Parse_pid(claim_grp.Key().Data_bry());
+ for (int i = 0; i < claim_itms_len; ++i) {
+ Json_itm_nde claim_itm_nde = Json_itm_nde.cast_(claim_itms_ary.Subs_get_at(i));
+ Wdata_claim_itm_base itm = Parse_claim_itm(qid, claim_itm_nde, pid);
+ if (itm != null) // HACK: itm can be null if value is "somevalue"; DATE:2014-09-20
+ claim_itms_list.Add(itm);
+ }
+ }
+ private Wdata_claim_itm_core Parse_claim_itm(byte[] qid, Json_itm_nde nde, int pid) {
+ int len = nde.Subs_len();
+ Hash_adp_bry dict = Wdata_dict_claim.Dict;
+ byte rank_tid = Wdata_dict_rank.Tid_unknown;
+ Wdata_claim_itm_core claim_itm = null; Wdata_claim_grp_list qualifiers = null; int[] qualifiers_order = null; Wdata_references_grp[] snaks_grp = null;
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
+ switch (tid) {
+ case Wdata_dict_claim.Tid_mainsnak: claim_itm = Parse_mainsnak(qid, Json_itm_nde.cast_(sub.Val()), pid); break;
+ case Wdata_dict_claim.Tid_rank: rank_tid = Wdata_dict_rank.Xto_tid(sub.Val().Data_bry()); break;
+ case Wdata_dict_claim.Tid_references: snaks_grp = Parse_references(qid, Json_itm_ary.cast_(sub.Val())); break;
+ case Wdata_dict_claim.Tid_qualifiers: qualifiers = Parse_qualifiers(qid, Json_itm_nde.cast_(sub.Val())); break;
+ case Wdata_dict_claim.Tid_qualifiers_order: qualifiers_order = Parse_pid_order(Json_itm_ary.cast_(sub.Val())); break;
+ case Wdata_dict_claim.Tid_type: break; // ignore: "statement"
+ case Wdata_dict_claim.Tid_id: break; // ignore: "Q2$F909BD1C-D34D-423F-9ED2-3493663321AF"
+ }
+ }
+ if (claim_itm != null) {
+ claim_itm.Rank_tid_(rank_tid);
+ if (qualifiers != null) claim_itm.Qualifiers_(qualifiers);
+ if (qualifiers_order != null) claim_itm.Qualifiers_order_(qualifiers_order);
+ if (snaks_grp != null) claim_itm.References_(snaks_grp);
+ }
+ return claim_itm;
+ }
+ public Wdata_references_grp[] Parse_references(byte[] qid, Json_itm_ary owner) {
+ int len = owner.Subs_len();
+ Wdata_references_grp[] rv = new Wdata_references_grp[len];
+ for (int i = 0; i < len; ++i) {
+ Json_itm_nde grp_nde = Json_itm_nde.cast_(owner.Subs_get_at(i));
+ rv[i] = Parse_references_grp(qid, grp_nde);
+ }
+ return rv;
+ }
+ private Wdata_references_grp Parse_references_grp(byte[] qid, Json_itm_nde owner) {
+ int len = owner.Subs_len();
+ Hash_adp_bry dict = Wdata_dict_reference.Dict;
+ Wdata_claim_grp_list snaks = null; int[] snaks_order = null;
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv sub = Json_itm_kv.cast_(owner.Subs_get_at(i));
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
+ switch (tid) {
+ case Wdata_dict_reference.Tid_hash: break; // ignore: "b923b0d68beb300866b87ead39f61e63ec30d8af"
+ case Wdata_dict_reference.Tid_snaks: snaks = Parse_qualifiers(qid, Json_itm_nde.cast_(sub.Val())); break;
+ case Wdata_dict_reference.Tid_snaks_order: snaks_order = Parse_pid_order(Json_itm_ary.cast_(sub.Val())); break;
+ }
+ }
+ return new Wdata_references_grp(snaks, snaks_order);
+ }
+ public Wdata_claim_grp_list Parse_qualifiers(byte[] qid, Json_itm_nde qualifiers_nde) {
+ Wdata_claim_grp_list rv = new Wdata_claim_grp_list();
+ int len = qualifiers_nde.Subs_len();
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv qualifier_kv = Json_itm_kv.cast_(qualifiers_nde.Subs_get_at(i));
+ int pid = Parse_pid(qualifier_kv.Key().Data_bry());
+ Wdata_claim_grp claims_grp = Parse_props_grp(qid, pid, Json_itm_ary.cast_(qualifier_kv.Val()));
+ rv.Add(claims_grp);
+ }
+ return rv;
+ }
+ public int[] Parse_pid_order(Json_itm_ary ary) {
+ int len = ary.Subs_len();
+ int[] rv = new int[len];
+ for (int i = 0; i < len; ++i) {
+ Json_itm pid_itm = ary.Subs_get_at(i);
+ rv[i] = Parse_pid(pid_itm.Data_bry());
+ }
+ return rv;
+ }
+ private Wdata_claim_grp Parse_props_grp(byte[] qid, int pid, Json_itm_ary props_ary) {
+ ListAdp list = ListAdp_.new_();
+ int len = props_ary.Subs_len();
+ for (int i = 0; i < len; ++i) {
+ Json_itm_nde qualifier_nde = Json_itm_nde.cast_(props_ary.Subs_get_at(i));
+ Wdata_claim_itm_core qualifier_itm = Parse_mainsnak(qid, qualifier_nde, pid);
+ list.Add(qualifier_itm);
+ }
+ return new Wdata_claim_grp(Int_obj_ref.new_(pid), (Wdata_claim_itm_core[])list.XtoAryAndClear(Wdata_claim_itm_core.class));
+ }
+ public Wdata_claim_itm_core Parse_mainsnak(byte[] qid, Json_itm_nde nde, int pid) {
+ int len = nde.Subs_len();
+ Hash_adp_bry dict = Wdata_dict_mainsnak.Dict;
+ byte snak_tid = Byte_.MaxValue_127;
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
+ switch (tid) {
+ case Wdata_dict_mainsnak.Tid_snaktype: snak_tid = Wdata_dict_snak_tid.Xto_tid(sub.Val().Data_bry()); break;
+ case Wdata_dict_mainsnak.Tid_datavalue: return Parse_datavalue(qid, pid, snak_tid, Json_itm_nde.cast_(sub.Val()));
+ case Wdata_dict_mainsnak.Tid_property: break; // ignore: pid already available above
+ case Wdata_dict_mainsnak.Tid_hash: break; // ignore: "84487fc3f93b4f74ab1cc5a47d78f596f0b49390"
+ }
+ }
+ return new Wdata_claim_itm_system(pid, Wdata_dict_val_tid.Tid_unknown, snak_tid); // NOTE: mainsnak can be null, especially for qualifiers; PAGE:Q2!P576; DATE:2014-09-20
+ }
+ public Wdata_claim_itm_core Parse_datavalue(byte[] qid, int pid, byte snak_tid, Json_itm_nde nde) {
+ int len = nde.Subs_len();
+ Hash_adp_bry dict = Wdata_dict_datavalue.Dict;
+ Json_itm value_itm = null; byte value_tid = Wdata_dict_val_tid.Tid_unknown;
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
+ switch (tid) {
+ case Wdata_dict_datavalue.Tid_type: value_tid = Wdata_dict_val_tid.Xto_tid(sub.Val().Data_bry()); break;
+ case Wdata_dict_datavalue.Tid_value: value_itm = sub.Val(); break;
+ case Wdata_dict_datavalue.Tid_error: break; // ignore: "Can only construct GlobeCoordinateValue with a String globe parameter"
+ }
+ }
+ switch (value_tid) {
+ case Wdata_dict_val_tid.Tid_string: return new Wdata_claim_itm_str(pid, snak_tid, value_itm.Data_bry());
+ case Wdata_dict_val_tid.Tid_entity: return Parse_datavalue_entity (qid, pid, snak_tid, Json_itm_nde.cast_(value_itm));
+ case Wdata_dict_val_tid.Tid_time: return Parse_datavalue_time (qid, pid, snak_tid, Json_itm_nde.cast_(value_itm));
+ case Wdata_dict_val_tid.Tid_quantity: return Parse_datavalue_quantity (qid, pid, snak_tid, Json_itm_nde.cast_(value_itm));
+ case Wdata_dict_val_tid.Tid_globecoordinate: return Parse_datavalue_globecoordinate (qid, pid, snak_tid, Json_itm_nde.cast_(value_itm));
+ case Wdata_dict_val_tid.Tid_monolingualtext: return Parse_datavalue_monolingualtext (qid, pid, snak_tid, Json_itm_nde.cast_(value_itm));
+ }
+ throw Err_.new_("unknown val_tid; val_tid={0}", value_tid);
+ }
+ private Wdata_claim_itm_entity Parse_datavalue_entity(byte[] qid, int pid, byte snak_tid, Json_itm_nde nde) {
+ Hash_adp_bry dict = Wdata_dict_value_entity.Dict;
+ int len = nde.Subs_len();
+ byte[] entity_id_bry = null;
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
+ switch (tid) {
+ case Wdata_dict_value_entity.Tid_entity_type: break; // ignore: "item"
+ case Wdata_dict_value_entity.Tid_numeric_id: entity_id_bry = sub.Val().Data_bry(); break;
+ }
+ }
+ if (entity_id_bry == null) throw Err_.new_("pid is invalid entity; pid={0}", pid);
+ return new Wdata_claim_itm_entity(pid, snak_tid, entity_id_bry);
+ }
+ private Wdata_claim_itm_monolingualtext Parse_datavalue_monolingualtext(byte[] qid, int pid, byte snak_tid, Json_itm_nde nde) {
+ Hash_adp_bry dict = Wdata_dict_value_monolingualtext.Dict;
+ int len = nde.Subs_len();
+ byte[] lang = null, text = null;
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
+ byte[] sub_val_bry = sub.Val().Data_bry();
+ switch (tid) {
+ case Wdata_dict_value_monolingualtext.Tid_text: text = sub_val_bry; break;
+ case Wdata_dict_value_monolingualtext.Tid_language: lang = sub_val_bry; break;
+ }
+ }
+ if (lang == null || text == null) throw Err_.new_("pid is invalid monolingualtext; pid={0}", pid);
+ return new Wdata_claim_itm_monolingualtext(pid, snak_tid, lang, text);
+ }
+ private Wdata_claim_itm_globecoordinate Parse_datavalue_globecoordinate(byte[] qid, int pid, byte snak_tid, Json_itm_nde nde) {
+ Hash_adp_bry dict = Wdata_dict_value_globecoordinate.Dict;
+ int len = nde.Subs_len();
+ byte[] lat = null, lng = null, alt = null, prc = null, glb = null;
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
+ byte[] sub_val_bry = sub.Val().Data_bry();
+ switch (tid) {
+ case Wdata_dict_value_globecoordinate.Tid_latitude: lat = sub_val_bry; break;
+ case Wdata_dict_value_globecoordinate.Tid_longitude: lng = sub_val_bry; break;
+ case Wdata_dict_value_globecoordinate.Tid_altitude: alt = sub_val_bry; break;
+ case Wdata_dict_value_globecoordinate.Tid_precision: prc = sub_val_bry; break;
+ case Wdata_dict_value_globecoordinate.Tid_globe: glb = sub_val_bry; break;
+ }
+ }
+ if (lat == null || lng == null) throw Err_.new_("pid is invalid globecoordinate; pid={0}", pid);
+ return new Wdata_claim_itm_globecoordinate(pid, snak_tid, lat, lng, alt, prc, glb);
+ }
+ private Wdata_claim_itm_quantity Parse_datavalue_quantity(byte[] qid, int pid, byte snak_tid, Json_itm_nde nde) {
+ Hash_adp_bry dict = Wdata_dict_value_quantity.Dict;
+ int len = nde.Subs_len();
+ byte[] amount = null, unit = null, ubound = null, lbound = null;
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
+ byte[] sub_val_bry = sub.Val().Data_bry();
+ switch (tid) {
+ case Wdata_dict_value_quantity.Tid_amount: amount = sub_val_bry; break;
+ case Wdata_dict_value_quantity.Tid_unit: unit = sub_val_bry; break;
+ case Wdata_dict_value_quantity.Tid_upperbound: ubound = sub_val_bry; break;
+ case Wdata_dict_value_quantity.Tid_lowerbound: lbound = sub_val_bry; break;
+ }
+ }
+ if (amount == null) throw Err_.new_("pid is invalid quantity; pid={0}", pid);
+ return new Wdata_claim_itm_quantity(pid, snak_tid, amount, unit, ubound, lbound);
+ }
+ private Wdata_claim_itm_time Parse_datavalue_time(byte[] qid, int pid, byte snak_tid, Json_itm_nde nde) {
+ Hash_adp_bry dict = Wdata_dict_value_time.Dict;
+ int len = nde.Subs_len();
+ byte[] time = null, timezone = null, before = null, after = null, precision = null, calendarmodel = null;
+ for (int i = 0; i < len; ++i) {
+ Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
+ byte[] sub_val_bry = sub.Val().Data_bry();
+ switch (tid) {
+ case Wdata_dict_value_time.Tid_time: time = sub_val_bry; break;
+ case Wdata_dict_value_time.Tid_timezone: timezone = sub_val_bry; break;
+ case Wdata_dict_value_time.Tid_before: before = sub_val_bry; break;
+ case Wdata_dict_value_time.Tid_after: after = sub_val_bry; break;
+ case Wdata_dict_value_time.Tid_precision: precision = sub_val_bry; break;
+ case Wdata_dict_value_time.Tid_calendarmodel: calendarmodel = sub_val_bry; break;
+ }
+ }
+ if (time == null) throw Err_.new_("pid is invalid time; pid={0}", pid);
+ return new Wdata_claim_itm_time(pid, snak_tid, time, timezone, before, after, precision, calendarmodel);
+ }
+ private static int Parse_pid(byte[] pid_bry) {
+ int rv = Bry_.Xto_int_or(pid_bry, 1, pid_bry.length, -1); if (rv == -1) throw Err_.new_("invalid pid; pid={0}", String_.new_utf8_(pid_bry));
+ return rv;
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser.java b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser.java
index bb6dfebbf..1bb2bff05 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser.java
@@ -22,6 +22,9 @@ public interface Wdata_doc_parser {
OrderedHash Parse_sitelinks(byte[] qid, Json_doc doc);
OrderedHash Parse_langvals(byte[] qid, Json_doc doc, boolean label_or_description);
OrderedHash Parse_aliases(byte[] qid, Json_doc doc);
- OrderedHash Parse_claims(Json_doc doc);
- Wdata_claim_itm_base Parse_claims_data(int pid, byte snak_tid, Json_itm_nde nde);
+ OrderedHash Parse_claims(byte[] qid, Json_doc doc);
+ Wdata_claim_itm_base Parse_claims_data(byte[] qid, int pid, byte snak_tid, Json_itm_nde nde);
+ Wdata_claim_grp_list Parse_qualifiers(byte[] qid, Json_itm_nde nde);
+ int[] Parse_pid_order(byte[] qid, Json_itm_ary ary);
+ Wdata_references_grp[] Parse_references(byte[] qid, Json_itm_ary owner);
}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_fxt_base.java b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_fxt_base.java
new file mode 100644
index 000000000..8fb1717f6
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_fxt_base.java
@@ -0,0 +1,98 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
.
+*/
+package gplx.xowa.xtns.wdatas.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.json.*; import gplx.xowa.xtns.wdatas.core.*;
+abstract class Wdata_doc_parser_fxt_base {
+ protected Wdata_doc_parser parser;
+ public void Init() {
+ if (parser == null) parser = Make_parser();
+ }
+ public abstract Wdata_doc_parser Make_parser();
+ public Wdata_sitelink_itm Make_sitelink(String site, String name, String... badges) {return new Wdata_sitelink_itm(Bry_.new_utf8_(site), Bry_.new_utf8_(name), Bry_.Ary(badges));}
+ public Wdata_langtext_itm Make_langval(String lang, String text) {return new Wdata_langtext_itm(Bry_.new_utf8_(lang), Bry_.new_utf8_(text));}
+ public Wdata_alias_itm Make_alias(String lang, String... vals) {return new Wdata_alias_itm(Bry_.new_utf8_(lang), Bry_.Ary(vals));}
+ public Wdata_claim_itm_core Make_claim_str(int pid, String val) {return new Wdata_claim_itm_str(pid, Wdata_dict_snak_tid.Tid_value, Bry_.new_utf8_(val));}
+ public Wdata_claim_itm_core Make_claim_entity(int pid, int entityId) {return new Wdata_claim_itm_entity(pid, Wdata_dict_snak_tid.Tid_value, Int_.Xto_bry(entityId));}
+ public Wdata_claim_itm_core Make_claim_monolingualtext(int pid, String lang, String text) {return new Wdata_claim_itm_monolingualtext(pid, Wdata_dict_snak_tid.Tid_value, Bry_.new_utf8_(lang), Bry_.new_utf8_(text));}
+ public Wdata_claim_itm_core Make_claim_globecoordinate(int pid, String lat, String lng, String prc) {return new Wdata_claim_itm_globecoordinate(pid, Wdata_dict_snak_tid.Tid_value, Bry_.new_utf8_(lat), Bry_.new_utf8_(lng), Bry_.new_ascii_("null"), Bry_.new_utf8_(prc), Bry_.new_ascii_("http://www.wikidata.org/entity/Q2"));}
+ public Wdata_claim_itm_core Make_claim_quantity(int pid, int val, int unit, int ubound, int lbound) {return new Wdata_claim_itm_quantity(pid, Wdata_dict_snak_tid.Tid_value, Bry_.new_utf8_(Int_.Xto_str(val)), Bry_.new_utf8_(Int_.Xto_str(unit)), Bry_.new_utf8_(Int_.Xto_str(ubound)), Bry_.new_utf8_(Int_.Xto_str(lbound)));}
+ public Wdata_claim_itm_core Make_claim_time(int pid, String val) {return new Wdata_claim_itm_time(pid, Wdata_dict_snak_tid.Tid_value, Wdata_dict_value_time.Xto_time(val), Wdata_dict_value_time.Val_timezone_bry, Wdata_dict_value_time.Val_before_bry, Wdata_dict_value_time.Val_after_bry, Wdata_dict_value_time.Val_precision_bry, Wdata_dict_value_time.Val_calendarmodel_bry);}
+ public Wdata_claim_itm_core Make_claim_novalue(int pid) {return new Wdata_claim_itm_system(pid, Wdata_dict_val_tid.Tid_unknown, Wdata_dict_snak_tid.Tid_novalue);}
+ public void Test_entity(String raw, String expd) {Tfds.Eq(expd, String_.new_utf8_(parser.Parse_qid(Json_doc.new_apos_(raw))));}
+ public void Test_sitelinks(String raw, Wdata_sitelink_itm... expd) {
+ OrderedHash actl_hash = parser.Parse_sitelinks(Q1_bry, Json_doc.new_apos_(raw));
+ Tfds.Eq_ary_str((Wdata_sitelink_itm[])actl_hash.XtoAry(Wdata_sitelink_itm.class), expd);
+ }
+ public void Test_labels(String raw, Wdata_langtext_itm... expd) {Test_langvals(raw, Bool_.Y, expd);}
+ public void Test_descriptions(String raw, Wdata_langtext_itm... expd) {Test_langvals(raw, Bool_.N, expd);}
+ private void Test_langvals(String raw, boolean labels_or_descriptions, Wdata_langtext_itm... expd) {
+ OrderedHash actl_hash = parser.Parse_langvals(Q1_bry, Json_doc.new_apos_(raw), labels_or_descriptions);
+ Tfds.Eq_ary_str((Wdata_langtext_itm[])actl_hash.XtoAry(Wdata_langtext_itm.class), expd);
+ }
+ public void Test_aliases(String raw, Wdata_alias_itm... expd) {
+ OrderedHash actl_hash = parser.Parse_aliases(Q1_bry, Json_doc.new_apos_(raw));
+ Tfds.Eq_ary_str((Wdata_alias_itm[])actl_hash.XtoAry(Wdata_alias_itm.class), expd);
+ }
+ public void Test_claims(String raw, Wdata_claim_itm_core... expd) {
+ OrderedHash actl_hash = parser.Parse_claims(Q1_bry, Json_doc.new_apos_(raw));
+ ListAdp actl_list = Wdata_claim_grp.Xto_list(actl_hash);
+ Tfds.Eq_ary_str((Wdata_claim_itm_core[])actl_list.XtoAry(Wdata_claim_itm_core.class), expd);
+ }
+ public void Test_claims_data(String raw, Wdata_claim_itm_core expd) {
+ Json_doc jdoc = Json_doc.new_apos_(raw);
+ Wdata_claim_itm_base actl = parser.Parse_claims_data(Q1_bry, 1, Wdata_dict_snak_tid.Tid_value, jdoc.Root());
+ Tfds.Eq(expd.toString(), actl.toString());
+ }
+ public void Test_qualifiers(String raw, Wdata_claim_itm_base... expd_itms) {
+ Json_doc jdoc = Json_doc.new_apos_(raw);
+ Json_itm_nde qualifiers_nde = Json_itm_nde.cast_(Json_itm_kv.cast_(jdoc.Root().Subs_get_at(0)).Val());
+ Wdata_claim_grp_list actl = parser.Parse_qualifiers(Q1_bry, qualifiers_nde);
+ Tfds.Eq_ary_str(expd_itms, Xto_ary(actl));
+ }
+ public void Test_references(String raw, int[] expd_order, Wdata_claim_itm_base... expd_itms) {
+ Json_doc jdoc = Json_doc.new_apos_(raw);
+ Json_itm_ary owner = Json_itm_ary.cast_(Json_itm_kv.cast_(jdoc.Root().Subs_get_at(0)).Val());
+ Wdata_references_grp[] actl = parser.Parse_references(Q1_bry, owner);
+ Wdata_references_grp actl_grp = actl[0];
+ Tfds.Eq_ary(expd_order, actl_grp.References_order());
+ Tfds.Eq_ary_str(expd_itms, Xto_ary(actl_grp.References()));
+ }
+ public void Test_pid_order(String raw, int... expd) {
+ Json_doc jdoc = Json_doc.new_apos_(raw);
+ Json_itm_ary nde = Json_itm_ary.cast_(Json_itm_kv.cast_(jdoc.Root().Subs_get_at(0)).Val());
+ int[] actl = parser.Parse_pid_order(Q1_bry, nde);
+ Tfds.Eq_ary(expd, actl);
+ }
+ Wdata_claim_itm_base[] Xto_ary(Wdata_claim_grp_list list) {
+ ListAdp rv = ListAdp_.new_();
+ int list_len = list.Len();
+ for (int i = 0; i < list_len; ++i) {
+ Wdata_claim_grp grp = list.Get_at(i);
+ int grp_len = grp.Len();
+ for (int j = 0; j < grp_len; ++j) {
+ Wdata_claim_itm_core itm = grp.Get_at(j);
+ rv.Add(itm);
+ }
+ }
+ return (Wdata_claim_itm_base[])rv.XtoAryAndClear(Wdata_claim_itm_base.class);
+ }
+ private static final byte[] Q1_bry = Bry_.new_ascii_("Q1");
+}
+class Wdata_doc_parser_v2_fxt extends Wdata_doc_parser_fxt_base {
+ @Override public Wdata_doc_parser Make_parser() {return new Wdata_doc_parser_v2();}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v1.java b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v1.java
index 473bbe22c..5e0b158a8 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v1.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v1.java
@@ -110,7 +110,7 @@ public class Wdata_doc_parser_v1 implements Wdata_doc_parser {
return rv;
} catch (Exception e) {throw Err_.err_(e, "failed to parse aliases; qid={0}", String_.new_utf8_(qid));}
}
- public OrderedHash Parse_claims(Json_doc doc) {
+ public OrderedHash Parse_claims(byte[] qid, Json_doc doc) {
try {
Json_itm_ary list_nde = Json_itm_ary.cast_(doc.Get_grp(Bry_claims)); if (list_nde == null) return Empty_ordered_hash_generic;
ListAdp temp_list = ListAdp_.new_();
@@ -124,7 +124,7 @@ public class Wdata_doc_parser_v1 implements Wdata_doc_parser {
return Claims_list_to_hash(temp_list);
} catch (Exception e) {throw Err_.err_(e, "failed to parse claims; qid={0}", String_.new_utf8_(doc.Src()));}
}
- public Wdata_claim_itm_base Parse_claims_data(int pid, byte snak_tid, Json_itm_nde nde) {throw Err_.not_implemented_();}
+ public Wdata_claim_itm_base Parse_claims_data(byte[] qid, int pid, byte snak_tid, Json_itm_nde nde) {throw Err_.not_implemented_();}
public static OrderedHash Claims_list_to_hash(ListAdp full_list) {
full_list.Sort();
OrderedHash rv = OrderedHash_.new_(); ListAdp temp_itms = ListAdp_.new_();
@@ -238,6 +238,9 @@ public class Wdata_doc_parser_v1 implements Wdata_doc_parser {
}
return rv;
}
+ public Wdata_claim_grp_list Parse_qualifiers(byte[] qid, Json_itm_nde nde) {throw Err_.not_implemented_();}
+ public Wdata_references_grp[] Parse_references(byte[] qid, Json_itm_ary owner) {throw Err_.not_implemented_();}
+ public int[] Parse_pid_order(byte[] qid, Json_itm_ary ary) {throw Err_.not_implemented_();}
public static final String
Str_entity = "entity"
, Str_id = "id"
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v1_tst.java b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v1_tst.java
index 97b474855..e91af34f8 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v1_tst.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v1_tst.java
@@ -182,48 +182,6 @@ public class Wdata_doc_parser_v1_tst {
);
}
}
-abstract class Wdata_doc_parser_fxt_base {
- protected Wdata_doc_parser parser;
- public void Init() {
- if (parser == null) parser = Make_parser();
- }
- public abstract Wdata_doc_parser Make_parser();
- public Wdata_sitelink_itm Make_sitelink(String site, String name, String... badges) {return new Wdata_sitelink_itm(Bry_.new_utf8_(site), Bry_.new_utf8_(name), Bry_.Ary(badges));}
- public Wdata_langtext_itm Make_langval(String lang, String text) {return new Wdata_langtext_itm(Bry_.new_utf8_(lang), Bry_.new_utf8_(text));}
- public Wdata_alias_itm Make_alias(String lang, String... vals) {return new Wdata_alias_itm(Bry_.new_utf8_(lang), Bry_.Ary(vals));}
- public Wdata_claim_itm_core Make_claim_str(int pid, String val) {return new Wdata_claim_itm_str(pid, Wdata_dict_snak_tid.Tid_value, Bry_.new_utf8_(val));}
- public Wdata_claim_itm_core Make_claim_entity(int pid, int entityId) {return new Wdata_claim_itm_entity(pid, Wdata_dict_snak_tid.Tid_value, Int_.Xto_bry(entityId));}
- public Wdata_claim_itm_core Make_claim_monolingualtext(int pid, String lang, String text) {return new Wdata_claim_itm_monolingualtext(pid, Wdata_dict_snak_tid.Tid_value, Bry_.new_utf8_(lang), Bry_.new_utf8_(text));}
- public Wdata_claim_itm_core Make_claim_globecoordinate(int pid, String lat, String lng, String prc) {return new Wdata_claim_itm_globecoordinate(pid, Wdata_dict_snak_tid.Tid_value, Bry_.new_utf8_(lat), Bry_.new_utf8_(lng), Bry_.new_ascii_("null"), Bry_.new_utf8_(prc), Bry_.new_ascii_("http://www.wikidata.org/entity/Q2"));}
- public Wdata_claim_itm_core Make_claim_quantity(int pid, int val, int unit, int ubound, int lbound) {return new Wdata_claim_itm_quantity(pid, Wdata_dict_snak_tid.Tid_value, Bry_.new_utf8_(Int_.Xto_str(val)), Bry_.new_utf8_(Int_.Xto_str(unit)), Bry_.new_utf8_(Int_.Xto_str(ubound)), Bry_.new_utf8_(Int_.Xto_str(lbound)));}
- public Wdata_claim_itm_core Make_claim_time(int pid, String val) {return new Wdata_claim_itm_time(pid, Wdata_dict_snak_tid.Tid_value, Wdata_doc_bldr.Xto_time(val), Wdata_dict_value_time.Val_timezone_bry, Wdata_dict_value_time.Val_before_bry, Wdata_dict_value_time.Val_after_bry, Wdata_dict_value_time.Val_precision_bry, Wdata_dict_value_time.Val_calendarmodel_bry);}
- public void Test_entity(String raw, String expd) {Tfds.Eq(expd, String_.new_utf8_(parser.Parse_qid(Json_doc.new_apos_(raw))));}
- public void Test_sitelinks(String raw, Wdata_sitelink_itm... expd) {
- OrderedHash actl_hash = parser.Parse_sitelinks(Q1_bry, Json_doc.new_apos_(raw));
- Tfds.Eq_ary_str((Wdata_sitelink_itm[])actl_hash.XtoAry(Wdata_sitelink_itm.class), expd);
- }
- public void Test_labels(String raw, Wdata_langtext_itm... expd) {Test_langvals(raw, Bool_.Y, expd);}
- public void Test_descriptions(String raw, Wdata_langtext_itm... expd) {Test_langvals(raw, Bool_.N, expd);}
- private void Test_langvals(String raw, boolean labels_or_descriptions, Wdata_langtext_itm... expd) {
- OrderedHash actl_hash = parser.Parse_langvals(Q1_bry, Json_doc.new_apos_(raw), labels_or_descriptions);
- Tfds.Eq_ary_str((Wdata_langtext_itm[])actl_hash.XtoAry(Wdata_langtext_itm.class), expd);
- }
- public void Test_aliases(String raw, Wdata_alias_itm... expd) {
- OrderedHash actl_hash = parser.Parse_aliases(Q1_bry, Json_doc.new_apos_(raw));
- Tfds.Eq_ary_str((Wdata_alias_itm[])actl_hash.XtoAry(Wdata_alias_itm.class), expd);
- }
- public void Test_claims(String raw, Wdata_claim_itm_core... expd) {
- OrderedHash actl_hash = parser.Parse_claims(Json_doc.new_apos_(raw));
- ListAdp actl_list = Wdata_claim_grp.Xto_list(actl_hash);
- Tfds.Eq_ary_str((Wdata_claim_itm_core[])actl_list.XtoAry(Wdata_claim_itm_core.class), expd);
- }
- public void Test_claims_data(String raw, Wdata_claim_itm_core expd) {
- Json_doc jdoc = Json_doc.new_apos_(raw);
- Wdata_claim_itm_base actl = parser.Parse_claims_data(1, Wdata_dict_snak_tid.Tid_value, jdoc.Root());
- Tfds.Eq(expd.toString(), actl.toString());
- }
- private static final byte[] Q1_bry = Bry_.new_ascii_("Q1");
-}
class Wdata_doc_parser_v1_fxt extends Wdata_doc_parser_fxt_base {
@Override public Wdata_doc_parser Make_parser() {return new Wdata_doc_parser_v1();}
}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v2.java b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v2.java
index d4b002a90..41fb369ac 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v2.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v2.java
@@ -18,7 +18,7 @@ along with this program. If not, see
.
package gplx.xowa.xtns.wdatas.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wdatas.*;
import gplx.json.*; import gplx.xowa.xtns.wdatas.core.*; import gplx.core.btries.*;
public class Wdata_doc_parser_v2 implements Wdata_doc_parser {
- private Wdata_claims_parser__v2 claims_parser = new Wdata_claims_parser__v2();
+ private Wdata_claims_parser_v2 claims_parser = new Wdata_claims_parser_v2();
public byte[] Parse_qid(Json_doc doc) {
try {
Json_itm itm = doc.Find_nde(Bry_id);
@@ -38,7 +38,7 @@ public class Wdata_doc_parser_v2 implements Wdata_doc_parser {
Json_itm_kv site_kv = null, name_kv = null; Json_itm_ary badges_ary = null;
for (int j = 0; j < data_nde_len; ++j) {
Json_itm_kv sub = Json_itm_kv.cast_(data_nde.Subs_get_at(j));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
switch (tid) {
case Wdata_dict_sitelink.Tid_site: site_kv = Json_itm_kv.cast_(sub); break;
case Wdata_dict_sitelink.Tid_title: name_kv = Json_itm_kv.cast_(sub); break;
@@ -66,7 +66,7 @@ public class Wdata_doc_parser_v2 implements Wdata_doc_parser {
int data_nde_len = data_nde.Subs_len();
for (int j = 0; j < data_nde_len; ++j) {
Json_itm_kv sub = Json_itm_kv.cast_(data_nde.Subs_get_at(j));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
switch (tid) {
case Wdata_dict_langtext.Tid_language: break;
case Wdata_dict_langtext.Tid_value: text_kv = Json_itm_kv.cast_(sub); break;
@@ -95,7 +95,7 @@ public class Wdata_doc_parser_v2 implements Wdata_doc_parser {
int k_len = lang_nde.Subs_len();
for (int k = 0; k < k_len; ++k) {
Json_itm_kv sub = Json_itm_kv.cast_(lang_nde.Subs_get_at(k));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
+ byte tid = Wdata_dict_utl.Get_tid_or_invalid(qid, dict, sub.Key().Data_bry()); if (tid == Wdata_dict_utl.Tid_invalid) continue;
switch (tid) {
case Wdata_dict_langtext.Tid_language: break;
case Wdata_dict_langtext.Tid_value: vals[j] = sub.Val().Data_bry(); break;
@@ -109,7 +109,7 @@ public class Wdata_doc_parser_v2 implements Wdata_doc_parser {
return rv;
} catch (Exception e) {throw Err_.err_(e, "failed to parse sitelinks; qid={0}", String_.new_utf8_(qid));}
}
- public OrderedHash Parse_claims(Json_doc doc) {
+ public OrderedHash Parse_claims(byte[] qid, Json_doc doc) {
try {
Json_itm_nde list_nde = Json_itm_nde.cast_(doc.Get_grp(Bry_claims)); if (list_nde == null) return Wdata_doc_parser_v1.Empty_ordered_hash_generic;
ListAdp temp_list = ListAdp_.new_();
@@ -117,12 +117,15 @@ public class Wdata_doc_parser_v2 implements Wdata_doc_parser {
int len = list_nde.Subs_len();
for (int i = 0; i < len; i++) {
Json_itm_kv claim_nde = Json_itm_kv.cast_(list_nde.Subs_get_at(i));
- claims_parser.Make_claim_itms(temp_list, src, claim_nde);
+ claims_parser.Make_claim_itms(qid, temp_list, src, claim_nde);
}
return Wdata_doc_parser_v1.Claims_list_to_hash(temp_list);
} catch (Exception e) {throw Err_.err_(e, "failed to parse claims; qid={0}", String_.new_utf8_(doc.Src()));}
}
- public Wdata_claim_itm_base Parse_claims_data(int pid, byte snak_tid, Json_itm_nde nde) {return claims_parser.Parse_datavalue(pid, snak_tid, nde);}
+ public Wdata_claim_itm_base Parse_claims_data(byte[] qid, int pid, byte snak_tid, Json_itm_nde nde) {return claims_parser.Parse_datavalue(qid, pid, snak_tid, nde);}
+ public Wdata_claim_grp_list Parse_qualifiers(byte[] qid, Json_itm_nde nde) {return claims_parser.Parse_qualifiers(qid, nde);}
+ public Wdata_references_grp[] Parse_references(byte[] qid, Json_itm_ary owner) {return claims_parser.Parse_references(qid, owner);}
+ public int[] Parse_pid_order(byte[] qid, Json_itm_ary ary) {return claims_parser.Parse_pid_order(ary);}
public static final String
Str_id = "id"
, Str_sitelinks = "sitelinks"
@@ -142,164 +145,3 @@ public class Wdata_doc_parser_v2 implements Wdata_doc_parser {
, Bry_type = Bry_.new_ascii_(Str_type)
;
}
-class Wdata_claims_parser__v2 {
- public void Make_claim_itms(ListAdp claim_itms_list, byte[] src, Json_itm_kv claim_grp) {
- Json_itm_ary claim_itms_ary = Json_itm_ary.cast_(claim_grp.Val());
- int claim_itms_len = claim_itms_ary.Subs_len();
- byte[] pid_bry = claim_grp.Key().Data_bry();
- int pid = Bry_.Xto_int_or(pid_bry, 1, pid_bry.length, -1);
- for (int i = 0; i < claim_itms_len; ++i) {
- Json_itm_nde claim_itm_nde = Json_itm_nde.cast_(claim_itms_ary.Subs_get_at(i));
- Wdata_claim_itm_base itm = Parse_claim_itm(claim_itm_nde, pid);
- if (itm != null) // HACK: itm can be null if value is "somevalue"; DATE:2014-09-20
- claim_itms_list.Add(itm);
- }
- }
- private Wdata_claim_itm_base Parse_claim_itm(Json_itm_nde nde, int pid) {
- int len = nde.Subs_len();
- Hash_adp_bry dict = Wdata_dict_claim.Dict;
- byte rank_tid = Wdata_dict_rank.Tid_unknown;
- Wdata_claim_itm_base claim_itm = null;
- for (int i = 0; i < len; ++i) {
- Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
- switch (tid) {
- case Wdata_dict_claim.Tid_mainsnak: claim_itm = Parse_mainsnak(Json_itm_nde.cast_(sub.Val()), pid); break;
- case Wdata_dict_claim.Tid_rank: rank_tid = Wdata_dict_rank.Xto_tid(sub.Val().Data_bry()); break;
- case Wdata_dict_claim.Tid_references: break;
- case Wdata_dict_claim.Tid_qualifiers: break;
- case Wdata_dict_claim.Tid_qualifiers_order: break;
- case Wdata_dict_claim.Tid_type: break; // ignore: "statement"
- case Wdata_dict_claim.Tid_id: break; // ignore: "Q2$F909BD1C-D34D-423F-9ED2-3493663321AF"
- }
- }
- if (claim_itm != null) claim_itm.Rank_tid_(rank_tid);
- return claim_itm;
- }
- public Wdata_claim_itm_base Parse_mainsnak(Json_itm_nde nde, int pid) {
- int len = nde.Subs_len();
- Hash_adp_bry dict = Wdata_dict_mainsnak.Dict;
- byte snak_tid = Byte_.MaxValue_127;
- for (int i = 0; i < len; ++i) {
- Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
- switch (tid) {
- case Wdata_dict_mainsnak.Tid_snaktype: snak_tid = Wdata_dict_snak_tid.Xto_tid(sub.Val().Data_bry()); break;
- case Wdata_dict_mainsnak.Tid_datavalue: return Parse_datavalue(pid, snak_tid, Json_itm_nde.cast_(sub.Val()));
- case Wdata_dict_mainsnak.Tid_property: break; // ignore: pid already available above
- case Wdata_dict_mainsnak.Tid_hash: break; // ignore: "84487fc3f93b4f74ab1cc5a47d78f596f0b49390"
- }
- }
- return null; // NOTE: mainsnak can be null; PAGE:Q2!P576; DATE:2014-09-20
- }
- public Wdata_claim_itm_base Parse_datavalue(int pid, byte snak_tid, Json_itm_nde nde) {
- int len = nde.Subs_len();
- Hash_adp_bry dict = Wdata_dict_datavalue.Dict;
- Json_itm value_itm = null; byte value_tid = Wdata_dict_val_tid.Tid_unknown;
- for (int i = 0; i < len; ++i) {
- Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
- switch (tid) {
- case Wdata_dict_datavalue.Tid_type: value_tid = Wdata_dict_val_tid.Xto_tid(sub.Val().Data_bry()); break;
- case Wdata_dict_datavalue.Tid_value: value_itm = sub.Val(); break;
- }
- }
- switch (value_tid) {
- case Wdata_dict_val_tid.Tid_string: return new Wdata_claim_itm_str(pid, snak_tid, value_itm.Data_bry());
- case Wdata_dict_val_tid.Tid_entity: return Parse_datavalue_entity (pid, snak_tid, Json_itm_nde.cast_(value_itm));
- case Wdata_dict_val_tid.Tid_time: return Parse_datavalue_time (pid, snak_tid, Json_itm_nde.cast_(value_itm));
- case Wdata_dict_val_tid.Tid_quantity: return Parse_datavalue_quantity (pid, snak_tid, Json_itm_nde.cast_(value_itm));
- case Wdata_dict_val_tid.Tid_globecoordinate: return Parse_datavalue_globecoordinate (pid, snak_tid, Json_itm_nde.cast_(value_itm));
- case Wdata_dict_val_tid.Tid_monolingualtext: return Parse_datavalue_monolingualtext (pid, snak_tid, Json_itm_nde.cast_(value_itm));
- }
- throw Err_.new_("unknown val_tid; val_tid={0}", value_tid);
- }
- private Wdata_claim_itm_base Parse_datavalue_entity(int pid, byte snak_tid, Json_itm_nde nde) {
- Hash_adp_bry dict = Wdata_dict_value_entity.Dict;
- int len = nde.Subs_len();
- byte[] entity_id_bry = null;
- for (int i = 0; i < len; ++i) {
- Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
- switch (tid) {
- case Wdata_dict_value_entity.Tid_entity_type: break; // ignore: "item"
- case Wdata_dict_value_entity.Tid_numeric_id: entity_id_bry = sub.Val().Data_bry(); break;
- }
- }
- if (entity_id_bry == null) throw Err_.new_("pid is invalid entity; pid={0}", pid);
- return new Wdata_claim_itm_entity(pid, snak_tid, entity_id_bry);
- }
- private Wdata_claim_itm_base Parse_datavalue_monolingualtext(int pid, byte snak_tid, Json_itm_nde nde) {
- Hash_adp_bry dict = Wdata_dict_value_monolingualtext.Dict;
- int len = nde.Subs_len();
- byte[] lang = null, text = null;
- for (int i = 0; i < len; ++i) {
- Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
- byte[] sub_val_bry = sub.Val().Data_bry();
- switch (tid) {
- case Wdata_dict_value_monolingualtext.Tid_text: text = sub_val_bry; break;
- case Wdata_dict_value_monolingualtext.Tid_language: lang = sub_val_bry; break;
- }
- }
- if (lang == null || text == null) throw Err_.new_("pid is invalid monolingualtext; pid={0}", pid);
- return new Wdata_claim_itm_monolingualtext(pid, snak_tid, lang, text);
- }
- private Wdata_claim_itm_base Parse_datavalue_globecoordinate(int pid, byte snak_tid, Json_itm_nde nde) {
- Hash_adp_bry dict = Wdata_dict_value_globecoordinate.Dict;
- int len = nde.Subs_len();
- byte[] lat = null, lng = null, alt = null, prc = null, glb = null;
- for (int i = 0; i < len; ++i) {
- Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
- byte[] sub_val_bry = sub.Val().Data_bry();
- switch (tid) {
- case Wdata_dict_value_globecoordinate.Tid_latitude: lat = sub_val_bry; break;
- case Wdata_dict_value_globecoordinate.Tid_longitude: lng = sub_val_bry; break;
- case Wdata_dict_value_globecoordinate.Tid_altitude: alt = sub_val_bry; break;
- case Wdata_dict_value_globecoordinate.Tid_precision: prc = sub_val_bry; break;
- case Wdata_dict_value_globecoordinate.Tid_globe: glb = sub_val_bry; break;
- }
- }
- if (lat == null || lng == null) throw Err_.new_("pid is invalid globecoordinate; pid={0}", pid);
- return new Wdata_claim_itm_globecoordinate(pid, snak_tid, lat, lng, alt, prc, glb);
- }
- private Wdata_claim_itm_base Parse_datavalue_quantity(int pid, byte snak_tid, Json_itm_nde nde) {
- Hash_adp_bry dict = Wdata_dict_value_quantity.Dict;
- int len = nde.Subs_len();
- byte[] amount = null, unit = null, ubound = null, lbound = null;
- for (int i = 0; i < len; ++i) {
- Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
- byte[] sub_val_bry = sub.Val().Data_bry();
- switch (tid) {
- case Wdata_dict_value_quantity.Tid_amount: amount = sub_val_bry; break;
- case Wdata_dict_value_quantity.Tid_unit: unit = sub_val_bry; break;
- case Wdata_dict_value_quantity.Tid_upperbound: ubound = sub_val_bry; break;
- case Wdata_dict_value_quantity.Tid_lowerbound: lbound = sub_val_bry; break;
- }
- }
- if (amount == null) throw Err_.new_("pid is invalid quantity; pid={0}", pid);
- return new Wdata_claim_itm_quantity(pid, snak_tid, amount, unit, ubound, lbound);
- }
- private Wdata_claim_itm_base Parse_datavalue_time(int pid, byte snak_tid, Json_itm_nde nde) {
- Hash_adp_bry dict = Wdata_dict_value_time.Dict;
- int len = nde.Subs_len();
- byte[] time = null, timezone = null, before = null, after = null, precision = null, calendarmodel = null;
- for (int i = 0; i < len; ++i) {
- Json_itm_kv sub = Json_itm_kv.cast_(nde.Subs_get_at(i));
- byte tid = Wdata_dict_utl.Get_tid_or_fail(dict, sub.Key().Data_bry());
- byte[] sub_val_bry = sub.Val().Data_bry();
- switch (tid) {
- case Wdata_dict_value_time.Tid_time: time = sub_val_bry; break;
- case Wdata_dict_value_time.Tid_timezone: timezone = sub_val_bry; break;
- case Wdata_dict_value_time.Tid_before: before = sub_val_bry; break;
- case Wdata_dict_value_time.Tid_after: after = sub_val_bry; break;
- case Wdata_dict_value_time.Tid_precision: precision = sub_val_bry; break;
- case Wdata_dict_value_time.Tid_calendarmodel: calendarmodel = sub_val_bry; break;
- }
- }
- if (time == null) throw Err_.new_("pid is invalid time; pid={0}", pid);
- return new Wdata_claim_itm_time(pid, snak_tid, time, timezone, before, after, precision, calendarmodel);
- }
-}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v2_tst.java b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v2_tst.java
index c0a5f3402..17ff66792 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v2_tst.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/parsers/Wdata_doc_parser_v2_tst.java
@@ -169,6 +169,24 @@ public class Wdata_doc_parser_v2_tst {
, fxt.Make_claim_str(1, "abc")
);
}
+ @Test public void Claims_novalue() {
+ fxt.Test_claims(String_.Concat_lines_nl_skip_last
+ ( "{ 'claims':"
+ , " { 'P1':"
+ , " ["
+ , " { 'mainsnak':"
+ , " { 'snaktype':'novalue'"
+ , " , 'property':'P1'"
+ , " , 'hash':'84487fc3f93b4f74ab1cc5a47d78f596f0b49390'"
+ , " }"
+ , " }"
+ , " ]"
+ , " }"
+ , "}"
+ )
+ , fxt.Make_claim_novalue(1)
+ );
+ }
@Test public void Claims_data_string() {
fxt.Test_claims_data(String_.Concat_lines_nl_skip_last
( "{ 'value':'abc'"
@@ -247,7 +265,104 @@ public class Wdata_doc_parser_v2_tst {
, fxt.Make_claim_time(1, "2001-02-03 04:05:06")
);
}
-}
-class Wdata_doc_parser_v2_fxt extends Wdata_doc_parser_fxt_base {
- @Override public Wdata_doc_parser Make_parser() {return new Wdata_doc_parser_v2();}
+ @Test public void Qualifiers() {
+ fxt.Test_qualifiers(String_.Concat_lines_nl_skip_last
+ ( "{ 'qualifiers':"
+ , " { 'P1':"
+ , " [ "
+ , " { 'snaktype':'value'"
+ , " , 'property':'P1'"
+ , " , 'hash':''"
+ , " , 'datavalue':"
+ , " { 'value':"
+ , " { 'entity-type':'item'"
+ , " , 'numeric-id':11"
+ , " }"
+ , " , 'type':'wikibase-entityid'"
+ , " }"
+ , " }"
+ , " ,"
+ , " { 'snaktype':'value'"
+ , " , 'property':'P1'"
+ , " , 'hash':''"
+ , " , 'datavalue':"
+ , " { 'value':"
+ , " { 'entity-type':'item'"
+ , " , 'numeric-id':12"
+ , " }"
+ , " , 'type':'wikibase-entityid'"
+ , " }"
+ , " }"
+ , " ]"
+ , " ,"
+ , " 'P2':"
+ , " [ "
+ , " { 'snaktype':'value'"
+ , " , 'property':'P2'"
+ , " , 'hash':''"
+ , " , 'datavalue':"
+ , " { 'value':"
+ , " { 'entity-type':'item'"
+ , " , 'numeric-id':21"
+ , " }"
+ , " , 'type':'wikibase-entityid'"
+ , " }"
+ , " }"
+ , " ]"
+ , " }"
+ , "}"
+ ), fxt.Make_claim_entity(1, 11), fxt.Make_claim_entity(1, 12), fxt.Make_claim_entity(2, 21)
+ );
+ }
+ @Test public void Pid_order() {
+ fxt.Test_pid_order
+ ( "{ 'qualifiers-order':['P1', 'P2', 'P3'] }"
+ , 1, 2, 3
+ );
+ }
+ @Test public void References() {
+ fxt.Test_references(String_.Concat_lines_nl_skip_last
+ ( "{ 'references':"
+ , " [ "
+ , " { 'hash':'8e7d51e38606193465d2a1e9d41ba490e06682a6'"
+ , " , 'snaks':"
+ , " { 'P2':"
+ , " [ "
+ , " { 'snaktype':'value'"
+ , " , 'property':'P2'"
+ , " , 'hash':'358e3c0ffa2bfecfe962b39141d99dc2d482110f'"
+ , " , 'datavalue':"
+ , " { 'value':"
+ , " { 'entity-type':'item'"
+ , " , 'numeric-id':21"
+ , " }"
+ , " , 'type':'wikibase-entityid'"
+ , " }"
+ , " }"
+ , " ]"
+ , " , 'P3':"
+ , " [ "
+ , " { 'snaktype':'value'"
+ , " , 'property':'P3'"
+ , " , 'hash':'358e3c0ffa2bfecfe962b39141d99dc2d482110f'"
+ , " , 'datavalue':"
+ , " { 'value':"
+ , " { 'entity-type':'item'"
+ , " , 'numeric-id':31"
+ , " }"
+ , " , 'type':'wikibase-entityid'"
+ , " }"
+ , " }"
+ , " ]"
+ , " }"
+ , " , 'snaks-order':"
+ , " [ 'P2'"
+ , " , 'P3'"
+ , " ]"
+ , " }"
+ , " ]"
+ , "}"
+ ), Int_.Ary(2, 3), fxt.Make_claim_entity(2, 21), fxt.Make_claim_entity(3, 31))
+ ;
+ }
}
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/pfuncs/Wdata_pf_property_tst.java b/400_xowa/src/gplx/xowa/xtns/wdatas/pfuncs/Wdata_pf_property_tst.java
index b3f148584..d34e7bcca 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/pfuncs/Wdata_pf_property_tst.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/pfuncs/Wdata_pf_property_tst.java
@@ -21,83 +21,83 @@ public class Wdata_pf_property_tst {
@Before public void init() {fxt.Init();} Wdata_wiki_mgr_fxt fxt = new Wdata_wiki_mgr_fxt();
@Test public void String() {
fxt.Init_links_add("enwiki", "Test_page", "q1");
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_str_(1, "a")));
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_str(1, "a")));
fxt.Test_parse("{{#property:p1}}", "a");
fxt.Test_parse("{{#property:p2}}", "");
}
@Test public void Entity() {
fxt.Init_links_add("enwiki", "Test_page", "q1");
- fxt.Init_pages_add(fxt.page_bldr_("q2").Label_add("en", "b").Xto_page_doc());
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_entity_(1, 2)));
+ fxt.Init_pages_add(fxt.Wdoc_bldr("q2").Add_label("en", "b").Xto_wdoc());
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_entity(1, 2)));
fxt.Test_parse("{{#property:p1}}", "b");
}
@Test public void Entity_fr() { // PURPOSE: non-English wiki should default to English label if non-English label not available; DATE:2013-12-19
fxt.Wiki().Wdata_wiki_lang_(Bry_.new_ascii_("fr")); // set wiki to French
fxt.Init_links_add("frwiki", "Test_page", "q1"); // create link for en:Test_page in wikidata
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_entity_(1, 2))); // create wdata page Q1 with prop entity reference to Q2
- fxt.Init_pages_add(fxt.page_bldr_("q2").Label_add("en", "b").Xto_page_doc()); // create wdata page Q2 with label in en (not fr)
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_entity(1, 2))); // create wdata page Q1 with prop entity reference to Q2
+ fxt.Init_pages_add(fxt.Wdoc_bldr("q2").Add_label("en", "b").Xto_wdoc()); // create wdata page Q2 with label in en (not fr)
fxt.Test_parse("{{#property:p1}}", "b"); // parse; should get en label
}
@Test public void Entity_missing() { // PURPOSE: wiki may refer to entity that no longer exists; EX: {{#property:p1}} which links to Q1, but p1 links to Q2 and Q2 was deleted; DATE:2014-02-01
fxt.Init_links_add("enwiki", "Test_page", "q1"); // create link for en:Test_page in wikidata
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_entity_(1, 2))); // create wdata page Q1 with prop entity reference to Q2; note that Q2 is not created
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_entity(1, 2))); // create wdata page Q1 with prop entity reference to Q2; note that Q2 is not created
fxt.Test_parse("{{#property:p1}}", ""); // parse; get ""
}
@Test public void Time() {
fxt.Init_links_add("enwiki", "Test_page", "q1");
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_time_(1, "2012-01-02 03:04:05")));
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_time(1, "2012-01-02 03:04:05")));
fxt.Test_parse("{{#property:p1}}", "+00000002012-01-02T03:04:05Z");
}
@Test public void Geodata() {
fxt.Init_links_add("enwiki", "Test_page", "q1");
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_geodata_(1, "1.2345", "6.789")));
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_geo(1, "1.2345", "6.789")));
fxt.Test_parse("{{#property:p1}}", "1.2345, 6.789");
}
@Test public void Quantity() {
fxt.Init_links_add("enwiki", "Test_page", "q1");
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_quantity_(1, "+1,234", "2", "+1,236", "+1232")));
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_quantity(1, "+1,234", "2", "+1,236", "+1232")));
fxt.Test_parse("{{#property:p1}}", "1,234±2");
}
@Test public void Monolingualtext() {
fxt.Init_links_add("enwiki", "Test_page", "q1");
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_monolingualtext_(1, "Lorem ipsum dolor sit amet", "la")));
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_monolingual(1, "la", "Lorem ipsum dolor sit amet")));
fxt.Test_parse("{{#property:p1}}", "Lorem ipsum dolor sit amet");
}
@Test public void Novalue() {
fxt.Init_links_add("enwiki", "Test_page", "q1");
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_novalue_(1)));
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_novalue(1)));
fxt.Test_parse("{{#property:p1}}", "novalue");
}
@Test public void Somevalue() {
fxt.Init_links_add("enwiki", "Test_page", "q1");
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_somevalue_(1)));
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_somevalue(1)));
fxt.Test_parse("{{#property:p1}}", "somevalue");
}
@Test public void Multiple() {
fxt.Init_links_add("enwiki", "Test_page", "q1");
- fxt.Init_pages_add(fxt.doc_("q1", fxt.prop_str_(1, "a"), fxt.prop_str_(1, "b")));
+ fxt.Init_pages_add(fxt.doc_("q1", fxt.Make_claim_str(1, "a"), fxt.Make_claim_str(1, "b")));
fxt.Test_parse("{{#property:p1}}", "a, b");
}
@Test public void Q() {
fxt.Init_links_add("enwiki", "Test_page", "q2");
- fxt.Init_pages_add(fxt.doc_("q2", fxt.prop_str_(1, "a")));
+ fxt.Init_pages_add(fxt.doc_("q2", fxt.Make_claim_str(1, "a")));
fxt.Test_parse("{{#property:p1|q=q2}}", "a");
}
@Test public void Of() {
fxt.Init_links_add("enwiki", "Of_page", "q2");
- fxt.Init_pages_add(fxt.doc_("q2", fxt.prop_str_(1, "a")));
+ fxt.Init_pages_add(fxt.doc_("q2", fxt.Make_claim_str(1, "a")));
fxt.Test_parse("{{#property:p1|of=Of_page}}", "a");
}
@Test public void Pid_as_name() {
fxt.Init_links_add("enwiki", "Test_page", "q2");
fxt.Init_pids_add("en", "astronomic symbol", 1);
- fxt.Init_pages_add(fxt.doc_("q2", fxt.prop_str_(1, "a")));
+ fxt.Init_pages_add(fxt.doc_("q2", fxt.Make_claim_str(1, "a")));
fxt.Test_parse("{{#property:astronomic symbol}}", "a");
}
@Test public void Empty_arg() { // PURPOSE: {{#property:p1|}} should not fail / warn; DATE:2013-11-15
fxt.Init_links_add("enwiki", "Test_page", "q2");
fxt.Init_pids_add("en", "astronomic symbol", 1);
- fxt.Init_pages_add(fxt.doc_("q2", fxt.prop_str_(1, "a")));
+ fxt.Init_pages_add(fxt.doc_("q2", fxt.Make_claim_str(1, "a")));
fxt.Test_parse("{{#property:p1|}}", "a");
}
@Test public void Data() {
@@ -119,7 +119,6 @@ class Wdata_pf_property_data_fxt {
if (app == null) {
parser_fxt = new Xop_fxt();
app = parser_fxt.App();
- page_bldr = new Wdata_doc_bldr(app.Wiki_mgr().Wdata_mgr());
wdata_mgr = app.Wiki_mgr().Wdata_mgr();
}
Io_mgr._.InitEngine_mem();
@@ -128,7 +127,7 @@ class Wdata_pf_property_data_fxt {
expd_id_int = -1;
expd_q = expd_of = null;
return this;
- } private Xoa_app app; Wdata_wiki_mgr wdata_mgr; Wdata_doc_bldr page_bldr; Xop_fxt parser_fxt;
+ } private Xoa_app app; private Wdata_wiki_mgr wdata_mgr; private Xop_fxt parser_fxt;
public Wdata_pf_property_data_fxt Expd_id_int_(int v) {expd_id_int = v; return this;} private int expd_id_int;
public Wdata_pf_property_data_fxt Expd_q_(String v) {expd_q = Bry_.new_ascii_(v); return this;} private byte[] expd_q;
public Wdata_pf_property_data_fxt Expd_of_(String v) {expd_of = Bry_.new_ascii_(v); return this;} private byte[] expd_of;
diff --git a/400_xowa/src/gplx/xowa/xtns/wdatas/specials/Wdata_itemByTitle_page_tst.java b/400_xowa/src/gplx/xowa/xtns/wdatas/specials/Wdata_itemByTitle_page_tst.java
index 2d8d6197e..0dc2984b6 100644
--- a/400_xowa/src/gplx/xowa/xtns/wdatas/specials/Wdata_itemByTitle_page_tst.java
+++ b/400_xowa/src/gplx/xowa/xtns/wdatas/specials/Wdata_itemByTitle_page_tst.java
@@ -52,7 +52,7 @@ class Wdata_itemByTitle_page_fxt {
} private Xop_fxt parser_fxt; private Xoa_app app; private Wdata_itemByTitle_page special_page; private Xow_wiki wiki;
Wdata_wiki_mgr_fxt wdata_fxt;
public void Init_wdata_page(String qid_ttl, String text) {
- Wdata_doc doc = wdata_fxt.doc_(qid_ttl);
+ Wdata_doc doc = wdata_fxt.Wdoc_bldr(qid_ttl).Xto_wdoc();
app.Wiki_mgr().Wdata_mgr().Pages_add(Bry_.new_ascii_(qid_ttl), doc);
parser_fxt.Init_page_create(app.Wiki_mgr().Wdata_mgr().Wdata_wiki(), qid_ttl, text);
}
diff --git a/400_xowa/src_120_wiki/gplx/xowa/Xow_wiki.java b/400_xowa/src_120_wiki/gplx/xowa/Xow_wiki.java
index 68bb04aea..d282c1937 100644
--- a/400_xowa/src_120_wiki/gplx/xowa/Xow_wiki.java
+++ b/400_xowa/src_120_wiki/gplx/xowa/Xow_wiki.java
@@ -135,7 +135,7 @@ public class Xow_wiki implements GfoInvkAble {
public Xoa_page GetPageByTtl(Xoa_url url, Xoa_ttl ttl, Xog_tab_itm tab) {return GetPageByTtl(url, ttl, lang, tab, true);}
public Xoa_page GetPageByTtl(Xoa_url url, Xoa_ttl ttl, Xol_lang lang, Xog_tab_itm tab, boolean parse_page) {
if (init_needed) Init_wiki(app.User());
- Xoa_page page = data_mgr.Get_page(url, ttl, false, false); // get page from data_mgr
+ Xoa_page page = data_mgr.Get_page(url, ttl, false, false); // get page from data_mgr
if (page.Missing()) { // page doesn't exist
if (ttl.Ns().Id_file()) {
Xow_wiki commons_wiki = app.Wiki_mgr().Get_by_key_or_null(commons_wiki_key);
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xoa_ttl.java b/400_xowa/src_400_parser/gplx/xowa/Xoa_ttl.java
index b4c8281b1..8019506e7 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xoa_ttl.java
+++ b/400_xowa/src_400_parser/gplx/xowa/Xoa_ttl.java
@@ -213,9 +213,12 @@ public class Xoa_ttl { // PAGE:en.w:http://en.wikipedia.org/wiki/Help:Link; REF.
if (amp_itm.Tid() == Xop_amp_trie_itm.Tid_name) {
switch (amp_itm.Char_int()) {
case 160: // NOTE: must convert to space; EX:w:United States [[Image:Dust Bowl - Dallas, South Dakota 1936.jpg|220px|alt=]]
- b_ary = Bry_space;
- break;
+ if (ltr_bgn != -1) add_ws = true; // apply same ws rules as Space, NewLine; needed for converting multiple ws into one; EX:" " -> " " x> " "; PAGEen.w:Greek_government-debt_crisis; DATE:2014-09-25
+ cur = match_pos; // set cur after ";"
+ continue;
case Byte_ascii.Amp:
+ b_ary = Byte_ascii.Amp_bry; // NTOE: if & convert to &; PAGE:en.w:Amadou Bagayoko?redirect=n; DATE:2014-09-23
+ break;
case Byte_ascii.Quote:
case Byte_ascii.Lt:
case Byte_ascii.Gt:
@@ -352,7 +355,6 @@ public class Xoa_ttl { // PAGE:en.w:http://en.wikipedia.org/wiki/Help:Link; REF.
tors_txt = tors_ns.Name_txt_w_colon();
return true;
}
- private byte[] Bry_space = Bry_.new_ascii_(" ");
public static byte[] Replace_spaces(byte[] raw) {return Bry_.Replace(raw, Byte_ascii.Space, Byte_ascii.Underline);}
public static byte[] Replace_unders(byte[] raw) {return Bry_.Replace(raw, Byte_ascii.Underline, Byte_ascii.Space);}
private int wik_bgn = -1, ns_bgn = -1, page_bgn = 0, leaf_bgn = -1, anch_bgn = -1, root_bgn = -1;
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_redirect_mgr_tst.java b/400_xowa/src_400_parser/gplx/xowa/Xop_redirect_mgr_tst.java
index 04b4c98a5..9c4fa019a 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_redirect_mgr_tst.java
+++ b/400_xowa/src_400_parser/gplx/xowa/Xop_redirect_mgr_tst.java
@@ -36,6 +36,7 @@ public class Xop_redirect_mgr_tst {
}
@Test public void Url_decode() {fxt.Test_redirect("#REDIRECT [[A%28B%29]]" , "A(B)");} // PURPOSE: url-decode links; PAGE:en.w:Watcher_(Buffy_the_Vampire_Slayer); DATE:2014-08-18
@Test public void Url_decode_plus() {fxt.Test_redirect("#REDIRECT [[A%28B%29+]]", "A(B)+");} // PURPOSE: do not url-decode +; PAGE:en.w:Template:Positionskarte+; DATE:2014-08-22
+ @Test public void Amp() {fxt.Test_redirect("#REDIRECT [[A & B]]", "A & B");} // PURPOSE: & -> &; PAGE:en.w:Amadou Bagayoko?redirect=n; DATE:2014-09-23
@Test public void Frame_ttl() { // PURPOSE: redirect should set invk frame title to redirect_trg, not original; PAGE:en.w:Statutory_city DATE:2014-08-22
fxt.Test_frame_ttl("Template:A", "#REDIRECT [[Template:B]]", "Template:B", "Template:B");
}
diff --git a/400_xowa/src_490_xnde/gplx/xowa/Xop_xatr_parser.java b/400_xowa/src_490_xnde/gplx/xowa/Xop_xatr_parser.java
index 58291ca02..6f015c988 100644
--- a/400_xowa/src_490_xnde/gplx/xowa/Xop_xatr_parser.java
+++ b/400_xowa/src_490_xnde/gplx/xowa/Xop_xatr_parser.java
@@ -23,7 +23,7 @@ public class Xop_xatr_parser { // REF.MW:Sanitizer.php|decodeTagAttributes;MW_AT
private int atr_bgn = -1, key_bgn = -1, key_end = -1, eq_pos = -1, val_bgn = -1, val_end = -1; boolean valid = true;
private byte quote_byte = Byte_ascii.Nil;
private Hash_adp_bry repeated_atrs_hash = Hash_adp_bry.ci_ascii_(); // ASCII:xnde_atrs
- private Bry_bfr key_bfr = Bry_bfr.new_(), val_bfr = Bry_bfr.new_(); boolean key_bfr_on = false, val_bfr_on = false;
+ private Bry_bfr key_bfr = Bry_bfr.new_(), val_bfr = Bry_bfr.new_(); boolean key_bfr_on = false, val_bfr_on = false, ws_is_before_val = false;
public Bry_obj_ref Bry_obj() {return bry_ref;} private Bry_obj_ref bry_ref = Bry_obj_ref.null_();
public int Xnde_find_gt_find(byte[] src, int pos, int end) {
bry_ref.Val_(null);
@@ -84,6 +84,7 @@ public class Xop_xatr_parser { // REF.MW:Sanitizer.php|decodeTagAttributes;MW_AT
mode = Mode_atr_bgn;
val_bfr.Clear();
val_bfr_on = false;
+ ws_is_before_val = false;
continue;
}
else
@@ -219,6 +220,7 @@ public class Xop_xatr_parser { // REF.MW:Sanitizer.php|decodeTagAttributes;MW_AT
case Mode_val_bgn:
switch (b) {
case Byte_ascii.Space: case Byte_ascii.NewLine: case Byte_ascii.Tab: // skip-ws
+ ws_is_before_val = true;
break;
case Byte_ascii.Quote: case Byte_ascii.Apos:
mode = Mode_val_quote; quote_byte = b; prv_is_ws = false;
@@ -262,15 +264,11 @@ public class Xop_xatr_parser { // REF.MW:Sanitizer.php|decodeTagAttributes;MW_AT
Make(log_mgr, src, i + 1); // NOTE: set atr_end *after* quote
}
prv_is_ws = false; if (val_bfr_on) val_bfr.Add_byte(b); // INLINE: add char
-// else {
-// if (!val_bfr_on) val_bfr.Add_mid(src, val_bgn, i + 1); // +1 to include '
-// val_bfr_on = true;
-// }
break;
case Byte_ascii.Lt: // "<" try to find nowiki inside atr
int gt_pos = Xnde_find_gt(log_mgr, src, i, end);
if (gt_pos == String_.Find_none) {
-// valid = false; mode = Mode_invalid; // DELETE: 2012-11-13; unpaired < should not mark atr invalid; EX: style='margin:1em
ab" -> "ab"
End_tag(ctx, root, prv_xnde, src, src_len, bgn_pos - 1, bgn_pos - 1, tagId, true, tag);
}
- else if (!tag.Nest() && Stack_find_xnde(ctx, tagId)) return ctx.Lxr_make_log_(Xop_xnde_log.Invalid_nest, src, bgn_pos, gtPos);
else if (tag.SingleOnly()) inline = true; //
not allowed; convert
to
will be escaped
else if (tag.NoInline() && inline) {
Xop_xnde_tkn xnde_inline = Xnde_bgn(ctx, tkn_mkr, root, tag, Xop_xnde_tkn.CloseMode_open, src, bgn_pos, open_tag_end, atrs_bgn, atrs_end, atrs);
diff --git a/400_xowa/src_490_xnde/gplx/xowa/Xop_xnde_wkr__basic_tst.java b/400_xowa/src_490_xnde/gplx/xowa/Xop_xnde_wkr__basic_tst.java
index 80acce3a6..a4dd78934 100644
--- a/400_xowa/src_490_xnde/gplx/xowa/Xop_xnde_wkr__basic_tst.java
+++ b/400_xowa/src_490_xnde/gplx/xowa/Xop_xnde_wkr__basic_tst.java
@@ -68,15 +68,6 @@ public class Xop_xnde_wkr__basic_tst {
@Test public void Escaped() {
fxt.Init_log_(Xop_xnde_log.Escaped_xnde).Test_parse_page_wiki("", fxt.tkn_xnde_(0, 18).Subs_(fxt.tkn_bry_(5, 12)));// TIDY.dangling: tidy will correct dangling node; DATE:2014-07-22
}
- @Test public void Nest() {// REVISIT: 2nd should be converted to ; other ignored; WHEN: with example
- fxt.Init_log_(Xop_xnde_log.Invalid_nest, Xop_xnde_log.Escaped_xnde).Test_parse_page_wiki("abcde"
- , fxt.tkn_txt_ ( 0, 1)
- , fxt.tkn_xnde_ ( 1, 13).Subs_(fxt.tkn_txt_(4, 9))
- , fxt.tkn_txt_ (13, 14)
- , fxt.tkn_bry_(14, 18) // TIDY.dangling: tidy will correct dangling node; DATE:2014-07-22
- , fxt.tkn_txt_ (18, 19)
- );
- }
@Test public void Xtn() {
fxt.Test_parse_page_wiki("