[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Get base of concept URI of local repo from WikibaseRepo, don...

[WMDE-leszek (Code Review)]

WMDE-leszek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402385 )

Change subject: Get base of concept URI of local repo from WikibaseRepo, don't 
read from settings
......................................................................

Get base of concept URI of local repo from WikibaseRepo, don't read from 
settings

Preparation to integrate the setting into the "repositories"
setting.

Change-Id: I6c3ab76833f4c343aaab4cc000cb9236356529f5
---
M repo/Wikibase.hooks.php
M repo/includes/WikibaseRepo.php
M repo/maintenance/addUnitConversions.php
M repo/maintenance/updateUnits.php
4 files changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/85/402385/1

diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index ee2304b..5265967 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -784,8 +784,7 @@
 
                $data['wikibase-propertytypes'] = $propertyTypes;
 
-               $conceptBaseUri = $wikibaseRepo->getSettings()->getSetting( 
'conceptBaseUri' );
-               $data['wikibase-conceptbaseuri'] = $conceptBaseUri;
+               $data['wikibase-conceptbaseuri'] = 
$wikibaseRepo->getLocalConceptBaseUri();
 
                $geoShapeStorageBaseUrl = 
$wikibaseRepo->getSettings()->getSetting( 'geoShapeStorageBaseUrl' );
                $data['wikibase-geoshapestoragebaseurl'] = 
$geoShapeStorageBaseUrl;
@@ -893,7 +892,7 @@
                        return;
                }
 
-               $baseUri = 
WikibaseRepo::getDefaultInstance()->getSettings()->getSetting( 'conceptBaseUri' 
);
+               $baseUri = 
WikibaseRepo::getDefaultInstance()->getLocalConceptBaseUri();
                $navigationUrls['wb-concept-uri'] = [
                        'text' => $skinTemplate->msg( 'wikibase-concept-uri' ),
                        'href' => $baseUri . $title->getDBkey(),
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index d29f93f..7526ac7 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -997,7 +997,7 @@
        private function getVocabularyBaseUri() {
                //@todo: We currently use the local repo concept URI here. This 
should be configurable,
                // to e.g. allow 3rd parties to use Wikidata as their 
vocabulary repo.
-               return $this->settings->getSetting( 'conceptBaseUri' );
+               return $this->getLocalConceptBaseUri();
        }
 
        /**
@@ -1962,7 +1962,7 @@
                if ( !$unitStorage ) {
                        return null;
                }
-               return new UnitConverter( $unitStorage, 
$this->settings->getSetting( 'conceptBaseUri' ) );
+               return new UnitConverter( $unitStorage, 
$this->getLocalConceptBaseUri() );
        }
 
        /**
@@ -2074,6 +2074,10 @@
                return $this->repositoryDefinitions->getDatabaseNames()[''];
        }
 
+       public function getLocalConceptBaseUri() {
+               return $this->repositoryDefinitions->getConceptBaseUris()[''];
+       }
+
        /**
         * @return WikibaseServices
         */
diff --git a/repo/maintenance/addUnitConversions.php 
b/repo/maintenance/addUnitConversions.php
index 789b995..deb7a25 100644
--- a/repo/maintenance/addUnitConversions.php
+++ b/repo/maintenance/addUnitConversions.php
@@ -141,7 +141,7 @@
                }
 
                $baseUri = $this->getOption( 'base-uri',
-                               $wikibaseRepo->getSettings()->getSetting( 
'conceptBaseUri' ) );
+                               $wikibaseRepo->getLocalConceptBaseUri() );
                $this->client = new SPARQLClient( $endPoint, $baseUri );
                $format = $this->getOption( 'format', 'ttl' );
                $this->initializeWriter( $baseUri, $format );
diff --git a/repo/maintenance/updateUnits.php b/repo/maintenance/updateUnits.php
index e15d2c9..1dfe204 100644
--- a/repo/maintenance/updateUnits.php
+++ b/repo/maintenance/updateUnits.php
@@ -79,7 +79,7 @@
                        $this->error( 'SPARQL endpoint not defined', 1 );
                }
                $this->setBaseUri( $this->getOption( 'base-uri',
-                       $repo->getSettings()->getSetting( 'conceptBaseUri' ) ) 
);
+                       $repo->getLocalConceptBaseUri() ) );
                $this->client = new SPARQLClient( $endPoint, $this->baseUri );
 
                $unitClass = $this->getOption( 'unit-class' );

-- 
To view, visit https://gerrit.wikimedia.org/r/402385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c3ab76833f4c343aaab4cc000cb9236356529f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <leszek.mani...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits