diff --git a/elispot_assay/src/org/labkey/elispot_assay/assay/AIDImportMethod.java b/elispot_assay/src/org/labkey/elispot_assay/assay/AIDImportMethod.java index 6606c1593..f99393759 100644 --- a/elispot_assay/src/org/labkey/elispot_assay/assay/AIDImportMethod.java +++ b/elispot_assay/src/org/labkey/elispot_assay/assay/AIDImportMethod.java @@ -22,6 +22,8 @@ import java.io.IOException; import java.io.StringWriter; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.ListIterator; @@ -291,17 +293,19 @@ protected List> processRows(List> rows, private enum PLATE { - spot("Spot counts:", "spots"), - saturation("Well's saturation values (%)", "saturation"), - cytokine("Cytokine Activities:", "cytokine"); + spot("Spot counts:", "spots", Collections.singletonList("Number of Spots:")), + saturation("Well's saturation values (%)", "saturation", Collections.singletonList("Well's saturation values (%)")), + cytokine("Cytokine Activities:", "cytokine", Collections.singletonList("Activity:")); private String description; private String field; + private Collection aliases; - PLATE(String description, String field) + PLATE(String description, String field, Collection aliases) { this.description = description; this.field = field; + this.aliases = aliases; } public static PLATE getByDescription(String description) @@ -310,6 +314,16 @@ public static PLATE getByDescription(String description) { if (t.description.equalsIgnoreCase(description)) return t; + else if (t.aliases != null) + { + for (String alias : t.aliases) + { + if (alias.equals(description)) + { + return t; + } + } + } } return null; }