Author: sbavencoff Date: 2014-05-16 11:50:33 +0200 (Fri, 16 May 2014) New Revision: 671 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/671 Log: update version Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java 2014-05-16 09:46:43 UTC (rev 670) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java 2014-05-16 09:50:33 UTC (rev 671) @@ -132,9 +132,6 @@ transaction.commit(); - } catch (TopiaException e) { - throw new TopiaException(e); - } finally { endTransaction(transaction); } @@ -192,11 +189,10 @@ String campaignCode) throws TopiaException { boolean newEntity = false; - Observer observerExists = dao.findByNaturalId(observer.getInitials(), - observer.getCampaign()); - if (observerExists == null) { + if (!dao.existByNaturalId(observer.getInitials(), observer.getCampaign())) { + dao.create(observer); newEntity = true; @@ -210,6 +206,9 @@ } else { + Observer observerExists = dao.findByNaturalId(observer.getInitials(), + observer.getCampaign()); + observerExists.setEmail(observer.getEmail()); observerExists.setFirstName(observer.getFirstName()); observerExists.setLastName(observer.getLastName()); Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java 2014-05-16 09:46:43 UTC (rev 670) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightTopiaDao.java 2014-05-16 09:50:33 UTC (rev 671) @@ -24,8 +24,6 @@ */ package fr.ulr.sammoa.persistence; -import org.nuiton.topia.persistence.TopiaException; - import java.util.HashMap; /** @@ -40,18 +38,14 @@ String ql = "SELECT max(" + Flight.PROPERTY_FLIGHT_NUMBER + ") FROM " + Flight.class.getCanonicalName() ; - try { - Integer result = findUnique(ql, new HashMap<String, Object>()); + Integer result = findUniqueOrNull(ql, new HashMap<String, Object>()); // int result = queryResult == null ? defaultValue : queryResult + 1; // // if (result < defaultValue) { // result = defaultValue; // } - return result; - } catch (TopiaException e) { - throw new TopiaException(e); - } + return result; } }