This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 2bd5b1ab8cf4815b3b987eebdc8f69e252450e3c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 17:29:41 2016 +0100 #8755 Get dataQuality in right place --- .../csv/VoyageResultsRegionCellImportRow.java | 25 ++++++++++----------- .../import-data/result/region/regionResults.csv.gz | Bin 13249 -> 13099 bytes .../import-data/result/region/regions.csv.gz | Bin 4440 -> 4413 bytes 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java index 05fc438..4984dc3 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java @@ -58,6 +58,18 @@ public class VoyageResultsRegionCellImportRow { protected float dataSurface; + public static VoyageResultsRegionCellImportRow of(Voyage voyage, Data coordinateData, float surfaceDataValue) { + VoyageResultsRegionCellImportRow row = new VoyageResultsRegionCellImportRow(); + row.setVoyage(voyage); + Cell cell = coordinateData.getCell(); + row.setName(cell.getName()); + row.setCellType(cell.getCellType()); + row.setDataSurface(surfaceDataValue); + row.setDataCoordinate(coordinateData.getDataValue()); + row.setDataQuality(cell.getDataQuality()); + return row; + } + public VoyageResultsRegionCellImportRow() { } @@ -108,17 +120,4 @@ public class VoyageResultsRegionCellImportRow { public void setDataQuality(DataQuality dataQuality) { this.dataQuality = dataQuality; } - - public static VoyageResultsRegionCellImportRow of(Voyage voyage, Data coordinateData, float surfaceDataValue) { - VoyageResultsRegionCellImportRow row = new VoyageResultsRegionCellImportRow(); - row.setVoyage(voyage); - Cell cell = coordinateData.getCell(); - row.setName(cell.getName()); - row.setCellType(cell.getCellType()); - row.setDataSurface(surfaceDataValue); - row.setDataCoordinate(coordinateData.getDataValue()); - row.setDataQuality(coordinateData.getDataQuality()); - return row; - } - } diff --git a/echobase-services/src/test/resources/import-data/result/region/regionResults.csv.gz b/echobase-services/src/test/resources/import-data/result/region/regionResults.csv.gz index c8da4eb..b8bc5b9 100644 Binary files a/echobase-services/src/test/resources/import-data/result/region/regionResults.csv.gz and b/echobase-services/src/test/resources/import-data/result/region/regionResults.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz b/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz index 0d90277..5757532 100644 Binary files a/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz and b/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.