This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 2a79044e149074acfd793a485717e6932dff378c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 17:24:04 2015 +0100 impact row changes to producers --- .../genericformat/producer/CsvProducerForAccidentalCatch.java | 6 +++++- .../tutti/service/genericformat/producer/CsvProducerForCatch.java | 8 ++++++-- .../producer/CsvProducerForIndividualObservation.java | 8 ++++++-- .../genericformat/producer/CsvProducerForMarineLitter.java | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAccidentalCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAccidentalCatch.java index b1c33e9..b750dff 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAccidentalCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAccidentalCatch.java @@ -104,7 +104,11 @@ public class CsvProducerForAccidentalCatch extends CsvProducer<AccidentalCatchRo AccidentalCatchRow row = new AccidentalCatchRow(); row.setCruise(operationExportContext.getCruise()); row.setFishingOperation(operationExportContext.getOperation()); - row.setBatch(accidentalBatch); + + row.setComment(accidentalBatch.getComment()); + row.setSpecies(accidentalBatch.getSpecies()); + row.setBatchId(accidentalBatch.getIdAsInt()); + row.setCaracteristic(caracteristic); row.setCaracteristicValue(caracteristicValue); rows.add(row); 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 c740135..a68215e 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 @@ -75,7 +75,9 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { boolean vracBatch = operationExportContext.isVracBatch(benthosBatch); - CatchRow row = new CatchRow(vracBatch, true); + CatchRow row = new CatchRow(); + row.setVrac(vracBatch); + row.setBenthos(true); row.setCruise(operationExportContext.getCruise()); row.setFishingOperation(operationExportContext.getOperation()); row.setSpecies(benthosBatch.getSpecies()); @@ -115,7 +117,9 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { boolean vracBatch = operationExportContext.isVracBatch(speciesBatch); - CatchRow row = new CatchRow(vracBatch, false); + CatchRow row = new CatchRow(); + row.setVrac(vracBatch); + row.setBenthos(false); row.setCruise(operationExportContext.getCruise()); row.setFishingOperation(operationExportContext.getOperation()); row.setSpecies(speciesBatch.getSpecies()); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java index 0965c68..9e424d2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java @@ -82,7 +82,7 @@ public class CsvProducerForIndividualObservation extends CsvProducer<IndividualO protected void addCaracteristicRow(GenericFormatExportOperationContext operationExportContext, List<IndividualObservationRow> rows, - IndividualObservationBatch child, + IndividualObservationBatch individualObservationBatch, Caracteristic caracteristic, Serializable caracteristicValue) { if (caracteristicValue != null) { @@ -90,7 +90,11 @@ public class CsvProducerForIndividualObservation extends CsvProducer<IndividualO IndividualObservationRow row = new IndividualObservationRow(); row.setCruise(operationExportContext.getCruise()); row.setFishingOperation(operationExportContext.getOperation()); - row.setBatch(child); + + row.setComment(individualObservationBatch.getComment()); + row.setSpecies(individualObservationBatch.getSpecies()); + row.setBatchId(individualObservationBatch.getIdAsInt()); + row.setCaracteristic(caracteristic); row.setCaracteristicValue(caracteristicValue); rows.add(row); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForMarineLitter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForMarineLitter.java index 9f0b34f..d4eace8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForMarineLitter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForMarineLitter.java @@ -37,7 +37,7 @@ public class CsvProducerForMarineLitter extends CsvProducer<MarineLitterRow, Mar MarineLitterRow row = new MarineLitterRow(); row.setCruise(operationExportContext.getCruise()); row.setFishingOperation(operationExportContext.getOperation()); - row.setBatch(child); + row.setMarineLitterBatch(child); rows.add(row); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.