Author: echatellier Date: 2013-05-15 14:29:06 +0200 (Wed, 15 May 2013) New Revision: 119 Url: http://forge.codelutin.com/projects/jmexico/repository/revisions/119 Log: refs #2426: Add option to import scenario files using xml or csv depending on file extension Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java 2013-05-15 12:16:35 UTC (rev 118) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/parser/ScenarioCSVParser.java 2013-05-15 12:29:06 UTC (rev 119) @@ -84,13 +84,16 @@ CsvReader csvReader = null; try { + + // csv file doesn't contains headers, so it's not a real + // csv file csvReader = new CsvReader(Files.newReader(file, Charsets.UTF_8), ','); - csvReader.readHeaders(); Map<Factor, Object> factorValues = Maps.newLinkedHashMap(); while (csvReader.readRecord()) { - String factorName = csvReader.get("factorname"); + // factor name + String factorName = csvReader.get(0); Factor factor = factors.get(factorName); @@ -112,7 +115,7 @@ ValueType valueType = factor.getDomain().getValueType(); // factor value - String value = csvReader.get("factorvalue"); + String value = csvReader.get(1); factorValues.put(factor, MexicoUtil.getTypedValue(valueType, value)); }