Skip to content

Fix Empty Field Handling in RIS Parser #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AliAzlanDev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Empty Field Handling in RIS Parser #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions modules/ris.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,19 @@ export function parseRef(refString, settings) {
if (!parsedLine) { // Doesn't match key=val spec
if (line.replace(/\s+/, '') && lastField) { // Line isn't just whitespace + We have a field to append to - append with \r delimiters
if (lastField.inputArray) { // Treat each line feed like an array entry
ref[lastField.rl].push(line);
const currentValue = ref[lastField.rl];
if (Array.isArray(currentValue)) {
currentValue.push(line);
} else {
ref[lastField.rl] = [line];
}
} else { // Assume we append each line entry as a string with settings.delimeter
ref[lastField.rl] += settings.delimeter + line;
const currentValue = ref[lastField.rl];
if (typeof currentValue === 'string') {
ref[lastField.rl] = currentValue + settings.delimeter + line;
} else {
ref[lastField.rl] = line;
}
}
}
return; // Stop processing this line
Expand All @@ -159,18 +169,29 @@ export function parseRef(refString, settings) {
if (!fieldLookup) { // Skip unknown field translations
lastField = null;
return;
} else if (fieldLookup.rl == 'type') { // Special handling for ref types
ref[fieldLookup.rl] = translations.types.rawMap.get(parsedLine.value)?.rl || settings.defaultType;
}

// Make sure the value is not empty before proceeding
const trimmedValue = parsedLine.value?.trim();
if (!trimmedValue) {
// Empty value, don't set this field or use it as lastField
lastField = null;
return;
}

if (fieldLookup.rl == 'type') { // Special handling for ref types
ref[fieldLookup.rl] = translations.types.rawMap.get(trimmedValue)?.rl || settings.defaultType;
lastField = fieldLookup; // Track last key so we can append to it on the next cycle
} else if (fieldLookup.inputArray) { // Should this `rl` key be treated like an appendable array?
if (!ref[fieldLookup.rl] || !Array.isArray(ref[fieldLookup.rl])) { // Array doesn't exist yet
ref[fieldLookup.rl] = [parsedLine.value];
const currentValue = ref[fieldLookup.rl];
if (Array.isArray(currentValue)) {
currentValue.push(trimmedValue);
} else {
ref[fieldLookup.rl].push(parsedLine.value);
ref[fieldLookup.rl] = [trimmedValue];
}
lastField = fieldLookup;
} else { // Simple key=val
ref[fieldLookup.rl] = parsedLine.value;
ref[fieldLookup.rl] = trimmedValue;
lastField = fieldLookup;
}
})
Expand Down