Skip to content

Empty line with mvtc column should be treated as empty line #7493

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
XingY wants to merge 1 commit into
base: develop
Choose a base branch
from
+8 −1
Open

Empty line with mvtc column should be treated as empty line #7493

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
9 changes: 8 additions & 1 deletion api/src/org/labkey/api/reader/DataLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,7 @@ protected final Map<String, Object> convertValues(Object[] fields)
boolean foundData = false;
for (int i = 0; i < _activeColumns.length; i++)
{
boolean isEmptyArray = false;
ColumnDescriptor column = _activeColumns[i];
if (_preserveEmptyString && null == column.missingValues)
{
Expand Down Expand Up @@ -831,6 +832,12 @@ else if (column.clazz == MultiChoice.Array.class)
// GitHub Issue 925: Not providing a MVTC value in an assay result throws error
// convert blank to empty array, not null
values[i] = column.converter.convert(column.clazz, fld);
if (values[i] instanceof MultiChoice.Array array)
{
// If line is blank, array will be empty array instead of null
if (array.isEmpty())
isEmptyArray = true;
}
}
else
{
Expand Down Expand Up @@ -878,7 +885,7 @@ else if (ERROR_VALUE_USE_ORIGINAL.equals(column.errorValues))
values[i] = column.errorValues;
}

if (values[i] != null)
if (values[i] != null && !isEmptyArray)
foundData = true;
}

Expand Down
Loading