branch develop updated (a0738aa -> 5124323)
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 a0738aa Fix title new 5124323 #8747 Modify SizeCategoryMeaning LengthClassMeaning The 1 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 512432354e3f5187f2328daa16a1c8a623bc2b0e Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 12:18:23 2016 +0100 #8747 Modify SizeCategoryMeaning LengthClassMeaning Summary of changes: ...=> MismatchLengthCategoryMeaningException.java} | 8 +- .../service/importdata/SizeCategoryCache.java | 5 ++ ...ndSpeciesCategoryAndLengthCellImportAction.java | 23 +++-- ...dSpeciesCategoryAndLengthImportExportModel.java | 6 +- ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 20 +++-- echobase-services/src/main/resources/actual | 99 +++++++++++++++++++++ echobase-services/src/main/resources/expected | 99 +++++++++++++++++++++ .../i18n/echobase-services_en_GB.properties | 2 +- .../i18n/echobase-services_fr_FR.properties | 2 +- ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 2585 -> 2605 bytes src/site/en/rst/importData.rst | 6 +- src/site/rst/importData.rst | 6 +- 12 files changed, 244 insertions(+), 32 deletions(-) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MismatchSizeCategoryMeaningException.java => MismatchLengthCategoryMeaningException.java} (74%) create mode 100644 echobase-services/src/main/resources/actual create mode 100644 echobase-services/src/main/resources/expected -- 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 512432354e3f5187f2328daa16a1c8a623bc2b0e Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 12:18:23 2016 +0100 #8747 Modify SizeCategoryMeaning LengthClassMeaning --- ...=> MismatchLengthCategoryMeaningException.java} | 8 +- .../service/importdata/SizeCategoryCache.java | 5 ++ ...ndSpeciesCategoryAndLengthCellImportAction.java | 23 +++-- ...dSpeciesCategoryAndLengthImportExportModel.java | 6 +- ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 20 +++-- echobase-services/src/main/resources/actual | 99 +++++++++++++++++++++ echobase-services/src/main/resources/expected | 99 +++++++++++++++++++++ .../i18n/echobase-services_en_GB.properties | 2 +- .../i18n/echobase-services_fr_FR.properties | 2 +- ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 2585 -> 2605 bytes src/site/en/rst/importData.rst | 6 +- src/site/rst/importData.rst | 6 +- 12 files changed, 244 insertions(+), 32 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchSizeCategoryMeaningException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchLengthCategoryMeaningException.java similarity index 74% rename from echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchSizeCategoryMeaningException.java rename to echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchLengthCategoryMeaningException.java index ed92558..785afef 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchSizeCategoryMeaningException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchLengthCategoryMeaningException.java @@ -32,9 +32,9 @@ import static org.nuiton.i18n.I18n.l; * * @author Tony Chemit - chemit@codelutin.com */ -public class MismatchSizeCategoryMeaningException extends ImportRuntimeException { - public MismatchSizeCategoryMeaningException(Locale locale, String sizeCategoryMeaning, String databaseSizeCategoryMeaning) { - super(l(locale, "echobase.importError.mismatch.sizeCategoryMeaning", sizeCategoryMeaning, databaseSizeCategoryMeaning)); - +public class MismatchLengthCategoryMeaningException extends ImportRuntimeException { + public MismatchLengthCategoryMeaningException(Locale locale, String sizeCategoryMeaning, String databaseSizeCategoryMeaning) { + super(l(locale, "echobase.importError.mismatch.lengthCategoryMeaning", sizeCategoryMeaning, databaseSizeCategoryMeaning)); + } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/SizeCategoryCache.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/SizeCategoryCache.java index 9504111..9965399 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/SizeCategoryCache.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/SizeCategoryCache.java @@ -71,4 +71,9 @@ public class SizeCategoryCache { } + public SizeCategory getSizeCategory(String sizeCategoryName) { + SizeCategory category = cache.get(sizeCategoryName); + return category; + } + } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java index 7ac6e19..ee44257 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java @@ -27,10 +27,9 @@ import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; -import fr.ifremer.echobase.services.service.importdata.MismatchSizeCategoryMeaningException; +import fr.ifremer.echobase.services.service.importdata.MismatchLengthCategoryMeaningException; import fr.ifremer.echobase.services.service.importdata.ResultCategoryCache; import fr.ifremer.echobase.services.service.importdata.SizeCategoryCache; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; @@ -66,14 +65,18 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAct @Override protected Category getResultCategory(ImportDataFileResult result, ResultCategoryCache resultCategoryCache, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow row) { + SizeCategory lengthCategory = null; SizeCategory sizeCategory = null; if (!Strings.isNullOrEmpty(row.getSizeCategory())) { - - sizeCategory = sizeCategoryCache.getSizeCategory(row.getSizeCategory(), row.getSizeCategoryMeaning(), result); - Preconditions.checkNotNull(sizeCategory); - if (!sizeCategory.getMeaning().equals(row.getSizeCategoryMeaning())) { - throw new MismatchSizeCategoryMeaningException(getLocale(), row.getSizeCategoryMeaning(), sizeCategory.getMeaning()); + sizeCategory = sizeCategoryCache.getSizeCategory(row.getSizeCategory()); + } + + if (row.getLengthClass() != null) { + lengthCategory = sizeCategoryCache.getSizeCategory(String.valueOf(row.getLengthClass()), row.getLengthCategoryMeaning(), result); + Preconditions.checkNotNull(lengthCategory); + if (!lengthCategory.getMeaning().equals(row.getLengthCategoryMeaning())) { + throw new MismatchLengthCategoryMeaningException(getLocale(), row.getLengthCategoryMeaning(), lengthCategory.getMeaning()); } } @@ -88,7 +91,11 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAct @Override protected VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow newImportedRow(DataAcousticProvider voyage, Cell cell, Category category, List<Result> cellResults) { - return VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.of(voyage, cell, category, cellResults); + + Float lengthClass = category.getSpeciesCategory().getLengthClass(); + SizeCategory lengthCategory = sizeCategoryCache.getSizeCategory(String.valueOf(lengthClass)); + + return VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.of(voyage, cell, category, lengthCategory, cellResults); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java index 9e07616..fd2ea82 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java @@ -47,7 +47,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportM VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CLASS, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_ECHOTYPE, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SIZE_CATEGORY, - VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SIZE_CATEGORY_MEANING, + VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CATEGORY_MEANING, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_DATA_QUALITY, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_VOYAGE }; @@ -65,7 +65,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportM model.newForeignKeyColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, importDataContext.getVoyageEchotypesByName()); model.newMandatoryColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CLASS, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); model.newMandatoryColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SIZE_CATEGORY); - model.newMandatoryColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SIZE_CATEGORY_MEANING); + model.newMandatoryColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CATEGORY_MEANING); model.newForeignKeyColumn(HEADER_SPECIES, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); model.newForeignKeyColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, importDataContext.getDataQualitiesByName()); @@ -83,7 +83,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportM model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_ECHOTYPE, EchoBaseCsvUtil.ECHOTYPE_FORMATTER); model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CLASS, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SIZE_CATEGORY); - model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SIZE_CATEGORY_MEANING); + model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CATEGORY_MEANING); model.newColumnForExport(HEADER_SPECIES, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_DATA_QUALITY, EchoBaseCsvUtil.DATA_QUALITY_FORMATTER); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java index 4aa8b82..40e355a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java @@ -50,7 +50,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp public static final String PROPERTY_ECHOTYPE = "echotype"; public static final String PROPERTY_LENGTH_CLASS = "lengthClass"; public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; - public static final String PROPERTY_SIZE_CATEGORY_MEANING = "sizeCategoryMeaning"; + public static final String PROPERTY_LENGTH_CATEGORY_MEANING = "lengthCategoryMeaning"; public static final String PROPERTY_DATA_QUALITY = "dataQuality"; protected Voyage voyage; @@ -60,19 +60,21 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp protected DataQuality dataQuality; protected Float lengthClass; protected String sizeCategory; - protected String sizeCategoryMeaning; + protected String lengthCategoryMeaning; protected Echotype echotype; - public static VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow of(DataAcousticProvider provider, Cell cell, Category category, List<Result> results) { + public static VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow of(DataAcousticProvider provider, Cell cell, Category category, SizeCategory lengthCategory, List<Result> results) { VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow row = new VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow(); row.setProvider(provider); row.setCell(cell); row.setSpecies(category.getSpeciesCategory().getSpecies()); + row.setLengthClass(category.getSpeciesCategory().getLengthClass()); + row.setLengthCategoryMeaning(lengthCategory.getMeaning()); + SizeCategory sizeCategory = category.getSpeciesCategory().getSizeCategory(); if (sizeCategory != null) { row.setSizeCategory(sizeCategory.getName()); - row.setSizeCategoryMeaning(sizeCategory.getMeaning()); } row.setEchotype(category.getEchotype()); row.result.addAll(results); @@ -143,14 +145,14 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp this.sizeCategory = sizeCategory; } - public String getSizeCategoryMeaning() { - return sizeCategoryMeaning; + public String getLengthCategoryMeaning() { + return lengthCategoryMeaning; } - public void setSizeCategoryMeaning(String sizeCategoryMeaning) { - this.sizeCategoryMeaning = sizeCategoryMeaning; + public void setLengthCategoryMeaning(String lengthCategoryMeaning) { + this.lengthCategoryMeaning = lengthCategoryMeaning; } - + public Float getLengthClass() { return lengthClass; } diff --git a/echobase-services/src/main/resources/actual b/echobase-services/src/main/resources/actual new file mode 100644 index 0000000..55b6c90 --- /dev/null +++ b/echobase-services/src/main/resources/actual @@ -0,0 +1,99 @@ +voyage;name;echotype;lengthClass;sizeCategory;lengthCategoryMeaning;baracoudaCode;dataQuality;Biomass;Abundance +PELGAS2011;2011-04-26 13:35:19.0000;;4.0;4.0;mid point of 1 cm size bin;MICR-POU;;5190.7652880528;1297691.3220132 +PELGAS2011;2011-04-26 13:35:19.0000;;5.0;5.0;mid point of 1 cm size bin;MICR-POU;;6488.456610066;1297691.3220132 +PELGAS2011;2011-04-26 13:35:19.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;4.23216018464326;192.370917483784 +PELGAS2011;2011-04-26 13:35:19.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;518.378413690509;38398.4010141118 +PELGAS2011;2011-04-26 13:35:19.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;205.705719718456;16456.4575774765 +PELGAS2011;2011-04-26 13:35:19.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;56.6833538779745;3656.99057277255 +PELGAS2011;2011-04-26 13:35:19.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;76.7968020282235;6399.73350235196 +PELGAS2011;2011-04-26 13:35:19.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;219.419434366353;14627.9622910902 +PELGAS2011;2011-04-26 13:35:19.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;550.377081202269;39312.6486573049 +PELGAS2011;2011-04-26 13:35:19.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;424.210906441616;29255.9245821804 +PELGAS2011;2011-04-26 13:35:19.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;427.867897014388;32912.9151549529 +PELGAS2011;2011-04-26 13:41:22.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;206.748808467523;14767.7720333945 +PELGAS2011;2011-04-26 13:41:22.0000;;5.0;5.0;mid point of 1 cm size bin;MICR-POU;;644.288634652546;128857.726930509 +PELGAS2011;2011-04-26 13:41:22.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;194.728528905458;14424.3354744784 +PELGAS2011;2011-04-26 13:41:22.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;82.4247741398764;5494.98494265843 +PELGAS2011;2011-04-26 13:41:22.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;28.8486709489567;2404.05591241306 +PELGAS2011;2011-04-26 13:41:22.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;21.2930666528014;1373.74623566461 +PELGAS2011;2011-04-26 13:41:22.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;160.728309572759;12363.7161209815 +PELGAS2011;2011-04-26 13:41:22.0000;;4.0;4.0;mid point of 1 cm size bin;MICR-POU;;515.430907722037;128857.726930509 +PELGAS2011;2011-04-26 13:41:22.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;1.58980834286797;72.2640155849076 +PELGAS2011;2011-04-26 13:41:22.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;159.354563337094;10989.9698853169 +PELGAS2011;2011-04-26 13:41:22.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;77.2732257561342;6181.85806049073 +PELGAS2011;2011-04-26 13:47:25.0000;;4.0;4.0;mid point of 1 cm size bin;MICR-POU;;77.909187521494;19477.2968803735 +PELGAS2011;2011-04-26 13:47:25.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;6.60413453599069;300.187933454122 +PELGAS2011;2011-04-26 13:47:25.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;88.4523455231334;5706.60293697635 +PELGAS2011;2011-04-26 13:47:25.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;119.838661676503;9986.55513970861 +PELGAS2011;2011-04-26 13:47:25.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;858.84374201494;61345.9815724957 +PELGAS2011;2011-04-26 13:47:25.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;342.396176218581;22826.4117479054 +PELGAS2011;2011-04-26 13:47:25.0000;;5.0;5.0;mid point of 1 cm size bin;MICR-POU;;97.3864844018675;19477.2968803735 +PELGAS2011;2011-04-26 13:47:25.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;808.910966316397;59919.3308382517 +PELGAS2011;2011-04-26 13:47:25.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;661.965940689256;45652.8234958108 +PELGAS2011;2011-04-26 13:47:25.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;667.672543626233;51359.4264327871 +PELGAS2011;2011-04-26 13:47:25.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;320.99641520492;25679.7132163936 +PELGAS2011;2011-04-26 13:53:27.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;640.663719422669;51253.0975538135 +PELGAS2011;2011-04-26 13:53:27.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;1614.47257294513;119590.560958898 +PELGAS2011;2011-04-26 13:53:27.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;683.374634050847;45558.3089367232 +PELGAS2011;2011-04-26 13:53:27.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;176.538447129802;11389.5772341808 +PELGAS2011;2011-04-26 13:53:27.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;239.181121917797;19931.7601598164 +PELGAS2011;2011-04-26 13:53:27.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;1714.13137374421;122437.955267443 +PELGAS2011;2011-04-26 13:53:27.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;1321.19095916497;91116.6178734463 +PELGAS2011;2011-04-26 13:53:27.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;1332.58053639915;102506.195107627 +PELGAS2011;2011-04-26 13:53:27.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;13.180924131799;599.132915081774 +PELGAS2011;2011-04-26 13:59:40.0000;;4.0;4.0;mid point of 1 cm size bin;MICR-POU;;1799.46233766808;449865.58441702 +PELGAS2011;2011-04-26 13:59:40.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;49.0514771403708;2229.61259728958 +PELGAS2011;2011-04-26 13:59:40.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;656.969990661963;42385.1606878686 +PELGAS2011;2011-04-26 13:59:40.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;6378.96668352423;455640.477394588 +PELGAS2011;2011-04-26 13:59:40.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;4959.06380048063;381466.446190817 +PELGAS2011;2011-04-26 13:59:40.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;2543.10964127212;169540.642751474 +PELGAS2011;2011-04-26 13:59:40.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;2384.16528869261;190733.223095409 +PELGAS2011;2011-04-26 13:59:40.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;890.088374445241;74174.0312037701 +PELGAS2011;2011-04-26 13:59:40.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;6008.09652750537;445044.18722262 +PELGAS2011;2011-04-26 13:59:40.0000;;5.0;5.0;mid point of 1 cm size bin;MICR-POU;;2249.3279220851;449865.58441702 +PELGAS2011;2011-04-26 13:59:40.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;4916.67863979276;339081.285502949 +PELGAS2011;2011-04-26 15:39:10.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;611.371199289744;40758.0799526496 +PELGAS2011;2011-04-26 15:39:10.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;11.7921224942708;536.005567921401 +PELGAS2011;2011-04-26 15:39:10.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;157.937559816517;10189.5199881624 +PELGAS2011;2011-04-26 15:39:10.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;573.160499334135;45852.8399467308 +PELGAS2011;2011-04-26 15:39:10.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;1444.36445832202;106989.959875705 +PELGAS2011;2011-04-26 15:39:10.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;213.97991975141;17831.6599792842 +PELGAS2011;2011-04-26 15:39:10.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;1192.173838615;91705.6798934616 +PELGAS2011;2011-04-26 15:39:10.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;1533.52275821844;109537.339872746 +PELGAS2011;2011-04-26 15:39:10.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;1181.98431862684;81516.1599052992 +PELGAS2011;2011-04-26 15:45:19.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;355.624947719365;28449.9958175492 +PELGAS2011;2011-04-26 15:45:19.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;132.766647148563;11063.8872623802 +PELGAS2011;2011-04-26 15:45:19.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;379.333277567323;25288.8851711549 +PELGAS2011;2011-04-26 15:45:19.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;7.31657703278099;332.571683308227 +PELGAS2011;2011-04-26 15:45:19.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;739.69989125628;56899.9916350984 +PELGAS2011;2011-04-26 15:45:19.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;951.494304564702;67963.8788974787 +PELGAS2011;2011-04-26 15:45:19.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;97.9944300382251;6322.22129278871 +PELGAS2011;2011-04-26 15:45:19.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;733.377669963491;50577.7703423097 +PELGAS2011;2011-04-26 15:45:19.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;896.1748682528;66383.3235742815 +PELGAS2011;2011-04-26 15:51:29.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;635.249201582806;42349.9467721871 +PELGAS2011;2011-04-26 15:51:29.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;222.337220553982;18528.1017128319 +PELGAS2011;2011-04-26 15:51:29.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;1228.14845639343;84699.8935443742 +PELGAS2011;2011-04-26 15:51:29.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;1500.77623873938;111168.610276991 +PELGAS2011;2011-04-26 15:51:29.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;1238.73594308647;95287.380237421 +PELGAS2011;2011-04-26 15:51:29.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;164.106043742225;10587.4866930468 +PELGAS2011;2011-04-26 15:51:29.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;595.546126483881;47643.6901187105 +PELGAS2011;2011-04-26 15:51:29.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;1593.41674730354;113815.481950253 +PELGAS2011;2011-04-26 15:51:29.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;12.2526811994983;556.940054522652 +PELGAS2011;2011-04-26 19:00:33.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;259.421646546826;18530.1176104876 +PELGAS2011;2011-04-26 19:00:33.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;199.952897006192;13789.8549659442 +PELGAS2011;2011-04-26 19:00:33.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;103.423912244582;6894.92748297212 +PELGAS2011;2011-04-26 19:00:33.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;201.676628876935;15513.5868366873 +PELGAS2011;2011-04-26 19:00:33.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;244.338992677825;18099.1846428018 +PELGAS2011;2011-04-26 19:00:33.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;26.717843996517;1723.73187074303 +PELGAS2011;2011-04-26 19:00:33.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;1.99483954010538;90.6745245502444 +PELGAS2011;2011-04-26 19:00:33.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;36.1983692856036;3016.5307738003 +PELGAS2011;2011-04-26 19:00:33.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;96.9599177292955;7756.79341834364 +PELGAS2011;2011-04-26 19:06:46.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;7.48371897748001;340.16904443091 +PELGAS2011;2011-04-26 19:06:46.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;135.799605797964;11316.633816497 +PELGAS2011;2011-04-26 19:06:46.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;363.748944101689;29099.9155281351 +PELGAS2011;2011-04-26 19:06:46.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;100.233042374688;6466.64789514113 +PELGAS2011;2011-04-26 19:06:46.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;973.230508218741;69516.4648727672 +PELGAS2011;2011-04-26 19:06:46.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;916.647339136255;67899.8028989819 +PELGAS2011;2011-04-26 19:06:46.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;756.597803731512;58199.8310562702 +PELGAS2011;2011-04-26 19:06:46.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;750.131155836371;51733.1831611291 +PELGAS2011;2011-04-26 19:06:46.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;387.998873708468;25866.5915805645 diff --git a/echobase-services/src/main/resources/expected b/echobase-services/src/main/resources/expected new file mode 100644 index 0000000..aeb4950 --- /dev/null +++ b/echobase-services/src/main/resources/expected @@ -0,0 +1,99 @@ +voyage;name;echotype;lengthClass;sizeCategory;lengthCategoryMeaning;baracoudaCode;dataQuality;Biomass;Abundance +PELGAS2011;2011-04-26 13:35:19.0000;;4.0;0;mid point of 1 cm size bin;MICR-POU;;5190.7652880528;1297691.3220132 +PELGAS2011;2011-04-26 13:35:19.0000;;5.0;0;mid point of 1 cm size bin;MICR-POU;;6488.456610066;1297691.3220132 +PELGAS2011;2011-04-26 13:35:19.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;4.23216018464326;192.370917483784 +PELGAS2011;2011-04-26 13:35:19.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;518.378413690509;38398.4010141118 +PELGAS2011;2011-04-26 13:35:19.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;205.705719718456;16456.4575774765 +PELGAS2011;2011-04-26 13:35:19.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;56.6833538779745;3656.99057277255 +PELGAS2011;2011-04-26 13:35:19.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;76.7968020282235;6399.73350235196 +PELGAS2011;2011-04-26 13:35:19.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;219.419434366353;14627.9622910902 +PELGAS2011;2011-04-26 13:35:19.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;550.377081202269;39312.6486573049 +PELGAS2011;2011-04-26 13:35:19.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;424.210906441616;29255.9245821804 +PELGAS2011;2011-04-26 13:35:19.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;427.867897014388;32912.9151549529 +PELGAS2011;2011-04-26 13:41:22.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;206.748808467523;14767.7720333945 +PELGAS2011;2011-04-26 13:41:22.0000;;5.0;0;mid point of 1 cm size bin;MICR-POU;;644.288634652546;128857.726930509 +PELGAS2011;2011-04-26 13:41:22.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;194.728528905458;14424.3354744784 +PELGAS2011;2011-04-26 13:41:22.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;82.4247741398764;5494.98494265843 +PELGAS2011;2011-04-26 13:41:22.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;28.8486709489567;2404.05591241306 +PELGAS2011;2011-04-26 13:41:22.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;21.2930666528014;1373.74623566461 +PELGAS2011;2011-04-26 13:41:22.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;160.728309572759;12363.7161209815 +PELGAS2011;2011-04-26 13:41:22.0000;;4.0;0;mid point of 1 cm size bin;MICR-POU;;515.430907722037;128857.726930509 +PELGAS2011;2011-04-26 13:41:22.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;1.58980834286797;72.2640155849076 +PELGAS2011;2011-04-26 13:41:22.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;159.354563337094;10989.9698853169 +PELGAS2011;2011-04-26 13:41:22.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;77.2732257561342;6181.85806049073 +PELGAS2011;2011-04-26 13:47:25.0000;;4.0;0;mid point of 1 cm size bin;MICR-POU;;77.909187521494;19477.2968803735 +PELGAS2011;2011-04-26 13:47:25.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;6.60413453599069;300.187933454122 +PELGAS2011;2011-04-26 13:47:25.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;88.4523455231334;5706.60293697635 +PELGAS2011;2011-04-26 13:47:25.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;119.838661676503;9986.55513970861 +PELGAS2011;2011-04-26 13:47:25.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;858.84374201494;61345.9815724957 +PELGAS2011;2011-04-26 13:47:25.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;342.396176218581;22826.4117479054 +PELGAS2011;2011-04-26 13:47:25.0000;;5.0;0;mid point of 1 cm size bin;MICR-POU;;97.3864844018675;19477.2968803735 +PELGAS2011;2011-04-26 13:47:25.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;808.910966316397;59919.3308382517 +PELGAS2011;2011-04-26 13:47:25.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;661.965940689256;45652.8234958108 +PELGAS2011;2011-04-26 13:47:25.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;667.672543626233;51359.4264327871 +PELGAS2011;2011-04-26 13:47:25.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;320.99641520492;25679.7132163936 +PELGAS2011;2011-04-26 13:53:27.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;640.663719422669;51253.0975538135 +PELGAS2011;2011-04-26 13:53:27.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;1614.47257294513;119590.560958898 +PELGAS2011;2011-04-26 13:53:27.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;683.374634050847;45558.3089367232 +PELGAS2011;2011-04-26 13:53:27.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;176.538447129802;11389.5772341808 +PELGAS2011;2011-04-26 13:53:27.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;239.181121917797;19931.7601598164 +PELGAS2011;2011-04-26 13:53:27.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;1714.13137374421;122437.955267443 +PELGAS2011;2011-04-26 13:53:27.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;1321.19095916497;91116.6178734463 +PELGAS2011;2011-04-26 13:53:27.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;1332.58053639915;102506.195107627 +PELGAS2011;2011-04-26 13:53:27.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;13.180924131799;599.132915081774 +PELGAS2011;2011-04-26 13:59:40.0000;;4.0;0;mid point of 1 cm size bin;MICR-POU;;1799.46233766808;449865.58441702 +PELGAS2011;2011-04-26 13:59:40.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;49.0514771403708;2229.61259728958 +PELGAS2011;2011-04-26 13:59:40.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;656.969990661963;42385.1606878686 +PELGAS2011;2011-04-26 13:59:40.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;6378.96668352423;455640.477394588 +PELGAS2011;2011-04-26 13:59:40.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;4959.06380048063;381466.446190817 +PELGAS2011;2011-04-26 13:59:40.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;2543.10964127212;169540.642751474 +PELGAS2011;2011-04-26 13:59:40.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;2384.16528869261;190733.223095409 +PELGAS2011;2011-04-26 13:59:40.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;890.088374445241;74174.0312037701 +PELGAS2011;2011-04-26 13:59:40.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;6008.09652750537;445044.18722262 +PELGAS2011;2011-04-26 13:59:40.0000;;5.0;0;mid point of 1 cm size bin;MICR-POU;;2249.3279220851;449865.58441702 +PELGAS2011;2011-04-26 13:59:40.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;4916.67863979276;339081.285502949 +PELGAS2011;2011-04-26 15:39:10.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;611.371199289744;40758.0799526496 +PELGAS2011;2011-04-26 15:39:10.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;11.7921224942708;536.005567921401 +PELGAS2011;2011-04-26 15:39:10.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;157.937559816517;10189.5199881624 +PELGAS2011;2011-04-26 15:39:10.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;573.160499334135;45852.8399467308 +PELGAS2011;2011-04-26 15:39:10.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;1444.36445832202;106989.959875705 +PELGAS2011;2011-04-26 15:39:10.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;213.97991975141;17831.6599792842 +PELGAS2011;2011-04-26 15:39:10.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;1192.173838615;91705.6798934616 +PELGAS2011;2011-04-26 15:39:10.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;1533.52275821844;109537.339872746 +PELGAS2011;2011-04-26 15:39:10.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;1181.98431862684;81516.1599052992 +PELGAS2011;2011-04-26 15:45:19.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;355.624947719365;28449.9958175492 +PELGAS2011;2011-04-26 15:45:19.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;132.766647148563;11063.8872623802 +PELGAS2011;2011-04-26 15:45:19.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;379.333277567323;25288.8851711549 +PELGAS2011;2011-04-26 15:45:19.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;7.31657703278099;332.571683308227 +PELGAS2011;2011-04-26 15:45:19.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;739.69989125628;56899.9916350984 +PELGAS2011;2011-04-26 15:45:19.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;951.494304564702;67963.8788974787 +PELGAS2011;2011-04-26 15:45:19.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;97.9944300382251;6322.22129278871 +PELGAS2011;2011-04-26 15:45:19.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;733.377669963491;50577.7703423097 +PELGAS2011;2011-04-26 15:45:19.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;896.1748682528;66383.3235742815 +PELGAS2011;2011-04-26 15:51:29.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;635.249201582806;42349.9467721871 +PELGAS2011;2011-04-26 15:51:29.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;222.337220553982;18528.1017128319 +PELGAS2011;2011-04-26 15:51:29.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;1228.14845639343;84699.8935443742 +PELGAS2011;2011-04-26 15:51:29.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;1500.77623873938;111168.610276991 +PELGAS2011;2011-04-26 15:51:29.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;1238.73594308647;95287.380237421 +PELGAS2011;2011-04-26 15:51:29.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;164.106043742225;10587.4866930468 +PELGAS2011;2011-04-26 15:51:29.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;595.546126483881;47643.6901187105 +PELGAS2011;2011-04-26 15:51:29.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;1593.41674730354;113815.481950253 +PELGAS2011;2011-04-26 15:51:29.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;12.2526811994983;556.940054522652 +PELGAS2011;2011-04-26 19:00:33.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;259.421646546826;18530.1176104876 +PELGAS2011;2011-04-26 19:00:33.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;199.952897006192;13789.8549659442 +PELGAS2011;2011-04-26 19:00:33.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;103.423912244582;6894.92748297212 +PELGAS2011;2011-04-26 19:00:33.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;201.676628876935;15513.5868366873 +PELGAS2011;2011-04-26 19:00:33.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;244.338992677825;18099.1846428018 +PELGAS2011;2011-04-26 19:00:33.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;26.717843996517;1723.73187074303 +PELGAS2011;2011-04-26 19:00:33.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;1.99483954010538;90.6745245502444 +PELGAS2011;2011-04-26 19:00:33.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;36.1983692856036;3016.5307738003 +PELGAS2011;2011-04-26 19:00:33.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;96.9599177292955;7756.79341834364 +PELGAS2011;2011-04-26 19:06:46.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;7.48371897748001;340.16904443091 +PELGAS2011;2011-04-26 19:06:46.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;135.799605797964;11316.633816497 +PELGAS2011;2011-04-26 19:06:46.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;363.748944101689;29099.9155281351 +PELGAS2011;2011-04-26 19:06:46.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;100.233042374688;6466.64789514113 +PELGAS2011;2011-04-26 19:06:46.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;973.230508218741;69516.4648727672 +PELGAS2011;2011-04-26 19:06:46.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;916.647339136255;67899.8028989819 +PELGAS2011;2011-04-26 19:06:46.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;756.597803731512;58199.8310562702 +PELGAS2011;2011-04-26 19:06:46.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;750.131155836371;51733.1831611291 +PELGAS2011;2011-04-26 19:06:46.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;387.998873708468;25866.5915805645 diff --git a/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties b/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties index b01bf77..970fef5 100644 --- a/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties +++ b/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties @@ -57,8 +57,8 @@ echobase.importError.esduCell.withDepthEndFilled=ESDU Cell (id\: %s - name %s) c echobase.importError.esduCellMooring.notfound=A new « dataAquisition» entry must be created for mooring %s, instrument %s, whereas some elementary cells are not associated to an ESDU cell (line %s) echobase.importError.fromFile=An error occured while importing file %s \:%s echobase.importError.mismatch.ageCategoryMeaning=Imported age category meaning (%s) does not match the one persisted ine database (%s) +echobase.importError.mismatch.lengthCategoryMeaning=Imported length category meaning (%s) does not match the one persisted ine database (%s) echobase.importError.mismatch.provider=Line %s - Used «%s» does not match with the configuration. -echobase.importError.mismatch.sizeCategoryMeaning=Imported size category meaning (%s) does not match the one persisted ine database (%s) echobase.importError.mismatch.voyage=Line %s - Used voyage «%s» does not match with the voyage configured. echobase.importError.no.transit.between.date=No transit associated to voyage %s between dates %s and %s echobase.importError.no.voyage.imported=No voyage imported diff --git a/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties b/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties index 9170cfc..22140e2 100644 --- a/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties +++ b/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties @@ -57,8 +57,8 @@ echobase.importError.esduCell.withDepthEndFilled=La cellule de type ESDU (id\: % echobase.importError.esduCellMooring.notfound=Un nouvelle entrée « dataAquisition »doit être créée pour la bouée %s, instrument %s, mais il reste des cellules élémentaires non rattachées à une cellule ESDU (ligne %s) echobase.importError.fromFile=Erreur lors de l'importation du fichier %s \: %s echobase.importError.mismatch.ageCategoryMeaning=Le label de la catégorie d'age (%s) ne correspond pas à celui enregistré en base (%s) +echobase.importError.mismatch.lengthCategoryMeaning=Le label de la catégorie de taille (%s) ne correspond pas à celui enregistré en base (%s) echobase.importError.mismatch.provider=Ligne %s - «%s» ne correspond pas à celle configurée. -echobase.importError.mismatch.sizeCategoryMeaning=Le label de la catégorie de taille (%s) ne correspond pas à celui enregistré en base (%s) echobase.importError.mismatch.voyage=Ligne %s - La marée «%s» ne correspond pas à celle configurée. echobase.importError.no.transit.between.date=Pas de transit attribué au voyage %s entre les dates %s et %s echobase.importError.no.voyage.imported=Aucun voyage importé diff --git a/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz index 062a49e..bc51cb7 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz differ diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst index 4c8ab30..82c66dc 100644 --- a/src/site/en/rst/importData.rst +++ b/src/site/en/rst/importData.rst @@ -897,7 +897,7 @@ Required columns :: - name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthCategoryMeaning;dataQuality;voyage Columns formats --------------- @@ -917,7 +917,7 @@ Columns formats +----------------------+-------------------------------------------------------+ | sizeCategory |text | +----------------------+-------------------------------------------------------+ -| sizeCategoryMeaning |text | +| lengthCategoryMeaning |text | +----------------------+-------------------------------------------------------+ | dataQuality |FK(DataQuality#qualityDataFlagValues) | +----------------------+-------------------------------------------------------+ @@ -929,7 +929,7 @@ Example :: - name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthCategoryMeaning;dataQuality;voyage 2011-04-26 13:35:19.0000_16;D1;COMP-LEM;10.5;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011 Esdu / Species / Age Category diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index 9eb2f62..4e0864e 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -900,7 +900,7 @@ Colonnes requises :: - name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthCategoryMeaning;dataQuality;voyage Format des colonnes ------------------- @@ -920,7 +920,7 @@ Format des colonnes +----------------------+--------------------------------------------------------+ | sizeCategory |text | +----------------------+--------------------------------------------------------+ -| sizeCategoryMeaning |text | +| lengthCategoryMeaning|text | +----------------------+--------------------------------------------------------+ | dataQuality |FK(DataQuality#qualityDataFlagValues) | +----------------------+--------------------------------------------------------+ @@ -932,7 +932,7 @@ Exemple :: - name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthCategoryMeaning;dataQuality;voyage 2011-04-26 13:35:19.0000_16;D1;COMP-LEM;10.5;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011 Esdu / Species / Age Category -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm