Skip to content
Snippets Groups Projects
Commit fcd2b796 authored by felmer's avatar felmer
Browse files

if property not found try also upper-case

SVN: 23082
parent 5a129063
No related branches found
No related tags found
No related merge requests found
...@@ -99,13 +99,13 @@ public class DataSetInfoExtractorForProteinResults extends AbstractDataSetInfoEx ...@@ -99,13 +99,13 @@ public class DataSetInfoExtractorForProteinResults extends AbstractDataSetInfoEx
service.registerExperiment(experiment); service.registerExperiment(experiment);
DataSetInformation info = new DataSetInformation(); DataSetInformation info = new DataSetInformation();
info.setExperimentIdentifier(experimentIdentifier); info.setExperimentIdentifier(experimentIdentifier);
String parentDataSetCodesOrNull = properties.getProperty(PARENT_DATA_SET_CODES); String parentDataSetCodesOrNull = getProperty(properties, PARENT_DATA_SET_CODES);
if (parentDataSetCodesOrNull != null) if (parentDataSetCodesOrNull != null)
{ {
info.setParentDataSetCodes(Arrays.asList(StringUtils.split(parentDataSetCodesOrNull))); info.setParentDataSetCodes(Arrays.asList(StringUtils.split(parentDataSetCodesOrNull)));
} else } else
{ {
String baseExperimentIdentifier = properties.getProperty(EXPERIMENT_IDENTIFIER_KEY); String baseExperimentIdentifier = getProperty(properties, EXPERIMENT_IDENTIFIER_KEY);
if (baseExperimentIdentifier != null) if (baseExperimentIdentifier != null)
{ {
ExperimentIdentifier identifier = new ExperimentIdentifierFactory(baseExperimentIdentifier).createIdentifier(); ExperimentIdentifier identifier = new ExperimentIdentifierFactory(baseExperimentIdentifier).createIdentifier();
...@@ -127,6 +127,16 @@ public class DataSetInfoExtractorForProteinResults extends AbstractDataSetInfoEx ...@@ -127,6 +127,16 @@ public class DataSetInfoExtractorForProteinResults extends AbstractDataSetInfoEx
return info; return info;
} }
private String getProperty(Properties properties, String key)
{
String property = properties.getProperty(key);
if (property == null)
{
property = properties.getProperty(key.toUpperCase());
}
return property;
}
private Properties loadSearchProperties(File propertiesFile) private Properties loadSearchProperties(File propertiesFile)
{ {
Properties properties; Properties properties;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment