Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/123879
Change subject: Remove usage of Wikibase\SiteLink in RdfBuilder
......................................................................
Remove usage of Wikibase\SiteLink in RdfBuilder
Change-Id: I726d25c1da1c964ce3ddc00a50a3d58508a2ac22
---
M repo/includes/rdf/RdfBuilder.php
1 file changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/79/123879/1
diff --git a/repo/includes/rdf/RdfBuilder.php b/repo/includes/rdf/RdfBuilder.php
index 71e4449..edd14df 100644
--- a/repo/includes/rdf/RdfBuilder.php
+++ b/repo/includes/rdf/RdfBuilder.php
@@ -7,7 +7,7 @@
use EasyRdf_Literal;
use EasyRdf_Namespace;
use EasyRdf_Resource;
-use Sites;
+use SiteSQLStore;
/**
* RDF mapping for wikibase data model.
@@ -39,6 +39,11 @@
const CC_URI = 'http://creativecommons.org/ns#';
const WIKIBASE_STATEMENT_QNAME = 'wikibase:Statement';
+
+ /**
+ * @var SiteList
+ */
+ private $sites;
/**
* Map of qnames to namespace URIs
@@ -74,6 +79,8 @@
$this->graph = $graph;
$this->baseUri = $baseUri;
$this->dataUri = $dataUri;
+
+ $this->sites = SiteSQLStore::newInstance()->getSites();
$this->namespaces = array(
self::NS_ONTOLOGY => self::ONTOLOGY_BASE_URI,
@@ -321,18 +328,19 @@
public function addSiteLinks( Item $item ) {
$entityResource = $this->getEntityResource( $item->getId() );
- foreach ( $item->getSiteLinks() as $link ) {
- // FIXME: deprecated method usage
- $link = new SiteLink( Sites::singleton()->getSite(
$link->getSiteId() ), $link->getPageName() );
+ foreach ( $item->getSiteLinks() as $siteLink ) {
+ $site = $this->sites->getSite( $siteLink->getSiteId() );
+ $url = $site->getPageUrl( $siteLink->getPageName() );
- $languageCode = $link->getSite()->getLanguageCode();
+ $languageCode = $site->getLanguageCode();
if ( !$this->isLanguageIncluded( $languageCode ) ) {
continue;
}
//XXX: ideally, we'd use https if the target site
supports it.
- $url = wfExpandUrl( $link->getUrl(), PROTO_HTTP );
+ $baseUrl = $site->getPageUrl( $siteLink->getPageName()
);
+ $url = wfExpandUrl( $baseUrl, PROTO_HTTP );
$pageRecourse = $this->graph->resource( $url );
$pageRecourse->addResource( 'rdf:type',
self::NS_SCHEMA_ORG . ':Article' );
--
To view, visit https://gerrit.wikimedia.org/r/123879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I726d25c1da1c964ce3ddc00a50a3d58508a2ac22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
