Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/272943
Change subject: Make SPARQL service URI injectable
......................................................................
Make SPARQL service URI injectable
Change-Id: I2a7547bd7d789f746f6e608eb03c6cc227cc6874
---
M wikibase/queryService/api/Sparql.js
M wikibase/queryService/ui/App.js
2 files changed, 21 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/43/272943/1
diff --git a/wikibase/queryService/api/Sparql.js
b/wikibase/queryService/api/Sparql.js
index b04f64f..c6dd888 100644
--- a/wikibase/queryService/api/Sparql.js
+++ b/wikibase/queryService/api/Sparql.js
@@ -5,7 +5,7 @@
wikibase.queryService.api.Sparql = ( function($) {
'use strict';
- var SERVICE = '/bigdata/namespace/wdq/sparql';
+ var SPARQL_SERVICE_URI =
'//query.wikidata.org/bigdata/namespace/wdq/sparql';
/**
* SPARQL API for the Wikibase query service
@@ -16,9 +16,23 @@
* @author Stanislav Malyshev
* @author Jonas Kress
* @constructor
+ *
+ * @param {string} (optional) serviceUri URI to the SPARQL service
endpoint
*/
- function SELF() {
+ function SELF( serviceUri ) {
+
+ if( serviceUri ){
+ this._serviceUri = serviceUri;
+ }else{
+ serviceUri = SPARQL_SERVICE_URI;
+ }
}
+
+ /**
+ * @property {int}
+ * @private
+ **/
+ SELF.prototype._serviceUri = null;
/**
* @property {int}
@@ -60,7 +74,7 @@
var deferred = $.Deferred(),
query = encodeURI( 'prefix schema: <http://schema.org/> ' +
'SELECT * WHERE {<http://www.wikidata.org>
schema:dateModified ?y}' ),
- url = SERVICE + '?query=' + query, settings = {
+ url = this._serviceUri + '?query=' + query, settings = {
'headers' : {
'Accept' : 'application/sparql-results+json'
}
@@ -102,7 +116,7 @@
}
};
- this._queryUri = SERVICE + '?' + query;
+ this._queryUri = this._serviceUri + '?' + query;
this._executionTime = Date.now();
$.ajax( this._queryUri, settings ).done(function( data,
textStatus, jqXHR ) {
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 41a949e..688e638 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -6,6 +6,8 @@
wikibase.queryService.ui.App = ( function( $, mw ) {
"use strict";
+ var SPARQL_SERVICE_URI = '/bigdata/namespace/wdq/sparql';
+
var SHORTURL = '//tinyurl.com/create.php?url=';
var SHORTURL_API = '//tinyurl.com/api-create.php?url=';
var EXPLORE_URL = 'http://www.wikidata.org/entity/Q';
@@ -74,7 +76,7 @@
SELF.prototype._init = function() {
if( !this._sparqlApi ){
- this._sparqlApi = new
wikibase.queryService.api.Sparql();
+ this._sparqlApi = new wikibase.queryService.api.Sparql(
SPARQL_SERVICE_URI );
}
if( !this._querySamplesApi ){
--
To view, visit https://gerrit.wikimedia.org/r/272943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a7547bd7d789f746f6e608eb03c6cc227cc6874
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
