Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-10-27 20:34:16 +00:00
Code Issues Projects Releases Wiki Activity

Wikibase: Fix NullPointerException on a few fr.w pages [#773]

Browse Source
This commit is contained in:
gnosygnu 2020-08-04 07:24:52 -04:00
parent afed865c84
commit 95e833d70c
2 changed files with 107 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
400_xowa/src/gplx/xowa/mediawiki/extensions/Wikibase/client/includes/dataAccess/scribunto/Wbase_entity_accessor.java
View File

@ -1,6 +1,6 @@
/*
XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012-2017 gnosygnu@gmail.com
Copyright (C) 2012-2020 gnosygnu@gmail.com
XOWA is licensed under the terms of the General Public License (GPL) Version 3,
or alternatively under the terms of the Apache License Version 2.0.
@ -13,77 +13,91 @@ The terms of each license can be found in the source code repository:
GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
*/
package gplx.xowa.mediawiki.extensions.Wikibase.client.includes.dataAccess.scribunto; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.extensions.*; import gplx.xowa.mediawiki.extensions.Wikibase.*; import gplx.xowa.mediawiki.extensions.Wikibase.client.*; import gplx.xowa.mediawiki.extensions.Wikibase.client.includes.*; import gplx.xowa.mediawiki.extensions.Wikibase.client.includes.dataAccess.*;
import gplx.xowa.xtns.wbases.*; import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.claims.itms.*; import gplx.xowa.xtns.wbases.claims.enums.*; import gplx.xowa.xtns.wbases.stores.*;
public class Wbase_entity_accessor {
private final Wbase_doc_mgr entity_mgr;
public Wbase_entity_accessor(Wbase_doc_mgr entity_mgr) {
this.entity_mgr = entity_mgr;
}
public Wbase_claim_base[] getEntityStatements(byte[] prefixedEntityId, byte[] propertyIdSerialization, byte[] rank) {
prefixedEntityId = Bry_.Trim(prefixedEntityId);
// entityId = $this->entityIdParser->parse( $prefixedEntityId );
int propertyId = Wdata_prop_val_visitor_.To_pid_int(propertyIdSerialization);
// $this->usageAccumulator->addStatementUsage( $entityId, $propertyId );
// $this->usageAccumulator->addOtherUsage( $entityId );
// for some reason, prefixedEntityId can be ""; PAGE:en.w:Nature_and_Art DATE:2017-11-28
if (Bry_.Len_eq_0(prefixedEntityId))
return null;
Wdata_doc entity = null;
try {
entity = entity_mgr.Get_by_xid_or_null(prefixedEntityId);
} catch (Exception ex) { // RevisionedUnresolvedRedirectException ex
// We probably hit a double redirect
Gfo_usr_dlg_.Instance.Log_many("", "", "Encountered a UnresolvedRedirectException when trying to load {0}; exc={1}", prefixedEntityId, Err_.Message_lang(ex));
return null;
}
int selected_rank = ID_NULL;
if (Bry_.Eq(rank, RANK_BEST)) {
selected_rank = ID_BEST;
}
else if (Bry_.Eq(rank, RANK_ALL)) {
selected_rank = ID_ALL;
}
else {
throw Err_.new_wo_type("rank must be 'best' or 'all', " + String_.new_u8(rank) + " given");
}
List_adp rv = List_adp_.New();
Wbase_claim_grp statements = entity.Get_claim_grp_or_null(propertyId);
if (statements == null)
return null;
int statements_len = statements.Len();
for (int i = 0; i < statements_len; i++) {
Wbase_claim_base statement = statements.Get_at(i);
if ( selected_rank == ID_ALL
|| (selected_rank == ID_BEST && statement.Rank_tid() == Wbase_claim_rank_.Tid__preferred)
) {
rv.Add(statement);
}
}
// no preferred exists; add normal
if (rv.Len() == 0 && selected_rank == ID_BEST) {
for (int i = 0; i < statements_len; i++) {
Wbase_claim_base statement = statements.Get_at(i);
if (statement.Rank_tid() == Wbase_claim_rank_.Tid__normal) {
rv.Add(statement);
}
}
}
// $serialization = $this->newClientStatementListSerializer()->serialize( $statements );
// $this->renumber( $serialization );
// return $serialization;
return rv.Len() == 0 ? null : (Wbase_claim_base[])rv.To_ary(Wbase_claim_base.class);
}
private static final int ID_NULL = 0, ID_BEST = 1, ID_ALL = 2;
private static final byte[]
RANK_BEST = Bry_.new_a7("best")
, RANK_ALL = Bry_.new_a7("all");
}
package gplx.xowa.mediawiki.extensions.Wikibase.client.includes.dataAccess.scribunto;
import gplx.Bry_;
import gplx.Err_;
import gplx.Gfo_usr_dlg_;
import gplx.List_adp;
import gplx.List_adp_;
import gplx.String_;
import gplx.xowa.xtns.wbases.Wdata_doc;
import gplx.xowa.xtns.wbases.Wdata_prop_val_visitor_;
import gplx.xowa.xtns.wbases.claims.Wbase_claim_grp;
import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_rank_;
import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_base;
import gplx.xowa.xtns.wbases.stores.Wbase_doc_mgr;
public class Wbase_entity_accessor {
private final Wbase_doc_mgr entity_mgr;
public Wbase_entity_accessor(Wbase_doc_mgr entity_mgr) {
this.entity_mgr = entity_mgr;
}
public Wbase_claim_base[] getEntityStatements(byte[] prefixedEntityId, byte[] propertyIdSerialization, byte[] rank) {
prefixedEntityId = Bry_.Trim(prefixedEntityId);
// entityId = $this->entityIdParser->parse( $prefixedEntityId );
int propertyId = Wdata_prop_val_visitor_.To_pid_int(propertyIdSerialization);
// $this->usageAccumulator->addStatementUsage( $entityId, $propertyId );
// $this->usageAccumulator->addOtherUsage( $entityId );
// for some reason, prefixedEntityId can be ""; PAGE:en.w:Nature_and_Art DATE:2017-11-28
if (Bry_.Len_eq_0(prefixedEntityId))
return null;
Wdata_doc entity = null;
try {
entity = entity_mgr.Get_by_xid_or_null(prefixedEntityId);
} catch (Exception ex) { // RevisionedUnresolvedRedirectException ex
// We probably hit a double redirect
Gfo_usr_dlg_.Instance.Log_many("", "", "Encountered a UnresolvedRedirectException when trying to load {0}; exc={1}", prefixedEntityId, Err_.Message_lang(ex));
return null;
}
if (entity == null) return null; // must check for null; PAGE:fr.w:Wikipédia:Ateliers_Bases/Recherche ISSUE#:773; DATE:2020-08-04
int selected_rank = ID_NULL;
if (Bry_.Eq(rank, RANK_BEST)) {
selected_rank = ID_BEST;
}
else if (Bry_.Eq(rank, RANK_ALL)) {
selected_rank = ID_ALL;
}
else {
throw Err_.new_wo_type("rank must be 'best' or 'all', " + String_.new_u8(rank) + " given");
}
List_adp rv = List_adp_.New();
Wbase_claim_grp statements = entity.Get_claim_grp_or_null(propertyId);
if (statements == null)
return null;
int statements_len = statements.Len();
for (int i = 0; i < statements_len; i++) {
Wbase_claim_base statement = statements.Get_at(i);
if ( selected_rank == ID_ALL
|| (selected_rank == ID_BEST && statement.Rank_tid() == Wbase_claim_rank_.Tid__preferred)
) {
rv.Add(statement);
}
}
// no preferred exists; add normal
if (rv.Len() == 0 && selected_rank == ID_BEST) {
for (int i = 0; i < statements_len; i++) {
Wbase_claim_base statement = statements.Get_at(i);
if (statement.Rank_tid() == Wbase_claim_rank_.Tid__normal) {
rv.Add(statement);
}
}
}
// $serialization = $this->newClientStatementListSerializer()->serialize( $statements );
// $this->renumber( $serialization );
// return $serialization;
return rv.Len() == 0 ? null : (Wbase_claim_base[])rv.To_ary(Wbase_claim_base.class);
}
private static final int ID_NULL = 0, ID_BEST = 1, ID_ALL = 2;
private static final byte[]
RANK_BEST = Bry_.new_a7("best")
, RANK_ALL = Bry_.new_a7("all");
}

33
400_xowa/src/gplx/xowa/mediawiki/extensions/Wikibase/lib/includes/Store/XomwEntityRetrievingTermLookup.java
View File

@ -1,6 +1,6 @@
/*
XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012-2017 gnosygnu@gmail.com
Copyright (C) 2012-2020 gnosygnu@gmail.com
XOWA is licensed under the terms of the General Public License (GPL) Version 3,
or alternatively under the terms of the Apache License Version 2.0.
@ -13,17 +13,20 @@ The terms of each license can be found in the source code repository:
GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
*/
package gplx.xowa.mediawiki.extensions.Wikibase.lib.includes.Store; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.extensions.*; import gplx.xowa.mediawiki.extensions.Wikibase.*; import gplx.xowa.mediawiki.extensions.Wikibase.lib.*; import gplx.xowa.mediawiki.extensions.Wikibase.lib.includes.*;
import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.claims.enums.*; import gplx.xowa.xtns.wbases.claims.itms.*; import gplx.xowa.xtns.wbases.stores.*;
import gplx.xowa.xtns.wbases.*;
public class XomwEntityRetrievingTermLookup {
private final Wbase_doc_mgr entity_mgr;
public XomwEntityRetrievingTermLookup(Wbase_doc_mgr entity_mgr) {
this.entity_mgr = entity_mgr;
}
public byte[] getLabel_or_null(byte[] entityId, byte[] languageCode) {
Wdata_doc entity = entity_mgr.Get_by_xid_or_null(entityId);
return entity.Get_label_bry_or_null(languageCode);
}
}
package gplx.xowa.mediawiki.extensions.Wikibase.lib.includes.Store;
import gplx.xowa.xtns.wbases.Wdata_doc;
import gplx.xowa.xtns.wbases.stores.Wbase_doc_mgr;
public class XomwEntityRetrievingTermLookup {
private final Wbase_doc_mgr entity_mgr;
public XomwEntityRetrievingTermLookup(Wbase_doc_mgr entity_mgr) {
this.entity_mgr = entity_mgr;
}
public byte[] getLabel_or_null(byte[] entityId, byte[] languageCode) {
Wdata_doc entity = entity_mgr.Get_by_xid_or_null(entityId);
if (entity == null) return null; // must check for null; PAGE:fr.w:Wikipédia:Ateliers_Bases/Recherche ISSUE#:773; DATE:2020-08-04
return entity.Get_label_bry_or_null(languageCode);
}
}