Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/207039
Change subject: Use Wikimedia REST API for accessing page data in Content Translation ...................................................................... Use Wikimedia REST API for accessing page data in Content Translation Bug: T92359 Change-Id: I85f5bf4005075326791c87cdadbaeac07316e03c --- M config.defaults.js M pageloader/PageLoader.js 2 files changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/39/207039/1 diff --git a/config.defaults.js b/config.defaults.js index bb1b583..d84e6a7 100644 --- a/config.defaults.js +++ b/config.defaults.js @@ -10,6 +10,7 @@ allowCORS: '*', // Parsoid API URL 'parsoid.api': 'http://parsoid-lb.eqiad.wikimedia.org', + 'restbase.url': 'https://rest.wikimedia.org/$lang.wikipedia.org/v1/page/html/$title', // Apertium web API URL 'mt.apertium.api': 'http://apertium.wmflabs.org', 'mt.yandex.api': 'https://translate.yandex.net', diff --git a/pageloader/PageLoader.js b/pageloader/PageLoader.js index 49a9ac2..a31ca9f 100644 --- a/pageloader/PageLoader.js +++ b/pageloader/PageLoader.js @@ -28,9 +28,16 @@ var url, deferred = Q.defer(); - url = conf( 'parsoid.api' ) + '/' + this.sourceLanguage + 'wiki/' + - encodeURIComponent( this.page ) + '?body=1'; - + if ( conf( 'restbase.url' ) ) { + url = conf( 'restbase.url' ) + .replace( '$lang', this.sourceLanguage ) + .replace( '$title', encodeURIComponent( this.page ) ); + // Restbase does not support body only retrieval of content + // See https://phabricator.wikimedia.org/T97395 + } else { + url = conf( 'parsoid.api' ) + '/' + this.sourceLanguage + 'wiki/' + + encodeURIComponent( this.page ) + '?body=1'; + } request( url, function ( error, response, body ) { if ( error ) { @@ -44,6 +51,8 @@ deferred.resolve( { body: response.body, + // Restbase does not give revision id, so following value will be undefined + // https://phabricator.wikimedia.org/T97393 revision: response.headers[ 'content-revision-id' ] } ); } -- To view, visit https://gerrit.wikimedia.org/r/207039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85f5bf4005075326791c87cdadbaeac07316e03c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits