jenkins-bot has submitted this change and it was merged.
Change subject: Publishing: Get revision id from Parsoid content-revision-id
header
......................................................................
Publishing: Get revision id from Parsoid content-revision-id header
Uses the content-revision-id header from parsoid introduced in I758957955.
Bug: 70755
Change-Id: I141fb5ddf527320925e985af53cca29acd22a40b
---
M ContentTranslationService.js
M pageloader/PageLoader.js
2 files changed, 8 insertions(+), 21 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ContentTranslationService.js b/ContentTranslationService.js
index 1032b78..e7bf55b 100644
--- a/ContentTranslationService.js
+++ b/ContentTranslationService.js
@@ -58,13 +58,12 @@
logger.profile( 'Fetch page' );
pageloader.load().then(
- function ( data ) {
- var segmenter, segmentedContent, revision;
+ function ( response ) {
+ var segmenter, segmentedContent;
try {
- revision = pageloader.getRevision( data );
logger.profile( 'Fetch page', { title: title,
sourceLanguage: sourceLanguage } );
logger.profile( 'Segment page' );
- segmenter = new CXSegmenter( data,
sourceLanguage );
+ segmenter = new CXSegmenter( response.body,
sourceLanguage );
segmenter.segment();
segmentedContent =
segmenter.getSegmentedContent();
logger.profile( 'Segment page', { title: title,
sourceLanguage: sourceLanguage } );
@@ -78,7 +77,7 @@
res.send( {
sourceLanguage: sourceLanguage,
title: title,
- revision: revision,
+ revision: response.revision,
segmentedContent: segmentedContent
} );
logger.debug( 'Page sent' );
diff --git a/pageloader/PageLoader.js b/pageloader/PageLoader.js
index 849a47f..76171de 100644
--- a/pageloader/PageLoader.js
+++ b/pageloader/PageLoader.js
@@ -39,26 +39,14 @@
return;
}
- deferred.resolve( body );
+ deferred.resolve( {
+ body: response.body,
+ revision: response.headers[
'content-revision-id' ]
+ } );
}
);
return deferred.promise;
-};
-
-/**
- * Gets article revision number from Parsoid html
- * @param {string} html The html returned from Parsoid
- * @return {integer} the revison id
- */
-PageLoader.prototype.getRevision = function ( data ) {
- var snippet, revision;
-
- // Cut down data string to make regex more efficient
- snippet = data.substr( data.indexOf( '<html' ), data.indexOf( '<head' )
);
- revision = snippet.match( /about=".*\/revision\/(.*?)">/ )[ 1 ];
-
- return parseInt( revision );
};
module.exports.PageLoader = PageLoader;
--
To view, visit https://gerrit.wikimedia.org/r/160059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I141fb5ddf527320925e985af53cca29acd22a40b
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Jsahleen <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: KartikMistry <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
