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 81dec8c1e018b7ba17740a3e3d4da4b3189de701 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 4 07:42:06 2016 +0200 Can collect ids when creatin data cell --- .../actions/ImportDataActionSupport.java | 12 ++++++--- .../actions/VoyageAcousticsImportAction.java | 3 ++- .../VoyageResultsImportDataActionSupport.java | 29 +++++++++++++--------- .../VoyageResultsMapFishCellImportAction.java | 18 +++++++++----- .../VoyageResultsMapOtherCellImportAction.java | 18 +++++++++----- .../csv/EchoBaseImportExportModelSupport.java | 2 +- 6 files changed, 53 insertions(+), 29 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java index b1767fc..531bd44 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java @@ -293,17 +293,23 @@ public abstract class ImportDataActionSupport<M extends ImportDataConfigurationS return importDataContext.getPersistenceService(); } - protected final void createCellData(Cell cell, + protected final Data createCellData(Cell cell, DataMetadata dataMetaData, String dataValue, DataQuality dataQuality, - ImportDataFileResult importResult) { + ImportDataFileResult importResult, boolean collectId) { Data data = getPersistenceService().createData(dataMetaData, dataValue); cell.addData(data); cell.setDataQuality(dataQuality); - importResult.incrementsNumberCreated(EchoBaseUserEntityEnum.Data); + if (collectId) { + importResult.addId(EchoBaseUserEntityEnum.Data,data ); + } else { + importResult.incrementsNumberCreated(EchoBaseUserEntityEnum.Data); + } + + return data; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java index f7cf94c..c119a13 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java @@ -593,7 +593,8 @@ public class VoyageAcousticsImportAction extends VoyageAcousticsImportDataAction dataMetadatasByName.get(metadataName), dataValue, dataQuality, - importResult); + importResult, + false ); } private String getSoftwareVersion(boolean isME70) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsImportDataActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsImportDataActionSupport.java index 3477b5b..48cc925 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsImportDataActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsImportDataActionSupport.java @@ -8,9 +8,10 @@ import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; import fr.ifremer.echobase.services.csv.ResultAble; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; -import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageResultsImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; +import java.util.LinkedList; import java.util.List; /** @@ -24,17 +25,17 @@ public abstract class VoyageResultsImportDataActionSupport<E> extends ImportData super(importDataContext, inputFile); } - protected void addResults(ResultAble row, - Cell cell, - Category category, - String resultLabel, - ImportDataFileResult importResult, - boolean collecIds, - boolean importNAResults) { + protected List<Result> addResults(ResultAble row, + Cell cell, + Category category, + String resultLabel, + ImportDataFileResult importResult, + boolean collectIds, + boolean importNAResults) { - List<Result> results = row.getResult(); + List<Result> results = new LinkedList<>(); - for (Result result : results) { + for (Result result : row.getResult()) { if (!importNAResults && EchoBaseCsvUtil.NA.equals(result.getResultValue())) { @@ -45,10 +46,10 @@ public abstract class VoyageResultsImportDataActionSupport<E> extends ImportData result.setCategory(category); result.setResultLabel(resultLabel); - Result resultCreated = getPersistenceService().createResult(result); + Result resultCreated = persistenceService.createResult(result); cell.addResult(resultCreated); - if (collecIds) { + if (collectIds) { importResult.addId(EchoBaseUserEntityEnum.Result, resultCreated); @@ -57,8 +58,12 @@ public abstract class VoyageResultsImportDataActionSupport<E> extends ImportData importResult.incrementsNumberCreated(EchoBaseUserEntityEnum.Result); } + results.add(resultCreated); + } + return results; + } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java index f021097..caf1436 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java @@ -87,42 +87,48 @@ public class VoyageResultsMapFishCellImportAction extends VoyageResultsImportDat dataLongitudeMeta, String.valueOf(row.getGridCellLongitude()), dataQuality, - result); + result, + false); // add gridCellLatitude data createCellData(cell, dataLatitudeMeta, String.valueOf(row.getGridCellLatitude()), dataQuality, - result); + result, + false); // add gridCellDepth data createCellData(cell, dataDepthMeta, String.valueOf(row.getGridCellDepth()), dataQuality, - result); + result, + false); // add gridLongitudeLag data createCellData(cell, dataLongitudeLagMeta, String.valueOf(row.getGridLongitudeLag()), dataQuality, - result); + result, + false); // add gridLatitudeLag data createCellData(cell, dataLatitudeLagMeta, String.valueOf(row.getGridLatitudeLag()), dataQuality, - result); + result, + false); // add gridDepthLag data createCellData(cell, dataDepthLagMeta, String.valueOf(row.getGridDepthLag()), dataQuality, - result); + result, + false); Category category = resultCategoryCache.getResultCategory(null, row.getSpecies(), diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java index ded4893..cd5b26f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java @@ -84,42 +84,48 @@ public class VoyageResultsMapOtherCellImportAction extends VoyageResultsImportDa dataLongitudeMeta, String.valueOf(row.getGridCellLongitude()), dataQuality, - result); + result, + false); // add gridCellLatitude data createCellData(cell, dataLatitudeMeta, String.valueOf(row.getGridCellLatitude()), dataQuality, - result); + result, + false); // add gridCellDepth data createCellData(cell, dataDepthMeta, String.valueOf(row.getGridCellDepth()), dataQuality, - result); + result, + false); // add gridLongitudeLag data createCellData(cell, dataLongitudeLagMeta, String.valueOf(row.getGridLongitudeLag()), dataQuality, - result); + result, + false); // add gridLatitudeLag data createCellData(cell, dataLatitudeLagMeta, String.valueOf(row.getGridLatitudeLag()), dataQuality, - result); + result, + false); // add gridDepthLag data createCellData(cell, dataDepthLagMeta, String.valueOf(row.getGridDepthLag()), dataQuality, - result); + result, + false); addResults(row, cell, null, resultLabel, result, false, true); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchoBaseImportExportModelSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchoBaseImportExportModelSupport.java index af26fcc..9492bf4 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchoBaseImportExportModelSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchoBaseImportExportModelSupport.java @@ -26,7 +26,7 @@ public abstract class EchoBaseImportExportModelSupport<E> extends AbstractImport model.newColumnForExport( metadata.getName(), EchoBaseCsvUtil.<R>newResultValueGetter(metadata), - EchoBaseCsvUtil.newResultValueFormatter(metadata, false)); + EchoBaseCsvUtil.newResultValueFormatter(metadata, true)); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.