branch develop updated (e0fee6c -> 25fc279)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from e0fee6c fixes #6935: Erreur mise à jour de 3.13.7 vers 4.0RC1 Merge branch 'feature/6935' into develop new c3cf060 refs #6890 Amélioration du message d'erreur new 1ced07e refs #6890 Permettre l'export même si il y a des erreurs d'élévation de poids new 25fc279 fixes #6890: [EXPORT GENERIQUE] Export impossible si erreur d'élévation de poids Merge branch 'feature/6890' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 25fc279279f009a0d42ba57c687bfe1d7e398f71 Merge: e0fee6c 1ced07e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 15:48:44 2015 +0200 fixes #6890: [EXPORT GENERIQUE] Export impossible si erreur d'élévation de poids Merge branch 'feature/6890' into develop commit 1ced07ee8f9648f770e2153d8b00bdb478bd64f5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 15:48:35 2015 +0200 refs #6890 Permettre l'export même si il y a des erreurs d'élévation de poids commit c3cf060c67dc8ad7d6f08dd2a800876ad018070b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 08:58:18 2015 +0200 refs #6890 Amélioration du message d'erreur Summary of changes: .../genericformat/producer/CsvProducerForCatch.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit c3cf060c67dc8ad7d6f08dd2a800876ad018070b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 08:58:18 2015 +0200 refs #6890 Amélioration du message d'erreur --- .../tutti/service/genericformat/producer/CsvProducerForCatch.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java index b012c22..29c40cc 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java @@ -321,7 +321,8 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { if (categoryWeight == null) { - throw new ApplicationTechnicalException("Il existe une catégorie de poids non renseignée pour l'espèce " + speciesBatch.getSpecies().getSurveyCode()); + throw new ApplicationTechnicalException(String.format("Campagne %s - Trait %s : Il existe une catégorie de poids non renseignée (lot %s)", operationExportContext.getCruise().getName(), operationExportContext.getOperationLabel(), childBatch.getId())); + } sampleComputedWeight += categoryWeight; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1ced07ee8f9648f770e2153d8b00bdb478bd64f5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 15:48:35 2015 +0200 refs #6890 Permettre l'export même si il y a des erreurs d'élévation de poids --- .../genericformat/producer/CsvProducerForCatch.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java index 29c40cc..cbcd40f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java @@ -40,7 +40,8 @@ import fr.ifremer.tutti.service.genericformat.csv.ExportSampleCategory; import fr.ifremer.tutti.util.Numbers; import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; -import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.Serializable; import java.nio.file.Path; @@ -55,6 +56,9 @@ import java.util.List; */ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { + /** Logger. */ + private static final Log log = LogFactory.getLog(CsvProducerForCatch.class); + public CsvProducerForCatch(Path file, CatchModel model) { super(file, model); } @@ -321,7 +325,10 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { if (categoryWeight == null) { - throw new ApplicationTechnicalException(String.format("Campagne %s - Trait %s : Il existe une catégorie de poids non renseignée (lot %s)", operationExportContext.getCruise().getName(), operationExportContext.getOperationLabel(), childBatch.getId())); + if (log.isWarnEnabled()) { + log.warn(String.format("Campagne %s - Trait %s : Il existe une catégorie de poids non renseignée (lot espèce %s)", operationExportContext.getCruise().getName(), operationExportContext.getOperationLabel(), childBatch.getId())); + } + categoryWeight = 0f; } @@ -443,10 +450,16 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { Float categoryWeight = Numbers.getValueOrComputedValue( exportSampleCategory.getCategoryWeight(), exportSampleCategory.getComputedWeight()); + if (categoryWeight == null) { - throw new ApplicationTechnicalException("Il existe une catégorie de poids non renseignée pour le benthos " + benthosBatch.getSpecies().getSurveyCode()); + if (log.isWarnEnabled()) { + log.warn(String.format("Campagne %s - Trait %s : Il existe une catégorie de poids non renseignée (lot benthos %s)", operationExportContext.getCruise().getName(), operationExportContext.getOperationLabel(), childBatch.getId())); + } + categoryWeight = 0f; + } + sampleComputedWeight += categoryWeight; } currentRow.getSampleCategory().get(categoryIndex - 1).setSampleComputedWeight(sampleComputedWeight); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 25fc279279f009a0d42ba57c687bfe1d7e398f71 Merge: e0fee6c 1ced07e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 15:48:44 2015 +0200 fixes #6890: [EXPORT GENERIQUE] Export impossible si erreur d'élévation de poids Merge branch 'feature/6890' into develop .../genericformat/producer/CsvProducerForCatch.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm