Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304199
Change subject: Revert "Rewrite wikitext parsing regular expressions in
QuerySamples"
......................................................................
Revert "Rewrite wikitext parsing regular expressions in QuerySamples"
This reverts commit 19b3d04e4f8ebf8528423b7564717cc44dc54bbe.
Change-Id: I10cc04cfc8ccf67c4ea2a9153f655cb03235f081
---
M wikibase/queryService/api/QuerySamples.js
1 file changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/99/304199/1
diff --git a/wikibase/queryService/api/QuerySamples.js
b/wikibase/queryService/api/QuerySamples.js
index 8214688..db8f0fb 100644
--- a/wikibase/queryService/api/QuerySamples.js
+++ b/wikibase/queryService/api/QuerySamples.js
@@ -38,10 +38,13 @@
},
dataType: 'jsonp'
} )
- .done( function ( data ) {
- var wikitext = data.query.pages[Object.keys(
data.query.pages )].revisions[0]['*'];
- deferred.resolve( self._extract( wikitext ) );
- } );
+ .done(
+ function ( data ) {
+ var wikitext =
data.query.pages[Object.keys( data.query.pages )].revisions[0]['*'];
+ wikitext = wikitext.replace(
/\{\{!\}\}/g, '|' );
+
+ deferred.resolve( self._extract(
wikitext ) );
+ } );
return deferred;
};
@@ -74,10 +77,10 @@
* @private
*/
SELF.prototype._extractExamples = function ( section, sectionHeader ) {
- var regexParagraph =
/^=+([^=]+)=+\n[^=]*?(\{\{SPARQL\s*\|[\s\S]*?\}\})/gm,
- regexQuery = /\|\s*query\s*=([^|]*?)(?:\||\}\})/,
- regexExtraPrefix =
/\|\s*extraprefix\s*=([^|]*?)(?:\||\}\})/,
- regexTags = /\{\{Q\|([^{|}]+)\|([^{|}]+)\}\}/gi,
+ var regexParagraph =
/(?:[\=]+)([^\=]*)(?:[\=]+)\n(?:[]*?)(?:[^=]*?)({{SPARQL\s*\|[\s\S]*?}}\n){1}/g,
+ regexQuery = /query\s*\=([^]+)(?:}}|\|)/,
+ regexExtraPrefix = /extraprefix\s*\=([^]+?)(?:\||}})+/,
+ regexTags = /{{Q\|([^]+?)\|([^]+?)}}+/g,
m,
examples = [];
@@ -85,7 +88,7 @@
var paragraph = m[0], title = m[1].trim(), tags = [],
tag,
href = PAGE_URL + '#' + encodeURIComponent(
title.replace( / /g, '_' ) ).replace( /%/g, '.' ),
sparqlTemplate = m[2],
- query = sparqlTemplate.match( regexQuery
)[1].replace( /\{\{!\}\}/g, '|' ).trim();
+ query = sparqlTemplate.match( regexQuery
)[1].trim();
if ( sparqlTemplate.match( regexExtraPrefix ) ) {
query = sparqlTemplate.match( regexExtraPrefix
)[1] + '\n\n' + query;
--
To view, visit https://gerrit.wikimedia.org/r/304199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10cc04cfc8ccf67c4ea2a9153f655cb03235f081
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
