mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Item.fromJSON(): Skip warnings for redundant invalid fields

Browse source
This commit is contained in:
Dan Stillman 2020-03-24 14:46:26 -04:00
parent 0b7f5fef83
commit 02c5510710
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
chrome/content/zotero/xpcom/data/item.js
View file

@ -4217,6 +4217,7 @@ Zotero.Item.prototype.fromJSON = function (json, options = {}) {
// TEMP until we move creator lines to real creators // TEMP until we move creator lines to real creators
.concat('creators') .concat('creators')
); );
var invalidFieldLogLines = new Map();
// Transfer valid fields from Extra to regular fields // Transfer valid fields from Extra to regular fields
// Currently disabled // Currently disabled
@ -4349,9 +4350,12 @@ Zotero.Item.prototype.fromJSON = function (json, options = {}) {
throw e; throw e;
} }
// Otherwise store in Extra // Otherwise store in Extra
Zotero.warn(`Storing invalid field '${origField}' for type ${type} in Extra for `
+ `item ${this.libraryKey}`);
extraFields.set(field, val); extraFields.set(field, val);
let msg = `Storing invalid field '${origField}' for type ${type} in Extra for `
+ `item ${this.libraryKey}`;
invalidFieldLogLines.set(field, msg);
continue; continue;
} }
this.setField(field, json[origField]); this.setField(field, json[origField]);
@ -4380,9 +4384,8 @@ Zotero.Item.prototype.fromJSON = function (json, options = {}) {
let mappedFieldNames = Zotero.ItemFields.getTypeFieldsFromBase(baseField, true); let mappedFieldNames = Zotero.ItemFields.getTypeFieldsFromBase(baseField, true);
for (let mappedField of mappedFieldNames) { for (let mappedField of mappedFieldNames) {
if (extraFields.has(mappedField)) { if (extraFields.has(mappedField)) {
Zotero.warn(`Removing redundant Extra field '${mappedField}' for item `
+ this.libraryKey);
extraFields.delete(mappedField); extraFields.delete(mappedField);
invalidFieldLogLines.delete(mappedField);
} }
} }
} }
@ -4403,9 +4406,8 @@ Zotero.Item.prototype.fromJSON = function (json, options = {}) {
let mappedFieldNames = Zotero.ItemFields.getTypeFieldsFromBase(baseField, true); let mappedFieldNames = Zotero.ItemFields.getTypeFieldsFromBase(baseField, true);
for (let mappedField of mappedFieldNames) { for (let mappedField of mappedFieldNames) {
if (extraFields.has(mappedField) && extraFields.get(mappedField) === value) { if (extraFields.has(mappedField) && extraFields.get(mappedField) === value) {
Zotero.warn(`Removing redundant Extra field '${mappedField}' for item `
+ this.libraryKey);
extraFields.delete(mappedField); extraFields.delete(mappedField);
invalidFieldLogLines.delete(mappedField);
} }
} }
} }
@ -4418,13 +4420,16 @@ Zotero.Item.prototype.fromJSON = function (json, options = {}) {
.concat('audioFileType'); .concat('audioFileType');
for (let typeFieldName of typeFieldNames) { for (let typeFieldName of typeFieldNames) {
if (extraFields.has(typeFieldName)) { if (extraFields.has(typeFieldName)) {
Zotero.warn(`Removing invalid-for-type Type field '${typeFieldName}' from Extra for item `
+ this.libraryKey);
extraFields.delete(typeFieldName); extraFields.delete(typeFieldName);
invalidFieldLogLines.delete(mappedField);
} }
} }
} }
for (let line of invalidFieldLogLines.values()) {
Zotero.warn(line);
}
if (extra || extraFields.size || this.getField('extra')) { if (extra || extraFields.size || this.getField('extra')) {
this.setField('extra', Zotero.Utilities.Internal.combineExtraFields(extra, extraFields)); this.setField('extra', Zotero.Utilities.Internal.combineExtraFields(extra, extraFields));
} }