Author: fdesbois Date: 2012-08-03 12:06:05 +0200 (Fri, 03 Aug 2012) New Revision: 350 Url: http://forge.codelutin.com/repositories/revision/sammoa/350 Log: fixes #1382 : allow update for csv import Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2012-08-02 16:01:59 UTC (rev 349) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2012-08-03 10:06:05 UTC (rev 350) @@ -192,9 +192,16 @@ } else { - if (logger.isWarnEnabled()) { - logger.warn(String.format("The species %1$s already " + - "exists and will be ignored", + speciesExists.setCommonName(species.getCommonName()); + speciesExists.setLatinName(species.getLatinName()); + speciesExists.setGroupName(species.getGroupName()); + speciesExists.setFamily(species.getFamily()); + speciesExists.setType(species.getType()); + dao.update(speciesExists); + + if (logger.isInfoEnabled()) { + logger.info(String.format("The species %1$s already " + + "exists and is updated", species.getCode())); } } @@ -684,9 +691,16 @@ } else { - if (logger.isWarnEnabled()) { - logger.warn(String.format("The observer %1$s already " + - "exists and will be ignored", + observerExists.setEmail(observer.getEmail()); + observerExists.setFirstName(observer.getFirstName()); + observerExists.setLastName(observer.getLastName()); + observerExists.setOrganization(observer.getOrganization()); + observerExists.setPilot(observer.isPilot()); + observerDAO.update(observerExists); + + if (logger.isInfoEnabled()) { + logger.info(String.format("The observer %1$s already " + + "exists and is updated", observer.getInitials())); } }