branch develop updated (3fd8d22 -> d3e565f)
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 3fd8d22 #8756 Setup spicies handling new d3e565f #8752 Rename lengthCategoryMeaning to 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 d3e565f2b5e6a8de11a276a2df72971a27cd3645 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 19:23:13 2016 +0100 #8752 Rename lengthCategoryMeaning to lengthClassMeaning Summary of changes: ...yEchotypeAndSpeciesCategoryAndLengthImportRow.java | 2 +- ...byEchotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 2605 -> 2601 bytes src/site/en/rst/importData.rst | 6 +++--- src/site/rst/importData.rst | 6 +++--- 4 files changed, 7 insertions(+), 7 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 d3e565f2b5e6a8de11a276a2df72971a27cd3645 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 19:23:13 2016 +0100 #8752 Rename lengthCategoryMeaning to lengthClassMeaning --- ...yEchotypeAndSpeciesCategoryAndLengthImportRow.java | 2 +- ...byEchotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 2605 -> 2601 bytes src/site/en/rst/importData.rst | 6 +++--- src/site/rst/importData.rst | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) 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 40e355a..87f8778 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_LENGTH_CATEGORY_MEANING = "lengthCategoryMeaning"; + public static final String PROPERTY_LENGTH_CATEGORY_MEANING = "lengthClassMeaning"; public static final String PROPERTY_DATA_QUALITY = "dataQuality"; protected Voyage voyage; 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 bc51cb7..4ae6ba0 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 82c66dc..43121ec 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;lengthCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthClassMeaning;dataQuality;voyage Columns formats --------------- @@ -917,7 +917,7 @@ Columns formats +----------------------+-------------------------------------------------------+ | sizeCategory |text | +----------------------+-------------------------------------------------------+ -| lengthCategoryMeaning |text | +| lengthClassMeaning |text | +----------------------+-------------------------------------------------------+ | dataQuality |FK(DataQuality#qualityDataFlagValues) | +----------------------+-------------------------------------------------------+ @@ -929,7 +929,7 @@ Example :: - name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthClassMeaning;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 4e0864e..13b9503 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;lengthCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthClassMeaning;dataQuality;voyage Format des colonnes ------------------- @@ -920,7 +920,7 @@ Format des colonnes +----------------------+--------------------------------------------------------+ | sizeCategory |text | +----------------------+--------------------------------------------------------+ -| lengthCategoryMeaning|text | +| lengthClassMeaning|text | +----------------------+--------------------------------------------------------+ | dataQuality |FK(DataQuality#qualityDataFlagValues) | +----------------------+--------------------------------------------------------+ @@ -932,7 +932,7 @@ Exemple :: - name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;lengthClassMeaning;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