branch develop updated (df4a2de -> a3822b1)
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 df4a2de #8738 Remove ReferenceStationBiometry in documentation # new 3d59cca Update documentation with right example on esdu cell name new a3822b1 #8744 DataQuality wasn't copy in export row The 2 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 a3822b1ec7e9ef4955bd1f27dbca4111e2faf743 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Nov 7 16:24:20 2016 +0100 #8744 DataQuality wasn't copy in export row commit 3d59cca484f9aa74bf2b1b007b0f60da802badd6 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Nov 7 15:45:11 2016 +0100 Update documentation with right example on esdu cell name Summary of changes: ...tsEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/MooringResultsEsduByEchotypeImportRow.java | 1 + ...tsEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/VoyageResultsEsduByEchotypeImportRow.java | 1 + ...ResultsEsduBySpeciesAndAgeCategoryImportRow.java | 1 + .../import-data/result/esdu/byEchotype.csv.gz | Bin 73195 -> 72758 bytes .../import-data/result/esdu/byEchotype_small.csv.gz | Bin 2802 -> 2791 bytes src/site/en/rst/importData.rst | 14 +++++++------- src/site/rst/importData.rst | 14 +++++++------- 9 files changed, 19 insertions(+), 14 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 3d59cca484f9aa74bf2b1b007b0f60da802badd6 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Nov 7 15:45:11 2016 +0100 Update documentation with right example on esdu cell name --- src/site/en/rst/importData.rst | 14 +++++++------- src/site/rst/importData.rst | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst index 8566a75..bf07ceb 100644 --- a/src/site/en/rst/importData.rst +++ b/src/site/en/rst/importData.rst @@ -844,7 +844,7 @@ Example :: voyage;name;echotype;NASC;ReferenceStationCatch;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1;0;P0379;1 + PELGAS2011;2011-04-26 13:29:12.0000_16;D1;0;P0379;1 Esdu / Echotype / Species Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -883,7 +883,7 @@ Example :: voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 + PELGAS2011;2011-04-26 13:29:12.0000_16;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 Esdu / Echotype / Species Category / Length ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -926,7 +926,7 @@ Example :: name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;D1;COMP-LEM;10.5;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011 + 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -965,7 +965,7 @@ Example :: name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;ENGR-ENC;3;3377.00492644042;fish age-group (years);1;PELGAS2011 + 2011-04-26 13:35:19.0000_16;ENGR-ENC;3;3377.00492644042;fish age-group (years);1;PELGAS2011 Region ====== @@ -1036,7 +1036,7 @@ Example :: voyage;regionName;esduName - PELGAS2011;1;2011-05-02 09:36:54.0000 + PELGAS2011;1;2011-05-02 09:36:54.0000_16 Results per regions ~~~~~~~~~~~~~~~~~~~ @@ -1296,7 +1296,7 @@ Example :: mooring;name;echotype;NASC;ReferenceStationCatch;dataQuality - MOORING1;2011-04-26 13:29:12.0000;D1;0;P0379;1 + MOORING1;2011-04-26 13:29:12.0000_16;D1;0;P0379;1 Esdu / Echotype / Species Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1335,5 +1335,5 @@ Example :: voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - MOORING1;2011-04-26 13:29:12.0000;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 + MOORING1;2011-04-26 13:29:12.0000_16;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index d3111fc..a4cb2ba 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -847,7 +847,7 @@ Exemple :: voyage;name;echotype;NASC;ReferenceStationCatch;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1;0;P0379;1 + PELGAS2011;2011-04-26 13:29:12.0000_16;D1;0;P0379;1 Esdu / Echotype / Species Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -886,7 +886,7 @@ Exemple :: voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 + PELGAS2011;2011-04-26 13:29:12.0000_16;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 Esdu / Echotype / Species Category / Length ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -929,7 +929,7 @@ Exemple :: name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;D1;COMP-LEM;10.5;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011 + 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -968,7 +968,7 @@ Exemple :: name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;ENGR-ENC;3;3377.00492644042;fish age-group (years);1;PELGAS2011 + 2011-04-26 13:35:19.0000_16;ENGR-ENC;3;3377.00492644042;fish age-group (years);1;PELGAS2011 Region ====== @@ -1039,7 +1039,7 @@ Exemple :: voyage;regionName;esduName - PELGAS2011;1;2011-05-02 09:36:54.0000 + PELGAS2011;1;2011-05-02 09:36:54.0000_16 Region results ~~~~~~~~~~~~~~ @@ -1350,7 +1350,7 @@ Exemple :: mooring;name;echotype;NASC;ReferenceStationCatch;dataQuality - MOORING1;2011-04-26 13:29:12.0000;D1;0;P0379;1 + MOORING1;2011-04-26 13:29:12.0000_16;D1;0;P0379;1 Esdu / Echotype / Species Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1389,5 +1389,5 @@ Exemple :: voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - MOORING1;2011-04-26 13:29:12.0000;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 + MOORING1;2011-04-26 13:29:12.0000_16;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 -- 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 a3822b1ec7e9ef4955bd1f27dbca4111e2faf743 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Nov 7 16:24:20 2016 +0100 #8744 DataQuality wasn't copy in export row --- ...tsEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/MooringResultsEsduByEchotypeImportRow.java | 1 + ...tsEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/VoyageResultsEsduByEchotypeImportRow.java | 1 + ...ResultsEsduBySpeciesAndAgeCategoryImportRow.java | 1 + .../import-data/result/esdu/byEchotype.csv.gz | Bin 73195 -> 72758 bytes .../import-data/result/esdu/byEchotype_small.csv.gz | Bin 2802 -> 2791 bytes 7 files changed, 5 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java index ac2728b..f200708 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java @@ -73,6 +73,7 @@ public class MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow implements row.setEchotype(category.getEchotype()); row.setSizeCategory(category.getSpeciesCategory().getSizeCategory()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportRow.java index 491deb6..5f8676a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportRow.java @@ -59,6 +59,7 @@ public class MooringResultsEsduByEchotypeImportRow implements ResultAble, CellAb row.setCell(cell); row.setEchotype(category.getEchotype()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java index 260fd08..9622577 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java @@ -72,6 +72,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow implements R row.setEchotype(category.getEchotype()); row.setSizeCategory(category.getSpeciesCategory().getSizeCategory()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java index 632226b..0865712 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java @@ -58,6 +58,7 @@ public class VoyageResultsEsduByEchotypeImportRow implements ResultAble, CellAbl row.setCell(cell); row.setEchotype(category.getEchotype()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java index 0c0a5aa..6b54584 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java @@ -65,6 +65,7 @@ public class VoyageResultsEsduBySpeciesAndAgeCategoryImportRow implements Result row.setAgeCategory(category.getSpeciesCategory().getAgeCategory().getName()); row.setAgeCategoryMeaning(category.getSpeciesCategory().getAgeCategory().getMeaning()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz index 3518109..54f5cb9 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/esdu/byEchotype_small.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/byEchotype_small.csv.gz index dbb9dfb..e433911 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/byEchotype_small.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/byEchotype_small.csv.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm