1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

Wikibase: Fix 'Module:Infobox/Cycliste:218 attempt to call nil' on many fr.w pages [#551]

This commit is contained in:
gnosygnu
2019-08-19 22:21:22 -04:00
parent 0295d816fd
commit 8c55d2406a
3 changed files with 239 additions and 37 deletions

View File

@@ -18,10 +18,10 @@ import gplx.xowa.xtns.wbases.*;
import gplx.langs.jsons.*;
import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.stores.*;
import gplx.xowa.xtns.scribunto.procs.*;
public class Scrib_lib_wikibase_entity implements Scrib_lib {
public class Scrib_lib_wikibase_entity implements Scrib_lib { // REF.MW:https://github.com/wikimedia/mediawiki-extensions-Wikibase/blob/master/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
public Scrib_lib_wikibase_entity(Scrib_core core) {this.core = core;} private Scrib_core core;
public Scrib_lua_mod Mod() {return mod;} private Scrib_lua_mod mod;
public Scrib_lib Init() {procs.Init_by_lib(this, Proc_names); return this;}
public Scrib_lib Init() {procs.Init_by_lib(this, Proc__names); return this;}
public Scrib_lib Clone_lib(Scrib_core core) {return new Scrib_lib_wikibase_entity(core);}
public Scrib_lua_mod Register(Scrib_core core, Io_url script_dir) {
Init();
@@ -31,25 +31,30 @@ public class Scrib_lib_wikibase_entity implements Scrib_lib {
public Scrib_proc_mgr Procs() {return procs;} private Scrib_proc_mgr procs = new Scrib_proc_mgr();
public boolean Procs_exec(int key, Scrib_proc_args args, Scrib_proc_rslt rslt) {
switch (key) {
case Proc_getGlobalSiteId: return GetGlobalSiteId(args, rslt);
case Proc_getLanguageCode: return GetLanguageCode(args, rslt);
// case Proc_formatStatements: return FormatStatements(args, rslt);
case Proc_formatPropertyValues: return FormatPropertyValues(args, rslt);
case Proc__getGlobalSiteId: return GetGlobalSiteId(args, rslt);
case Proc__getLanguageCode: return GetLanguageCode(args, rslt);
case Proc__formatStatements: return FormatStatements(args, rslt);
case Proc__formatPropertyValues: return FormatPropertyValues(args, rslt);
case Proc__addStatementUsage: return AddStatementUsage(args, rslt);
case Proc__addLabelUsage: return AddLabelUsage(args, rslt);
case Proc__addDescriptionUsage: return AddDescriptionUsage(args, rslt);
case Proc__addSiteLinksUsage: return AddSiteLinksUsage(args, rslt);
case Proc__addOtherUsage: return AddOtherUsage(args, rslt);
case Proc__getSetting: return GetSetting(args, rslt);
case Proc__incrementStatsKey: return IncrementStatsKey(args, rslt);
default: throw Err_.new_unhandled(key);
}
}
private static final int Proc_getGlobalSiteId = 0, Proc_getLanguageCode = 1, Proc_formatPropertyValues = 2;
public static final String Invk_getGlobalSiteId = "getGlobalSiteId", Invk_getLanguageCode = "getLanguageCode", Invk_formatPropertyValues = "formatPropertyValues";
private static final String[] Proc_names = String_.Ary(Invk_getGlobalSiteId, Invk_getLanguageCode, Invk_formatPropertyValues);
public boolean GetGlobalSiteId(Scrib_proc_args args, Scrib_proc_rslt rslt) {
return rslt.Init_obj(core.Wiki().Domain_abrv()); // ;siteGlobalID: This site's global ID (e.g. <code>'itwiki'</code>), as used in the sites table. Default: <code>$wgDBname</code>.; REF:/xtns/Wikibase/docs/options.wiki
}
public boolean GetLanguageCode(Scrib_proc_args args, Scrib_proc_rslt rslt) {
return rslt.Init_obj(core.Wiki().Lang().Key_bry());
}
// public boolean FormatStatements(Scrib_proc_args args, Scrib_proc_rslt rslt) {
public boolean FormatStatements(Scrib_proc_args args, Scrib_proc_rslt rslt) {
throw Err_.new_unimplemented();
// return FormatPropertyValues(args, rslt); // NOTE: implementation should be like Visit_entity but return [[A]] instead of <a href='A'>
// }
}
public boolean FormatPropertyValues(Scrib_proc_args args, Scrib_proc_rslt rslt) {
// get qid / pid
byte[] qid = args.Pull_bry(0);
@@ -82,4 +87,70 @@ public class Scrib_lib_wikibase_entity implements Scrib_lib {
wdata_mgr.Resolve_to_bfr(bfr, prop_grp, lang, Bool_.N);
return rslt.Init_obj(bfr.To_bry_and_rls());
}
public boolean AddStatementUsage(Scrib_proc_args args, Scrib_proc_rslt rslt) {
return rslt.Init_null();
}
public boolean AddLabelUsage(Scrib_proc_args args, Scrib_proc_rslt rslt) {
return rslt.Init_null();
}
public boolean AddDescriptionUsage(Scrib_proc_args args, Scrib_proc_rslt rslt) {
return rslt.Init_null();
}
public boolean AddSiteLinksUsage(Scrib_proc_args args, Scrib_proc_rslt rslt) {
return rslt.Init_null();
}
public boolean AddOtherUsage(Scrib_proc_args args, Scrib_proc_rslt rslt) {
return rslt.Init_null();
}
public boolean GetSetting(Scrib_proc_args args, Scrib_proc_rslt rslt) {
String key = args.Cast_str_or(0, "");
if (String_.Eq(key, "fineGrainedLuaTracking")) {// REF.MW: https://gerrit.wikimedia.org/r/#/c/operations/mediawiki-config/+/412664/3/wmf-config/InitialiseSettings.php
return rslt.Init_obj(false);
}
else {
throw Err_.new_unimplemented();
}
}
public boolean IncrementStatsKey(Scrib_proc_args args, Scrib_proc_rslt rslt) {
return rslt.Init_null();
}
private static final int
Proc__getGlobalSiteId = 0
, Proc__getLanguageCode = 1
, Proc__formatStatements = 2
, Proc__formatPropertyValues = 3
, Proc__addStatementUsage = 4
, Proc__addLabelUsage = 5
, Proc__addDescriptionUsage = 6
, Proc__addSiteLinksUsage = 7
, Proc__addOtherUsage = 8
, Proc__getSetting = 9
, Proc__incrementStatsKey = 10
;
public static final String
Invk__getGlobalSiteId = "getGlobalSiteId"
, Invk__getLanguageCode = "getLanguageCode"
, Invk__formatStatements = "formatStatements"
, Invk__formatPropertyValues = "formatPropertyValues"
, Invk__addStatmentUsage = "addStatementUsage"
, Invk__addLabelUsage = "addLabelUsage"
, Invk__addDescriptionUsage = "addDescriptionUsage"
, Invk__addSiteLinkUsage = "addSiteLinkUsage"
, Invk__addOtherUsage = "addOtherUsage"
, Invk__getSetting = "getSetting"
, Invk__incrementStatsKey = "incrementStatsKey"
;
private static final String[] Proc__names = String_.Ary
( Invk__getGlobalSiteId
, Invk__getLanguageCode
, Invk__formatStatements
, Invk__formatPropertyValues
, Invk__addStatmentUsage
, Invk__addLabelUsage
, Invk__addDescriptionUsage
, Invk__addSiteLinkUsage
, Invk__addOtherUsage
, Invk__getSetting
, Invk__incrementStatsKey
);
}

View File

@@ -22,23 +22,23 @@ public class Entity__tst {
lib = fxt.Core().Lib_wikibase_entity().Init();
} private Scrib_invoke_func_fxt fxt = new Scrib_invoke_func_fxt(); private Scrib_lib lib;
@Test public void GetGlobalSiteId() {
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk_getGlobalSiteId, Object_.Ary_empty, "enwiki");
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk__getGlobalSiteId, Object_.Ary_empty, "enwiki");
}
@Test public void GetLanguageCode() {
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk_getLanguageCode, Object_.Ary_empty, "en");
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk__getLanguageCode, Object_.Ary_empty, "en");
}
@Test public void FormatPropertyValues() {
Wdata_wiki_mgr_fxt wdata_fxt = new Wdata_wiki_mgr_fxt().Init(fxt.Parser_fxt(), false);
// lookup by id
wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Q2").Add_claims(wdata_fxt.Make_claim_string(3, "P3_val")).Xto_wdoc());
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk_formatPropertyValues, Object_.Ary("Q2", "P3") , "P3_val");
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk__formatPropertyValues, Object_.Ary("Q2", "P3") , "P3_val");
// lookup by name
wdata_fxt.Init_pids_add("en", "P3_val", 3);
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk_formatPropertyValues, Object_.Ary("Q2", "P3_val") , "P3_val");
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk__formatPropertyValues, Object_.Ary("Q2", "P3_val") , "P3_val");
}
@Test public void FormatPropertyValues__not_found() { // PURPOSE: should return "" not null; PAGE:fr.s:Auteur:Henri_Bergson; DATE:2014-08-13
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk_formatPropertyValues, Object_.Ary("Q2", "P3"), "");
fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase_entity.Invk__formatPropertyValues, Object_.Ary("Q2", "P3"), "");
}
}