This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit caa31d7187ae5403b6400673da063f6d7d9aff8f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 17:05:38 2015 +0100 fixes #6458: Ne pas importer les résultats avec valeurs *NA* sur les résultats de type Région --- .../service/importdata/AbstractImportDataService.java | 15 --------------- .../service/importdata/ResultsEsduCellImportService.java | 8 ++++---- .../importdata/ResultsMapFishCellImportService.java | 7 +------ .../importdata/ResultsMapOtherCellImportService.java | 2 +- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java index 5ed3de2..f7bd557 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java @@ -425,21 +425,6 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur Category category, String resultLabel, EchoBaseCsvFileImportResult importResult, - boolean collecIds) { - addResults(row, - cell, - category, - resultLabel, - importResult, - collecIds, - true); - } - - protected void addResults(EchoBaseCsvUtil.ResultAble row, - Cell cell, - Category category, - String resultLabel, - EchoBaseCsvFileImportResult importResult, boolean collecIds, boolean importNAResults) { List<Result> results = row.getResult(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java index 6795e1c..b04e6af 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java @@ -228,7 +228,7 @@ public class ResultsEsduCellImportService extends AbstractImportDataService<Resu null, importResult); - addResults(row, cell, category, resultLabel, importResult, true); + addResults(row, cell, category, resultLabel, importResult, true, true); } return importResult; } catch (ImportRuntimeException e) { @@ -300,7 +300,7 @@ public class ResultsEsduCellImportService extends AbstractImportDataService<Resu null, importResult); - addResults(row, cell, category, resultLabel, importResult, true); + addResults(row, cell, category, resultLabel, importResult, true, true); } return importResult; @@ -389,7 +389,7 @@ public class ResultsEsduCellImportService extends AbstractImportDataService<Resu null, importResult); - addResults(row, cell, category, resultLabel, importResult, true); + addResults(row, cell, category, resultLabel, importResult, true, true); } return importResult; @@ -480,7 +480,7 @@ public class ResultsEsduCellImportService extends AbstractImportDataService<Resu ageCategory, importResult); - addResults(row, cell, category, resultLabel, importResult, true); + addResults(row, cell, category, resultLabel, importResult, true, true); } return importResult; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java index 395bbec..754cd20 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java @@ -212,12 +212,7 @@ public class ResultsMapFishCellImportService extends AbstractImportDataService<R row.getAgeCategory(), importResult); - addResults(row, - cell, - category, - resultLabel, - importResult, - false); + addResults(row, cell, category, resultLabel, importResult, false, true); } return importResult; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java index 1447e9b..f89d858 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java @@ -188,7 +188,7 @@ public class ResultsMapOtherCellImportService extends AbstractImportDataService< dataQuality, importResult); - addResults(row, cell, null, resultLabel, importResult, false); + addResults(row, cell, null, resultLabel, importResult, false, true); } return importResult; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.