This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 38fa0ba9391c37fe84fddd7724c5e54f207d1c7f Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Nov 23 15:37:25 2016 +0100 Add error when the operation is not found --- .../src/main/resources/i18n/echobase-domain_fr_FR.properties | 8 ++++---- .../services/service/atlantos/xml/XmlAccousticExport.java | 2 +- .../actions/VoyageCatchesBiometrySampleImportAction.java | 3 +++ .../src/main/resources/i18n/echobase-services_fr_FR.properties | 2 +- src/site/en/rst/importData.rst | 10 ++++++++++ src/site/rst/importData.rst | 10 ++++++++++ 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties index 96c9309..d563df0 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties @@ -2,10 +2,10 @@ echobase.common.driverType.h2=Base H2 echobase.common.driverType.postgres=Base Postgresql echobase.common.importType.acoustic=Import des données acoustiques echobase.common.importType.acoustic.short=Acoustique -echobase.common.importType.ancillaryInstrumentationMooring=Import ancillary instrumentation -echobase.common.importType.ancillaryInstrumentationMooring.short=Ancillary instrumentation -echobase.common.importType.ancillaryInstrumentationVoyage=Import ancillary instrumentation -echobase.common.importType.ancillaryInstrumentationVoyage.short=short\=Ancillary instrumentation +echobase.common.importType.ancillaryInstrumentationMooring=Import autres capteurs +echobase.common.importType.ancillaryInstrumentationMooring.short=Autres capteurs +echobase.common.importType.ancillaryInstrumentationVoyage=Import autres capteurs +echobase.common.importType.ancillaryInstrumentationVoyage.short=Autres capteurs echobase.common.importType.catches=Import des données de pêche echobase.common.importType.catches.short=Pêche echobase.common.importType.commonDataAll=Import Voyage / Transit / Transects diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java index ecd24e4..56687be 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java @@ -398,7 +398,7 @@ public class XmlAccousticExport implements EchoBaseService { // // if (result == null) { // Data depthData = dataValues.get("ESDUstartDepth"); -// lowerDepth = Float.parseFloat(depthData.getDataValue()); +// lowerDepth = depthData != null ? Float.parseFloat(depthData.getDataValue()) : 0f; // // if (lowerDepth >= 50) { // upperDepth = 30f; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java index dd6f194..3017545 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java @@ -44,6 +44,7 @@ import org.nuiton.csv.Import; import java.util.Collection; import java.util.Map; import java.util.TreeMap; +import org.nuiton.csv.ImportRuntimeException; /** * Created on 25/03/16. @@ -129,6 +130,8 @@ public class VoyageCatchesBiometrySampleImportAction extends VoyageCatchesImport SampleData sampleDataCreated = persistenceService.createSampleData(row.getSampleData()); sample.addSampleData(sampleDataCreated); addId(result, EchoBaseUserEntityEnum.SampleData, sampleDataCreated, rowNumber); + } else { + throw new ImportRuntimeException("At line " + rowNumber + ", no operation found"); } } diff --git a/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties b/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties index 22140e2..f69568e 100644 --- a/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties +++ b/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties @@ -34,7 +34,7 @@ echobase.common.voyageFile=Fichier des données de voyages echobase.exportError.toFile=Erreur lors de l'extraction du fichier %s \: %s echobase.importError.can.only.import.one.voyage.atime=Vous ne pouvez pas importer plus d'un voyage à la fois echobase.importError.dataMetadata.notFound=Colonne de métadonnées nommée %s non trouvée (valeurs existantes \: %s) -echobase.importError.duplicate.echotypeAncillaryInstrumentationAssociation=Ligne %s - %s contient déjà l'ancillary instrumentation %s. +echobase.importError.duplicate.echotypeAncillaryInstrumentationAssociation=Ligne %s - %s contient déjà les autres capteurs %s. echobase.importError.duplicate.echotypeSpeciesAssociation=Ligne %s - L'échotype «%s» sur la marée nommée «%s» contient déjà l'espèce «%s». echobase.importError.duplicate.elementaryCell=Ligne %s - La cellule élémentaire d'identifiant «%s» sur «%s» existe déjà en base. echobase.importError.duplicate.esduCell=Ligne %s - La cellule ESDU d'identifiant «%s» sur «%s» existe déjà en base. diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst index 43121ec..67caf89 100644 --- a/src/site/en/rst/importData.rst +++ b/src/site/en/rst/importData.rst @@ -1034,6 +1034,11 @@ Columns formats | esduName |FK(Cell#name) | +-----------------------+------------------------------------------------------+ +Important +--------- + +- You have to sort the line on the regionName. + Example ------- @@ -1127,6 +1132,11 @@ Columns formats | metadata |FK(DataMetadata#name) (one column per metadata) | +----------------------+-------------------------------------------------------+ +Important +--------- + +- You have to sort the line on the name. + Example ------- diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index 13b9503..2bb43d9 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -1037,6 +1037,11 @@ Format des colonnes | esduName |FK(Cell#name) | +-----------------------+------------------------------------------------------+ +Notes importantes +----------------- + +- Il faut trier les lignes sur regionName. + Exemple ------- @@ -1130,6 +1135,11 @@ Format des colonnes | méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | +----------------------+--------------------------------------------------------+ +Notes importantes +----------------- + +- Il faut trier les lignes sur name. + Exemple ------- -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.