This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 6dac5501bce39a2d923245907cbb2a004274007f Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:08:33 2015 +0100 On gère l'absence de AphiaId (fixes #5973) --- .../wao/services/service/csv/SpeciesImportModel.java | 14 ++++++++++++-- wao-services/src/test/resources/import/especes.csv | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java index 1950450..90a1fe0 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java @@ -2,6 +2,7 @@ package fr.ifremer.wao.services.service.csv; import fr.ifremer.wao.entity.Species; import fr.ifremer.wao.entity.SpeciesImpl; +import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.AbstractImportModel; public class SpeciesImportModel extends AbstractImportModel<Species> { @@ -9,10 +10,19 @@ public class SpeciesImportModel extends AbstractImportModel<Species> { public SpeciesImportModel() { super(';'); + modelBuilder.newMandatoryColumn("CODE_PERMANENT", Species.PROPERTY_PERMANENT_CODE); modelBuilder.newMandatoryColumn("NOM_SCIENTIFIQUE", Species.PROPERTY_SCIENTIFIC_NAME); modelBuilder.newMandatoryColumn("NOM_COMMUN", Species.PROPERTY_VERNACULAR_NAME); - modelBuilder.newMandatoryColumn("APHIA_ID", Species.PROPERTY_APHIA_ID); - modelBuilder.newMandatoryColumn("CODE_PERMANENT", Species.PROPERTY_PERMANENT_CODE); + modelBuilder.newMandatoryColumn("APHIA_ID", Species.PROPERTY_APHIA_ID, new ValueParser<String>() { + + @Override + public String parse(String value) { + if ("NA".equals(value)) { + return null; + } + return value; + } + }); } diff --git a/wao-services/src/test/resources/import/especes.csv b/wao-services/src/test/resources/import/especes.csv index 85b3bf9..6912695 100644 --- a/wao-services/src/test/resources/import/especes.csv +++ b/wao-services/src/test/resources/import/especes.csv @@ -1,5 +1,5 @@ NOM_SCIENTIFIQUE;NOM_COMMUN;APHIA_ID;CODE_PERMANENT Engraulis encrasicolus;Anchois;126426;1362 Dicentrarchus labrax;Bar européen;126975;1644 -Merluccius merluccius;Merlu européen;126484;1540 -Gadus morhua;Morue de l'Atlantique;126436;1543 +Merluccius merluccius;Merlu européen;NA;1540 +Gadus morhua;Morue de l'Atlantique;NA;1543 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.