Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346749 )
Change subject: Remove backwards compatibility from basefields
......................................................................
Remove backwards compatibility from basefields
Basefields format currently returns both the basefield
and the more specific fields; this was done for backwards
compatibility, which is no longer needed.
Bug: T114515
Change-Id: I7b0e69d7e83bb7b663dd3590fb53e32c64f2bf11
---
M lib/Exporter.js
M test/features/scraping/baseFields.js
2 files changed, 12 insertions(+), 20 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/Exporter.js b/lib/Exporter.js
index 895cddb..75ceeb1 100644
--- a/lib/Exporter.js
+++ b/lib/Exporter.js
@@ -256,8 +256,10 @@
var baseFields = types.getBaseFields(content.itemType);
Object.keys(baseFields).forEach(function(field){
if (content[field]){
- // Add base field to citation as well
+ // Add basefield
content[baseFields[field]] = content[field];
+ // Remove original field
+ delete content[field];
}
});
return citation;
diff --git a/test/features/scraping/baseFields.js
b/test/features/scraping/baseFields.js
index 5ea4316..f399ad4 100644
--- a/test/features/scraping/baseFields.js
+++ b/test/features/scraping/baseFields.js
@@ -12,17 +12,15 @@
before(function () { return server.start(); });
- describe(' using basefields param', function() {
+ describe('using basefields param', function() {
- describe(' using zotero results', function() {
+ describe('using zotero results', function() {
it('conferencePaper', function() {
return server.query('10.1007/11926078_68', 'mediawiki', 'en',
'1').then(function(res) {
assert.status(res, 200);
assert.deepEqual(!!res.body[0].publicationTitle, true,
'Missing publicationTitle field');
- assert.deepEqual(!!res.body[0].proceedingsTitle, true,
'Missing proceedingsTitle field');
- //TODO replace above line with below line once backwards
compatibility is no longer needed
- //assert.deepEqual(res.body[0].bookTitle, undefined,
'Invalid field bookTitle');
+ assert.deepEqual(res.body[0].proceedingsTitle, undefined,
'Not missing proceedingsTitle field');
});
});
@@ -31,9 +29,7 @@
'mediawiki', 'en', 'true').then(function(res) {
assert.status(res, 200);
assert.deepEqual(!!res.body[0].publicationTitle, true,
'Missing publicationTitle field');
- assert.deepEqual(!!res.body[0].encyclopediaTitle, true,
'Missing encyclopediaTitle field');
- //TODO replace above line with below line once backwards
compatibility is no longer needed
- //assert.deepEqual(res.body[0].encyclopediaTitle,
undefined, 'Invalid field encyclopediaTitle');
+ assert.deepEqual(res.body[0].encyclopediaTitle, undefined,
'Not missing encyclopediaTitle field');
});
});
@@ -41,15 +37,14 @@
});
- describe(' using native scraper', function() {
+ describe('using native scraper', function() {
it('webpage', function() {
return server.query('http://example.com',
'mediawiki', 'en', 'true').then(function(res) {
assert.status(res, 200);
assert.deepEqual(!!res.body[0].publicationTitle, true,
'Missing publicationTitle field');
- assert.deepEqual(!!res.body[0].websiteTitle, true,
'Missing websiteTitle field');
- //assert.deepEqual(res.body[0].websiteTitle, undefined,
'Invalid field websiteTitle');
+ assert.deepEqual(res.body[0].websiteTitle, undefined, 'Not
missing websiteTitle field');
});
});
@@ -64,9 +59,7 @@
return server.query('10.1007/11926078_68', 'basefields',
'en').then(function(res) {
assert.status(res, 200);
assert.deepEqual(!!res.body[0].publicationTitle, true,
'Missing publicationTitle field');
- assert.deepEqual(!!res.body[0].proceedingsTitle, true,
'Missing proceedingsTitle field');
- //TODO replace above line with below line once backwards
compatibility is no longer needed
- //assert.deepEqual(res.body[0].bookTitle, undefined,
'Invalid field bookTitle');
+ assert.deepEqual(!!res.body[0].proceedingsTitle, false,
'Missing proceedingsTitle field');
});
});
@@ -75,9 +68,7 @@
'basefields', 'en', 'true').then(function(res) {
assert.status(res, 200);
assert.deepEqual(!!res.body[0].publicationTitle, true,
'Missing publicationTitle field');
- assert.deepEqual(!!res.body[0].encyclopediaTitle, true,
'Missing encyclopediaTitle field');
- //TODO replace above line with below line once backwards
compatibility is no longer needed
- //assert.deepEqual(res.body[0].encyclopediaTitle,
undefined, 'Invalid field encyclopediaTitle');
+ assert.deepEqual(!!res.body[0].encyclopediaTitle, false,
'Missing encyclopediaTitle field');
});
});
@@ -92,8 +83,7 @@
'basefields', 'en', 'false').then(function(res) {
assert.status(res, 200);
assert.deepEqual(!!res.body[0].publicationTitle, true,
'Missing publicationTitle field');
- assert.deepEqual(!!res.body[0].websiteTitle, true,
'Missing websiteTitle field');
- //assert.deepEqual(res.body[0].websiteTitle, undefined,
'Invalid field websiteTitle');
+ assert.deepEqual(!!res.body[0].websiteTitle, false,
'Missing websiteTitle field');
});
});
--
To view, visit https://gerrit.wikimedia.org/r/346749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b0e69d7e83bb7b663dd3590fb53e32c64f2bf11
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz <mv...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
