branch develop updated (843667b -> 5a9a6fa)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 843667b Revue du commit précédent car c'est uniquement dans les tests qu'on peut créer des SampleDataType à la volée... (See #8295) new 3368926 Utiliser une base avec les bons imports catches new eb72e94 Importer ce qui est nécessaire uniquement pour les esdu et les élementaires (See #8298) new 4d76b38 Mise à jour des tests new 5a9a6fa Livrable #8298 Merge branch 'feature/8298' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5a9a6fab58d14e546903e45fd84c897c93d423af Merge: 3368926 4d76b38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 15:29:44 2016 +0200 Livrable #8298 Merge branch 'feature/8298' into develop commit 4d76b385cd4f74d7a0f99f7662cc7a4ce4c36342 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 15:29:41 2016 +0200 Mise à jour des tests commit eb72e947fe0da828922f8d5fb2188e4d3ceb269e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 15:29:25 2016 +0200 Importer ce qui est nécessaire uniquement pour les esdu et les élementaires (See #8298) commit 3368926380d4551d463c6c1236244f32ce258f89 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 15:27:45 2016 +0200 Utiliser une base avec les bons imports catches Summary of changes: .../actions/VoyageAcousticsImportAction.java | 30 ++++++++------------- .../csv/VoyageAcousticImportExportModel.java | 4 +-- .../importdata/csv/VoyageAcousticImportRow.java | 6 ++--- .../importdata/VoyageAcousticImportServiceIT.java | 2 +- .../import-data/acoustic/movies_small.csv.gz | Bin 6141 -> 6128 bytes .../import-data/echobase-catches.h2.db.gz | Bin 594894 -> 754466 bytes 6 files changed, 17 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 3368926380d4551d463c6c1236244f32ce258f89 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 15:27:45 2016 +0200 Utiliser une base avec les bons imports catches --- .../import-data/echobase-catches.h2.db.gz | Bin 594894 -> 754466 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz index 531fcd1..44c8e46 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 eb72e947fe0da828922f8d5fb2188e4d3ceb269e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 15:29:25 2016 +0200 Importer ce qui est nécessaire uniquement pour les esdu et les élementaires (See #8298) --- .../actions/VoyageAcousticsImportAction.java | 30 ++++++++-------------- .../csv/VoyageAcousticImportExportModel.java | 4 +-- .../importdata/csv/VoyageAcousticImportRow.java | 6 ++--- 3 files changed, 16 insertions(+), 24 deletions(-) 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 652b5f9..5911ec1 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 @@ -267,6 +267,10 @@ public class VoyageAcousticsImportAction extends VoyageAcousticsImportDataAction // create esdu cell Cell esduCell = persistenceService.createCell(esduCellType, esduCellId, dataQuality); + if (row.getCellDepthEnd() != null) { + throw new EsduCellWithDepthEndFilledException(getLocale(), esduCell, rowNumber); + } + // add all found elementary cells esduCell.addAllChilds(elementaryCells); @@ -287,10 +291,6 @@ public class VoyageAcousticsImportAction extends VoyageAcousticsImportDataAction // create esdu cell data createEsduCellData(esduCell, row, dataQuality, result, rowNumber); - if (row.getCellDepthEnd() != null) { - throw new EsduCellWithDepthEndFilledException(getLocale(), esduCell, rowNumber); - } - } else { // this is a elementary cell row @@ -441,7 +441,7 @@ public class VoyageAcousticsImportAction extends VoyageAcousticsImportDataAction esduRow.setEsduCellDataDepth(data.getDataValue()); } { - Data data = esduCellDataByMeta.get(dataMetadataProvider.getDepthRefStartDataMetadata(false)); + Data data = esduCellDataByMeta.get(dataMetadataProvider.getDepthRefSurfaceStartDataMetadata()); Preconditions.checkNotNull(data); esduRow.setCellDepthStart(Float.valueOf(data.getDataValue())); } @@ -503,12 +503,8 @@ public class VoyageAcousticsImportAction extends VoyageAcousticsImportDataAction elementaryRow.setCellLongitude(Float.valueOf(data.getDataValue())); } { - Data data = elementaryCellDataByMeta.get(dataMetadataProvider.getDepthRefStartDataMetadata(true)); - if (data == null) { - data = elementaryCellDataByMeta.get(dataMetadataProvider.getDepthRefStartDataMetadata(false)); - } - Preconditions.checkNotNull(data); - elementaryRow.setCellDepthStart(Float.valueOf(data.getDataValue())); + Data data = elementaryCellDataByMeta.get(dataMetadataProvider.getDepthRefSurfaceStartDataMetadata()); + Preconditions.checkState(data==null,"Elementary cell can't use depthRefSurface dataMeta"); } { Data data = elementaryCellDataByMeta.get(dataMetadataProvider.getDepthRefEndDataMetadata(true)); @@ -614,7 +610,7 @@ public class VoyageAcousticsImportAction extends VoyageAcousticsImportDataAction // create depth start data dataValue = String.valueOf(row.getCellDepthStart()); - createCellData(cell, dataMetadataProvider.getDepthRefStartDataMetadata(false), dataValue, dataQuality, importResult, false, rowNumber); + createCellData(cell, dataMetadataProvider.getDepthRefSurfaceStartDataMetadata(), dataValue, dataQuality, importResult, false, rowNumber); // create Time Start data dataValue = cellDateFormat.format(row.getCellDateStart()); @@ -668,10 +664,6 @@ public class VoyageAcousticsImportAction extends VoyageAcousticsImportDataAction dataValue = String.valueOf(row.getCellLongitude()); createCellData(cell, dataMetadataProvider.getLongitudeDataMetadata(), dataValue, dataQuality, importResult, false, rowNumber); - // create depth start data - dataValue = String.valueOf(row.getCellDepthStart()); - createCellData(cell, dataMetadataProvider.getDepthRefStartDataMetadata(surface), dataValue, dataQuality, importResult, false, rowNumber); - // create depth end data dataValue = String.valueOf(row.getCellDepthEnd()); createCellData(cell, dataMetadataProvider.getDepthRefEndDataMetadata(surface), dataValue, dataQuality, importResult, false, rowNumber); @@ -856,7 +848,7 @@ public class VoyageAcousticsImportAction extends VoyageAcousticsImportDataAction surfaceDataMetadata = dataMetadatasByName.get("Surface"); numberOfSamplesRecordedDataMetadata = dataMetadatasByName.get("NumberOfSamplesRecorded"); numberOfSamplesEchoIntegratedDataMetadata = dataMetadatasByName.get("NumberOfSamplesEchoIntegrated"); - depthRefSurfaceStartDataMetadata = dataMetadatasByName.get("DepthRefSurfaceStart"); + depthRefSurfaceStartDataMetadata = dataMetadatasByName.get("DepthRefSurface" + suffix); depthRefSurfaceEndDataMetadata = dataMetadatasByName.get("DepthRefSurfaceEnd"); depthRefBottomStartDataMetadata = dataMetadatasByName.get("DepthRefBottomStart"); depthRefBottomEndDataMetadata = dataMetadatasByName.get("DepthRefBottomEnd"); @@ -902,8 +894,8 @@ public class VoyageAcousticsImportAction extends VoyageAcousticsImportDataAction return numberOfSamplesEchoIntegratedDataMetadata; } - public DataMetadata getDepthRefStartDataMetadata(boolean surface) { - return surface ? depthRefSurfaceStartDataMetadata : depthRefBottomStartDataMetadata; + public DataMetadata getDepthRefSurfaceStartDataMetadata() { + return depthRefSurfaceStartDataMetadata ; } public DataMetadata getDepthRefEndDataMetadata(boolean surface) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportExportModel.java index e05415a..389b8c2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportExportModel.java @@ -99,7 +99,7 @@ public class VoyageAcousticImportExportModel extends EchoBaseImportExportModelSu model.newIgnoredColumn("MOVIES_EILayer\\cellset");//AW model.newMandatoryColumn("MOVIES_EILayer\\cellset\\cellnum", VoyageAcousticImportRow.PROPERTY_CELL_NUM, EchoBaseCsvUtil.PRIMITIVE_INTEGER);//AX model.newMandatoryColumn("MOVIES_EILayer\\cellset\\celltype", VoyageAcousticImportRow.PROPERTY_CELL_TYPE, EchoBaseCsvUtil.PRIMITIVE_INTEGER);//AY - model.newMandatoryColumn("MOVIES_EILayer\\cellset\\depthstart", VoyageAcousticImportRow.PROPERTY_CELL_DEPTH_START, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//AZ + model.newMandatoryColumn("MOVIES_EILayer\\cellset\\depthstart", VoyageAcousticImportRow.PROPERTY_CELL_DEPTH_START, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER);//AZ model.newMandatoryColumn("MOVIES_EILayer\\cellset\\depthend", VoyageAcousticImportRow.PROPERTY_CELL_DEPTH_END, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER);//BA model.newIgnoredColumn("MOVIES_EILayer\\cellset\\indexstart");//BB model.newIgnoredColumn("MOVIES_EILayer\\cellset\\indexend");//BC @@ -186,7 +186,7 @@ public class VoyageAcousticImportExportModel extends EchoBaseImportExportModelSu // model.newIgnoredColumn("MOVIES_EILayer\\cellset");//AW model.newColumnForExport("MOVIES_EILayer\\cellset\\cellnum", VoyageAcousticImportRow.PROPERTY_CELL_NUM, EchoBaseCsvUtil.PRIMITIVE_INTEGER);//AX model.newColumnForExport("MOVIES_EILayer\\cellset\\celltype", VoyageAcousticImportRow.PROPERTY_CELL_TYPE, EchoBaseCsvUtil.PRIMITIVE_INTEGER);//AY - model.newColumnForExport("MOVIES_EILayer\\cellset\\depthstart", VoyageAcousticImportRow.PROPERTY_CELL_DEPTH_START, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//AZ + model.newColumnForExport("MOVIES_EILayer\\cellset\\depthstart", VoyageAcousticImportRow.PROPERTY_CELL_DEPTH_START, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER);//AZ model.newColumnForExport("MOVIES_EILayer\\cellset\\depthend", VoyageAcousticImportRow.PROPERTY_CELL_DEPTH_END, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER);//BA // model.newIgnoredColumn("MOVIES_EILayer\\cellset\\indexstart");//BB // model.newIgnoredColumn("MOVIES_EILayer\\cellset\\indexend");//BC diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportRow.java index bd15cbe..c1480c0 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportRow.java @@ -117,7 +117,7 @@ public class VoyageAcousticImportRow { protected int cellNum; - protected float cellDepthStart; + protected Float cellDepthStart; protected Float cellDepthEnd; @@ -276,11 +276,11 @@ public class VoyageAcousticImportRow { this.esduCellDataDepth = esduCellDataDepth; } - public float getCellDepthStart() { + public Float getCellDepthStart() { return cellDepthStart; } - public void setCellDepthStart(float cellDepthStart) { + public void setCellDepthStart(Float cellDepthStart) { this.cellDepthStart = cellDepthStart; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 4d76b385cd4f74d7a0f99f7662cc7a4ce4c36342 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 15:29:41 2016 +0200 Mise à jour des tests --- .../importdata/VoyageAcousticImportServiceIT.java | 2 +- .../import-data/acoustic/movies_small.csv.gz | Bin 6141 -> 6128 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageAcousticImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageAcousticImportServiceIT.java index d567627..abcc88f 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageAcousticImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageAcousticImportServiceIT.java @@ -89,7 +89,7 @@ public class VoyageAcousticImportServiceIT extends AbstractImportDataServiceIT<V // int nbData = fixtures.NB_DATA(); int nbCell = 289; - int nbData = 2890; + int nbData = 2621; ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 0); diff --git a/echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz b/echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz index 67a19e2..c046435 100644 Binary files a/echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz and b/echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 5a9a6fab58d14e546903e45fd84c897c93d423af Merge: 3368926 4d76b38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 15:29:44 2016 +0200 Livrable #8298 Merge branch 'feature/8298' into develop .../actions/VoyageAcousticsImportAction.java | 30 ++++++++------------- .../csv/VoyageAcousticImportExportModel.java | 4 +-- .../importdata/csv/VoyageAcousticImportRow.java | 6 ++--- .../importdata/VoyageAcousticImportServiceIT.java | 2 +- .../import-data/acoustic/movies_small.csv.gz | Bin 6141 -> 6128 bytes 5 files changed, 17 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm