Skip to content

Commit 75c2f58

Browse files
committed
Handle unknown flag values in MCC
1 parent 6373564 commit 75c2f58

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

mcc/src/org/labkey/mcc/etl/ProjectAssignmentTransform.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public class ProjectAssignmentTransform extends ColumnTransform
2828
private static final String U24_BREEDER = "U24 breeder";
2929
private static final String U24_OFFSPRING = "U24 offspring";
3030
private static final String U24_OTHER = "Other";
31+
private static final String U24_INACTIVE = "U24 marmoset breeding- INACTIVE -";
3132

3233
@Override
3334
protected Object doTransform(Object inputValue)
@@ -42,6 +43,10 @@ protected Object doTransform(Object inputValue)
4243
{
4344
return getOrCreateFlag(U24_TITLE);
4445
}
46+
else if (U24_INACTIVE.equalsIgnoreCase(String.valueOf(inputValue)))
47+
{
48+
return getOrCreateFlag(U24_INACTIVE);
49+
}
4550
// SNPRC:
4651
else if (U24_BREEDER.equalsIgnoreCase(String.valueOf(inputValue)))
4752
{
@@ -51,8 +56,11 @@ else if (U24_OFFSPRING.equalsIgnoreCase(String.valueOf(inputValue)))
5156
{
5257
return getOrCreateFlag(U24_OFFSPRING);
5358
}
54-
55-
return inputValue;
59+
else
60+
{
61+
_log.error("Unknown flag value: " + inputValue + ", in folder: " + getContainerUser().getContainer().getPath());
62+
return null;
63+
}
5664
}
5765

5866
private String getOrCreateFlag(String type)

0 commit comments

Comments
 (0)