Author: tchemit Date: 2013-05-30 21:50:25 +0200 (Thu, 30 May 2013) New Revision: 1057 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1057 Log: fixes #2538: [EXPORT GENERIQUE] c'est ti donc pourquoi que les lignes sont r?\195?\169p?\195?\169t?\195?\169es dans la table species ? Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-30 16:10:16 UTC (rev 1056) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-30 19:50:25 UTC (rev 1057) @@ -623,7 +623,7 @@ SpeciesExportModel speciesModel; - final Set<SpeciesExportRow> speciesToExport = Sets.newHashSet(); + final Map<String, SpeciesExportRow> speciesToExport = Maps.newTreeMap(); TuttiCsvUtil.TuttiRepeatableExport<SurveyExportRow> surveyExport; @@ -755,15 +755,20 @@ } public void addSpecies(Species species) { - Species fullSpecies = speciesById.get(species.getId()); - SpeciesExportRow row = new SpeciesExportRow(); - row.setSpecies(fullSpecies); - speciesToExport.add(row); + String speciesId = species.getId(); + if (!speciesToExport.containsKey(speciesId)) { + + // not treated species, add a new row + Species fullSpecies = speciesById.get(speciesId); + SpeciesExportRow row = new SpeciesExportRow(); + row.setSpecies(fullSpecies); + speciesToExport.put(speciesId, row); + } } public List<SpeciesExportRow> getSpeciesToExport() { List<SpeciesExportRow> result = - Lists.newArrayList(speciesToExport); + Lists.newArrayList(speciesToExport.values()); Collections.sort(result, new Comparator<SpeciesExportRow>() { @Override