This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit d65efd09d12a99a6323020fa3bf66ab2b59c6c57 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 2 12:24:46 2016 +0200 Can collect imported sample data --- .../importdata/actions/VoyageCatchesImportDataActionSupport.java | 8 ++++++-- .../importdata/actions/VoyageCatchesTotalSampleImportAction.java | 7 ++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesImportDataActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesImportDataActionSupport.java index cf6c2a0..4358f12 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesImportDataActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesImportDataActionSupport.java @@ -36,11 +36,15 @@ public abstract class VoyageCatchesImportDataActionSupport<E> extends ImportData } - protected SampleData addSampleData(SampleDataType sampleDataType, String label, float value, Sample sample, ImportDataFileResult importResult) { + protected SampleData addSampleData(SampleDataType sampleDataType, String label, float value, Sample sample, ImportDataFileResult importResult, boolean collectId) { SampleData sampleData = getPersistenceService().createSampleData(sampleDataType, label, value); sample.addSampleData(sampleData); - importResult.incrementsNumberCreated(EchoBaseUserEntityEnum.SampleData); + if (collectId) { + importResult.addId(EchoBaseUserEntityEnum.SampleData, sampleData); + } else { + importResult.incrementsNumberCreated(EchoBaseUserEntityEnum.SampleData); + } return sampleData; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java index ba2ebc2..1506910 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java @@ -65,6 +65,7 @@ public class VoyageCatchesTotalSampleImportAction extends VoyageCatchesImportDat } sampleIdToOperationId.clear(); + sampleIdToSortedSampleId.clear(); SpeciesCategoryCache speciesCategoryCache = importDataContext.getSpeciesCategoryCache(); @@ -124,19 +125,19 @@ public class VoyageCatchesTotalSampleImportAction extends VoyageCatchesImportDat if (row.getMeanLength() != null) { //create meanLength data - addSampleData(sampleDataTypeMeanLength, null, row.getMeanLength(), sample, result); + addSampleData(sampleDataTypeMeanLength, null, row.getMeanLength(), sample, result, false); } if (row.getMeanWeight() != null) { //create meanWeight data - addSampleData(sampleDataTypeMeanWeight, null, row.getMeanWeight(), sample, result); + addSampleData(sampleDataTypeMeanWeight, null, row.getMeanWeight(), sample, result, false); } if (row.getNoPerKg() != null) { //create noPerKg data - addSampleData(sampleDataTypeNoPerKg, null, row.getNoPerKg(), sample, result); + addSampleData(sampleDataTypeNoPerKg, null, row.getNoPerKg(), sample, result, false); } Sample createdSortedSample = persistenceService.newSample(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.