mirror of
https://github.com/gnosygnu/xowa.git
synced 2025-05-30 14:04:56 +00:00
Wikibase: Add extra-case to RenderSnaks for key=pid,val=snaks [#666]
This commit is contained in:
gnosygnu
parent
3355d03c44
commit
f73164d55e
@ -259,7 +259,7 @@ public class Scrib_lib_wikibase implements Scrib_lib {
|
||||
return rslt.Init_obj(rv);
|
||||
}
|
||||
public boolean RenderSnaks(Scrib_proc_args args, Scrib_proc_rslt rslt) {
|
||||
String rv = Wdata_prop_val_visitor_.Render_snaks(core.Wiki(), core.Page().Url_bry_safe(), args.Pull_kv_ary_safe(0));
|
||||
String rv = Wdata_prop_val_visitor_.Render_snaks(core.Wiki(), core.Page().Url_bry_safe(), Deserialize_snaks(args, 0));
|
||||
return rslt.Init_obj(rv);
|
||||
}
|
||||
public boolean FormatValue(Scrib_proc_args args, Scrib_proc_rslt rslt) {
|
||||
@ -282,7 +282,7 @@ public function formatValues( $snaksSerialization ) {
|
||||
}
|
||||
public boolean FormatValues(Scrib_proc_args args, Scrib_proc_rslt rslt) {
|
||||
// WORKAROUND: return same as RenderSnaks until ISSUE:#593 is completed
|
||||
String rv = Wdata_prop_val_visitor_.Render_snaks(core.Wiki(), core.Page().Url_bry_safe(), args.Pull_kv_ary_safe(0));
|
||||
String rv = Wdata_prop_val_visitor_.Render_snaks(core.Wiki(), core.Page().Url_bry_safe(), Deserialize_snaks(args, 0));
|
||||
return rslt.Init_obj(rv);
|
||||
}
|
||||
public boolean ResolvePropertyId(Scrib_proc_args args, Scrib_proc_rslt rslt) {
|
||||
@ -456,6 +456,30 @@ public function formatValues( $snaksSerialization ) {
|
||||
if (wdoc == null && logMissing) Wdata_wiki_mgr.Log_missing_qid(core.Ctx(), type, xid_bry);
|
||||
return wdoc;
|
||||
}
|
||||
private static Keyval[] Deserialize_snaks(Scrib_proc_args args, int idx) {
|
||||
// NOTE: SnakListDeserializer has an if-case to check for either "Snak[]" or "[key:"key",value:Snaks[]]" ISSUE#:666; PAGE:ja.w:Sed_(コンピュータ) DATE:2020-03-01
|
||||
// REF.MW: https://github.com/wikimedia/mediawiki-vendor/blob/4361929262cc87a08345c69a71258f59319be2c7/wikibase/data-model-serialization/src/Deserializers/SnakListDeserializer.php#L53-L68
|
||||
// get kvs
|
||||
Keyval[] kvs = args.Pull_kv_ary_safe(idx);
|
||||
int kvs_len = kvs.length;
|
||||
|
||||
if (kvs_len == 0) return kvs; // empty kvs; just return it;
|
||||
|
||||
// get 1st
|
||||
Keyval kv = kvs[0];
|
||||
|
||||
// key is String; EX: {"P10":[{"property":"P20"}]}
|
||||
if (Type_.Eq_by_obj(kv.Key_as_obj(), String.class)) {
|
||||
if (Type_.Eq_by_obj(kv.Key_as_obj(), Keyval[].class)) {
|
||||
throw Err_.new_wo_type("The snaks per property " + kv.Key() + " should be an array" );
|
||||
}
|
||||
return (Keyval[])kv.Val();
|
||||
}
|
||||
// key is int; EX: ["1":{"property":"P20"}]
|
||||
else {
|
||||
return kvs;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return PropertyOrderProvider
|
||||
|
||||
@ -138,7 +138,11 @@ public class Basic__tst {
|
||||
// ));
|
||||
// }
|
||||
@Test public void RenderSnaks() {
|
||||
Keyval[] args = Wbase_snak_utl_.Get_snaks_ary(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
|
||||
Keyval[] args = Wbase_snak_utl_.Get_snaks_as_ary(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
|
||||
fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnaks, args, "P3_en, P3_de");
|
||||
}
|
||||
@Test public void RenderSnaks_pid() { // PURPOSE: handle RenderSnaks like {"P10":[{"property":"P20"}]}; ISSUE#:666; DATE:2020-03-01
|
||||
Keyval[] args = Wbase_snak_utl_.Get_snaks_as_nde(wdata_fxt, "P123", wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
|
||||
fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnaks, args, "P3_en, P3_de");
|
||||
}
|
||||
@Test public void RenderSnak__entity() {
|
||||
@ -178,8 +182,12 @@ public class Basic__tst {
|
||||
Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, new Wbase_claim_string(3, Wbase_claim_value_type_.Tid__somevalue, null));
|
||||
fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "");
|
||||
}
|
||||
@Test public void RenderSnak__data_value_is_null1() {
|
||||
Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, new Wbase_claim_string(3, Wbase_claim_value_type_.Tid__somevalue, null));
|
||||
fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "");
|
||||
}
|
||||
@Test public void FormatValues() {
|
||||
Keyval[] args = Wbase_snak_utl_.Get_snaks_ary(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
|
||||
Keyval[] args = Wbase_snak_utl_.Get_snaks_as_ary(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
|
||||
fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_formatValues, args, "P3_en, P3_de");
|
||||
}
|
||||
@Test public void FormatValue__str() {
|
||||
@ -215,9 +223,26 @@ public class Basic__tst {
|
||||
}
|
||||
}
|
||||
class Wbase_snak_utl_ {
|
||||
public static Keyval[] Get_snaks_ary(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base... ary) {
|
||||
public static Keyval[] Get_snaks_as_ary(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base... ary) {
|
||||
Keyval[] rv = Get_snaks_ary(wdata_fxt, ary);
|
||||
return To_scrib_args(rv); // EX: ["1":["1":{"property":"P1"},"2":{"property":"P2"}]]
|
||||
}
|
||||
public static Keyval[] Get_snaks_as_nde(Wdata_wiki_mgr_fxt wdata_fxt, String pid, Wbase_claim_base... ary) {
|
||||
Keyval[] rv = Get_snaks_ary(wdata_fxt, ary);
|
||||
Keyval kv = Keyval_.new_(pid, rv); // EX: "P1":[{"property":"P2"}]
|
||||
return To_scrib_args(Keyval_.Ary(kv)); // EX:["1":[{"P1":[{"property":"P11"}]]} // FOOTNOTE:references.snaks
|
||||
}
|
||||
private static Keyval[] To_scrib_args(Object arg) {
|
||||
Keyval[] rv = new Keyval[1];
|
||||
rv[0] = Keyval_.int_(0 + Scrib_core.Base_1, arg);
|
||||
return rv;
|
||||
}
|
||||
private static Keyval[] Get_snaks_ary(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base... ary) {
|
||||
// use wdoc_bldr to create claims
|
||||
Wdata_doc wdoc = wdata_fxt.Wdoc_bldr("q2").Add_claims(ary).Xto_wdoc();
|
||||
return Keyval_.Ary(Keyval_.int_(1, Get_snaks(wdata_fxt, wdoc)));
|
||||
|
||||
// extract snaks from claims;
|
||||
return Get_snaks(wdata_fxt, wdoc);
|
||||
}
|
||||
public static Keyval[] Get_snak(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base itm) {
|
||||
Wdata_doc wdoc = wdata_fxt.Wdoc_bldr("q2").Add_claims(itm).Xto_wdoc();
|
||||
@ -244,3 +269,82 @@ class Wbase_snak_utl_ {
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
/*
|
||||
==FOOTNOTE:references.snaks==
|
||||
Explaining this snippet:
|
||||
|
||||
<pre>
|
||||
return To_scrib_args(Keyval_.Ary(kv)); // EX:["1":[{"P1":[{"property":"P11"}]]}
|
||||
</pre>
|
||||
|
||||
* This occurs as a result of https://ja.wikipedia.org/wiki/Sed_(コンピュータ)
|
||||
* It has an Infobox which will eventually call this https://ja.wikipedia.org/wiki/Module:WikidataIB
|
||||
|
||||
<pre>
|
||||
local sourced = function(claim)
|
||||
if claim.references then
|
||||
for kr, vr in pairs(claim.references) do
|
||||
local ref = mw.wikibase.renderSnaks(vr.snaks)
|
||||
if not ref:find("Wikipedia") then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
<pre>
|
||||
|
||||
Checking then with https:/www.wikidata.org/wiki/Property:P3966
|
||||
<pre>
|
||||
, "references":
|
||||
[
|
||||
{ "hash":"fa278ebfc458360e5aed63d5058cca83c46134f1"
|
||||
, "snaks":
|
||||
{ "P143":
|
||||
[
|
||||
{ "snaktype":"value"
|
||||
, "property":"P143"
|
||||
, "hash":"e4f6d9441d0600513c4533c672b5ab472dc73694"
|
||||
, "datavalue":
|
||||
{ "value":
|
||||
{ "entity-type":"item"
|
||||
, "numeric-id":328
|
||||
, "id":"Q328"
|
||||
}
|
||||
, "type":"wikibase-entityid"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
, "snaks-order":
|
||||
[ "P143"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
</pre>
|
||||
|
||||
That means claims.references.snaks is this
|
||||
<pre>
|
||||
{ "P143":
|
||||
[
|
||||
{ "snaktype":"value"
|
||||
, "property":"P143"
|
||||
, "hash":"e4f6d9441d0600513c4533c672b5ab472dc73694"
|
||||
, "datavalue":
|
||||
{ "value":
|
||||
{ "entity-type":"item"
|
||||
, "numeric-id":328
|
||||
, "id":"Q328"
|
||||
}
|
||||
, "type":"wikibase-entityid"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
</pre>
|
||||
|
||||
Now, going back to "To_scrib_args(Keyval_.Ary(kv))"
|
||||
* "kv" represents "P1":[{"property":"P11"}
|
||||
* "kv" gets wrapped in Keyval_.Ary b/c SnakDeserialization will deserialize into key/val pairs; '{"P1":[{"property":"P11"}]}' '["P1":[["property":"P11"]]]'
|
||||
* "To_scrib_args()" will put the entire thing as '["1":...]'
|
||||
*/
|
||||
@ -62,6 +62,7 @@ public class Wdata_prop_val_visitor_ {
|
||||
}
|
||||
|
||||
if (snak_tid == Wbase_claim_value_type_.Tid__novalue) return; // ISSUE#:481; DATE:2019-06-02
|
||||
// if (snak_tid == Wbase_claim_value_type_.Tid__somevalue) return; // is also blank DATE:2019-08-14
|
||||
if (datavalue_ary == null) {
|
||||
Gfo_usr_dlg_.Instance.Warn_many("", "", "datavalue is empty even though not novalue; page_url=~{0} pid=~{1}", page_url, pid);
|
||||
return;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user