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>.