[MediaWiki-commits] [Gerrit] Link query endpoint - change (wikidata...rdf)
jenkins-bot has submitted this change and it was merged.
Change subject: Link query endpoint
..
Link query endpoint
Change-Id: I758d2275e47369a73e4628c080b818c4e3338b0e
---
M gui/index.html
M gui/style.css
M gui/wikibase/queryService/api/Sparql.js
M gui/wikibase/queryService/ui/App.js
4 files changed, 62 insertions(+), 7 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gui/index.html b/gui/index.html
index 802435e..6c2f8ab 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -53,6 +53,7 @@
https://github.com/wikimedia/wikidata-query-rdf/blob/master/docs/exploring-linked-data.md;>Exploring
Linked Data
https://tools.wmflabs.org/wdq2sparql/w2s.php;>WDQ Syntax
Translator
+ https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual#SPARQL_endpoint;>SPARQL
REST Endpoint
Help
@@ -98,7 +99,15 @@
Simple TSV
Full JSON
- ShortUrl
+
+
+ Link
+
+
+ Create Short URL
+ SPARQL
Query
+
+
diff --git a/gui/style.css b/gui/style.css
index 8910a31..e2c276e 100644
--- a/gui/style.css
+++ b/gui/style.css
@@ -62,3 +62,9 @@
.actionMessage {
display: none;
}
+
+iframe.shortUrl {
+ border: none;
+ width: 250px;
+ height: 40px;
+}
\ No newline at end of file
diff --git a/gui/wikibase/queryService/api/Sparql.js
b/gui/wikibase/queryService/api/Sparql.js
index 2de8db1..e115b12 100644
--- a/gui/wikibase/queryService/api/Sparql.js
+++ b/gui/wikibase/queryService/api/Sparql.js
@@ -45,6 +45,13 @@
SELF.prototype._rawData = null;
/**
+* @property {string}
+* @private
+**/
+ SELF.prototype._queryUri = null;
+
+
+ /**
* Submit a query to the API
*
* @return {jQuery.Promise}
@@ -86,18 +93,18 @@
* @return {jQuery.Promise}
*/
SELF.prototype.query = function(query) {
- var deferred = $.Deferred(), self = this;
-
- var url = SERVICE + '?' + query, settings = {
+ var deferred = $.Deferred(), self = this, settings = {
'headers' : {
'Accept' : 'application/sparql-results+json'
},
};
+ this._queryUri = SERVICE + '?' + query;
+
this._executionTime = Date.now();
- $.ajax( url, settings ).done(function( data, textStatus, jqXHR
) {
+ $.ajax( this._queryUri, settings ).done(function( data,
textStatus, jqXHR ) {
self._executionTime = Date.now() - self._executionTime;
- self._resultLength = data.results.bindings.length ||
null;
+ self._resultLength = data.results.bindings.length || 0;
self._rawData = data;
deferred.resolve();
@@ -179,6 +186,15 @@
};
/**
+* Get query URI
+*
+* @return {string}
+*/
+ SELF.prototype.getQueryUri = function() {
+ return this._queryUri;
+ };
+
+ /**
* Get the result as table
*
* @return {jQuery}
diff --git a/gui/wikibase/queryService/ui/App.js
b/gui/wikibase/queryService/ui/App.js
index e9b83e1..fb682bc 100644
--- a/gui/wikibase/queryService/ui/App.js
+++ b/gui/wikibase/queryService/ui/App.js
@@ -7,6 +7,7 @@
"use strict";
var SHORTURL = 'http://tinyurl.com/create.php?url=';
+ var SHORTURL_API = 'http://tinyurl.com/api-create.php?url=';
var EXPLORE_URL =
[MediaWiki-commits] [Gerrit] Link query endpoint - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/255413
Change subject: Link query endpoint
..
Link query endpoint
Change-Id: I758d2275e47369a73e4628c080b818c4e3338b0e
---
M gui/index.html
M gui/wikibase/queryService/api/Sparql.js
M gui/wikibase/queryService/ui/App.js
3 files changed, 24 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/13/255413/1
diff --git a/gui/index.html b/gui/index.html
index f14bb55..e76012e 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -99,6 +99,7 @@
Full JSON
ShortUrl
+ Query
diff --git a/gui/wikibase/queryService/api/Sparql.js
b/gui/wikibase/queryService/api/Sparql.js
index 2de8db1..f86b8e7 100644
--- a/gui/wikibase/queryService/api/Sparql.js
+++ b/gui/wikibase/queryService/api/Sparql.js
@@ -45,6 +45,13 @@
SELF.prototype._rawData = null;
/**
+* @property {string}
+* @private
+**/
+ SELF.prototype._queryUri = null;
+
+
+ /**
* Submit a query to the API
*
* @return {jQuery.Promise}
@@ -86,16 +93,16 @@
* @return {jQuery.Promise}
*/
SELF.prototype.query = function(query) {
- var deferred = $.Deferred(), self = this;
-
- var url = SERVICE + '?' + query, settings = {
+ var deferred = $.Deferred(), self = this, settings = {
'headers' : {
'Accept' : 'application/sparql-results+json'
},
};
+ this._queryUri = SERVICE + '?' + query;
+
this._executionTime = Date.now();
- $.ajax( url, settings ).done(function( data, textStatus, jqXHR
) {
+ $.ajax( this._queryUri, settings ).done(function( data,
textStatus, jqXHR ) {
self._executionTime = Date.now() - self._executionTime;
self._resultLength = data.results.bindings.length ||
null;
self._rawData = data;
@@ -179,6 +186,15 @@
};
/**
+* Get query URI
+*
+* @return {string}
+*/
+ SELF.prototype.getQueryUri = function() {
+ return this._queryUri;
+ };
+
+ /**
* Get the result as table
*
* @return {jQuery}
diff --git a/gui/wikibase/queryService/ui/App.js
b/gui/wikibase/queryService/ui/App.js
index a20faff..e7761c3 100644
--- a/gui/wikibase/queryService/ui/App.js
+++ b/gui/wikibase/queryService/ui/App.js
@@ -259,6 +259,7 @@
}
$( '#shorturl' ).attr( 'href', SHORTURL + encodeURIComponent(
window.location ) );
+
$( '#query-result' ).empty( '' );
$( '#query-result' ).hide();
$( '#total' ).hide();
@@ -267,6 +268,8 @@
var query = $( '#query-form' ).serialize(), api =
this._sparqlApi;
this._sparqlApi.query(query).done(function(){
+
+ $( '.queryUri' ).attr(
'href',self._sparqlApi.getQueryUri() );
$( '#total-results' ).text( api.getResultLength() );
$( '#query-time' ).text( api.getExecutionTime() );
$( '#total' ).show();
--
To view, visit https://gerrit.wikimedia.org/r/255413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I758d2275e47369a73e4628c080b818c4e3338b0e
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
