Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/242570
Change subject: Use Parsoid v3 API (which is identical to RESTBase v1 API).
......................................................................
Use Parsoid v3 API (which is identical to RESTBase v1 API).
Change-Id: Ic2e832eb92a0cd0352de407b7337d549fa178212
---
M config.defaults.js
M pageloader/PageLoader.js
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/70/242570/1
diff --git a/config.defaults.js b/config.defaults.js
index 094c31d..81a612a 100644
--- a/config.defaults.js
+++ b/config.defaults.js
@@ -24,7 +24,8 @@
// Accept requests from the given domains. * for all domains.
allowCORS: '*',
// Parsoid API URL
- 'parsoid.api': 'http://parsoid-lb.eqiad.wikimedia.org',
+ 'parsoid.api':
'http://parsoid-lb.eqiad.wikimedia.org/@lang.wikipedia.org/v3/page/html/@title',
+ // RESTBase API URL
'restbase.url':
'https://@lang.wikipedia.org/api/rest_v1/page/html/@title',
// Apertium web API URL
'mt.apertium.api': 'http://apertium.wmflabs.org',
diff --git a/pageloader/PageLoader.js b/pageloader/PageLoader.js
index 890d9d3..e2c7aa7 100644
--- a/pageloader/PageLoader.js
+++ b/pageloader/PageLoader.js
@@ -53,8 +53,9 @@
.replace( '@lang', this.sourceLanguage )
.replace( '@title', encodeURIComponent( this.page ) );
} else {
- url = conf( 'parsoid.api' ) + '/' + this.sourceLanguage +
'wiki/' +
- encodeURIComponent( this.page );
+ url = conf( 'parsoid.api' )
+ .replace( '@lang', this.sourceLanguage )
+ .replace( '@title', encodeURIComponent( this.page ) );
}
request( url,
function ( error, response, body ) {
--
To view, visit https://gerrit.wikimedia.org/r/242570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2e832eb92a0cd0352de407b7337d549fa178212
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
