branch feature/8180 updated (cd9fa27 -> ca641fb)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from cd9fa27 Migrate database to introduce echotype for the mooring new ca641fb Complete documentation on mooring import 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 ca641fb5b64360412d08abff449a9c44674f456b Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jul 4 17:33:23 2016 +0200 Complete documentation on mooring import Summary of changes: src/site/en/rst/importData.rst | 302 +++++++++++++++++++++++++++------------- src/site/rst/importData.rst | 303 ++++++++++++++++++++++++++++------------- 2 files changed, 417 insertions(+), 188 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 feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit ca641fb5b64360412d08abff449a9c44674f456b Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jul 4 17:33:23 2016 +0200 Complete documentation on mooring import --- src/site/en/rst/importData.rst | 302 +++++++++++++++++++++++++++------------- src/site/rst/importData.rst | 303 ++++++++++++++++++++++++++++------------- 2 files changed, 417 insertions(+), 188 deletions(-) diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst index bf94842..4a6809a 100644 --- a/src/site/en/rst/importData.rst +++ b/src/site/en/rst/importData.rst @@ -231,98 +231,6 @@ Example voyage;vessel;ancillaryInstrumentation PELGAS2011;Arlequin2 / la colombine;Inst1 -Mooring -======= - -Mooring -~~~~~~~ - -Required columns ----------------- - -:: - - mission;code;description;depth;northLimit;eastLimit;southLimit;upLimit;downLimit;units;zunits;projection;deploymentDate;retrievalDate;siteName;operator;comments - -Columns formats ---------------- - -+-----------------------------+------------------------+ -| Colonne | Type | -+=============================+========================+ -| mission |FK(Mission#name) | -+-----------------------------+------------------------+ -| code |text | -+-----------------------------+------------------------+ -| description |text | -+-----------------------------+------------------------+ -| depth |(float) | -+-----------------------------+------------------------+ -| northLimit |(float) | -+-----------------------------+------------------------+ -| eastLimit |(float) | -+-----------------------------+------------------------+ -| southLimit |(float) | -+-----------------------------+------------------------+ -| upLimit |(float) | -+-----------------------------+------------------------+ -| downLimit |(float) | -+-----------------------------+------------------------+ -| units |text | -+-----------------------------+------------------------+ -| zunits |text | -+-----------------------------+------------------------+ -| projection |text | -+-----------------------------+------------------------+ -| deploymentDate |(date) | -+-----------------------------+------------------------+ -| retrievalDate |(date) | -+-----------------------------+------------------------+ -| siteName |text | -+-----------------------------+------------------------+ -| operator |text | -+-----------------------------+------------------------+ -| comments |text | -+-----------------------------+------------------------+ - -Example -------- - -:: - - mission;code;description;depth;northLimit;eastLimit;southLimit;upLimit;downLimit;units;zunits;projection;deploymentDate;retrievalDate;siteName;operator;comments - PELGAS;MOORING1;Mooring 1;1;1.1;1.2;1.3;1.4;1.5;m;m;None;26-04-2011 08:00:00.0000;04-06-2011 08:00:00.0000;CodeLutin;Moi;RAS - - -Ancillary instrumentation -~~~~~~~~~~~~~~~~~~~~~~~~~ - -Required columns ----------------- - -:: - - mooring;ancillaryInstrumentation - -Columns formats ---------------- - -+-----------------------------+----------------------------------+ -| Colonne | Type | -+=============================+==================================+ -| mooring |FK(Mooring#code) | -+-----------------------------+----------------------------------+ -| ancillaryInstrumentation |FK(AncillaryInstrumentation#name) | -+-----------------------------+----------------------------------+ - -Example -------- - -:: - - mooring;ancillaryInstrumentation - MOORING1;Inst1 - Operation / OperationMetadataValue / GearMetadataValue ====================================================== @@ -859,8 +767,8 @@ Example voyage;baracoudaCode;age;length;percentAtAge;metadata;strata PELGAS2011;ENGR-ENC;1;7.5;1;Ifremer reading;Golfe de Gascogne -Results per ESDU -================ +Results per ESDU for voyage +=========================== Esdu / Echotype ~~~~~~~~~~~~~~~ @@ -1182,3 +1090,209 @@ Example voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality PELGAS2011;-6 43.5 0;ENGR-ENC;0;;-6;43.5;0;0.25;0.25;0;0;1 +Mooring +======= + +Mooring +~~~~~~~ + +Required columns +---------------- + +:: + + mission;code;description;depth;northLimit;eastLimit;southLimit;upLimit;downLimit;units;zunits;projection;deploymentDate;retrievalDate;siteName;operator;comments + +Columns formats +--------------- + ++-----------------------------+------------------------+ +| Colonne | Type | ++=============================+========================+ +| mission |FK(Mission#name) | ++-----------------------------+------------------------+ +| code |text | ++-----------------------------+------------------------+ +| description |text | ++-----------------------------+------------------------+ +| depth |(float) | ++-----------------------------+------------------------+ +| northLimit |(float) | ++-----------------------------+------------------------+ +| eastLimit |(float) | ++-----------------------------+------------------------+ +| southLimit |(float) | ++-----------------------------+------------------------+ +| upLimit |(float) | ++-----------------------------+------------------------+ +| downLimit |(float) | ++-----------------------------+------------------------+ +| units |text | ++-----------------------------+------------------------+ +| zunits |text | ++-----------------------------+------------------------+ +| projection |text | ++-----------------------------+------------------------+ +| deploymentDate |(date) | ++-----------------------------+------------------------+ +| retrievalDate |(date) | ++-----------------------------+------------------------+ +| siteName |text | ++-----------------------------+------------------------+ +| operator |text | ++-----------------------------+------------------------+ +| comments |text | ++-----------------------------+------------------------+ + +Example +------- + +:: + + mission;code;description;depth;northLimit;eastLimit;southLimit;upLimit;downLimit;units;zunits;projection;deploymentDate;retrievalDate;siteName;operator;comments + PELGAS;MOORING1;Mooring 1;1;1.1;1.2;1.3;1.4;1.5;m;m;None;26-04-2011 08:00:00.0000;04-06-2011 08:00:00.0000;CodeLutin;Moi;RAS + +Ancillary instrumentation +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Required columns +---------------- + +:: + + mooring;ancillaryInstrumentation + +Columns formats +--------------- + ++-----------------------------+----------------------------------+ +| Colonne | Type | ++=============================+==================================+ +| mooring |FK(Mooring#code) | ++-----------------------------+----------------------------------+ +| ancillaryInstrumentation |FK(AncillaryInstrumentation#name) | ++-----------------------------+----------------------------------+ + +Example +------- + +:: + + mooring;ancillaryInstrumentation + MOORING1;Inst1 + +Results per mooring +=================== + +Echotype +~~~~~~~~ + +Required columns +---------------- + +:: + + mooring;echotypeName;depthStratumId;meaning;baracoudaCode + +Columns formats +--------------- + ++-----------------+--------------------------+ +| Colonne | Type | ++=================+==========================+ +| echotypeName |text | ++-----------------+--------------------------+ +| meaning |text | ++-----------------+--------------------------+ +| mooring |FK(Mooring#code) | ++-----------------+--------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++-----------------+--------------------------+ + +Example +------- + +:: + + mooring;echotypeName;depthStratumId;meaning;baracoudaCode + MOORING1;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM + +Results per ESDU for mooring +============================ + +Esdu / Echotype +~~~~~~~~~~~~~~~ + +Required columns +---------------- + +:: + + mooring;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + +Columns formats +--------------- + ++----------------+-------------------------------------------------------------+ +| Colonne | Type | ++================+=============================================================+ +| mooring |FK(Mooring#code) | ++----------------+-------------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------+-------------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------+-------------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------+-------------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------+-------------------------------------------------------------+ + +Example +------- + +:: + + mooring;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + MOORING1;2011-04-26 13:29:12.0000;D1;0;P0379;P0379;1 + +Esdu / Echotype / Species Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Required columns +---------------- + +:: + + mooring;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality + +Columns formats +--------------- + ++----------------+-------------------------------------------------------------+ +| Colonne | Type | ++================+=============================================================+ +| mooring |FK(Mooring#code) | ++----------------+-------------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------+-------------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------+-------------------------------------------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+-------------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+-------------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------+-------------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------+-------------------------------------------------------------+ + +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 + diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index ba5425f..24a7f90 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -234,98 +234,6 @@ Exemple voyage;vessel;ancillaryInstrumentation PELGAS2011;Arlequin2 / la colombine;Inst1 -Bouée -===== - -Bouée -~~~~~ - -Colonnes requises ------------------ - -:: - - mission;code;description;depth;northLimit;eastLimit;southLimit;upLimit;downLimit;units;zunits;projection;deploymentDate;retrievalDate;siteName;operator;comments - -Format des colonnes -------------------- - -+-----------------------------+------------------------+ -| Colonne | Type | -+=============================+========================+ -| mission |FK(Mission#name) | -+-----------------------------+------------------------+ -| code |text | -+-----------------------------+------------------------+ -| description |text | -+-----------------------------+------------------------+ -| depth |(float) | -+-----------------------------+------------------------+ -| northLimit |(float) | -+-----------------------------+------------------------+ -| eastLimit |(float) | -+-----------------------------+------------------------+ -| southLimit |(float) | -+-----------------------------+------------------------+ -| upLimit |(float) | -+-----------------------------+------------------------+ -| downLimit |(float) | -+-----------------------------+------------------------+ -| units |text | -+-----------------------------+------------------------+ -| zunits |text | -+-----------------------------+------------------------+ -| projection |text | -+-----------------------------+------------------------+ -| deploymentDate |(date) | -+-----------------------------+------------------------+ -| retrievalDate |(date) | -+-----------------------------+------------------------+ -| siteName |text | -+-----------------------------+------------------------+ -| operator |text | -+-----------------------------+------------------------+ -| comments |text | -+-----------------------------+------------------------+ - -Exemple -------- - -:: - - mission;code;description;depth;northLimit;eastLimit;southLimit;upLimit;downLimit;units;zunits;projection;deploymentDate;retrievalDate;siteName;operator;comments - PELGAS;MOORING1;Mooring 1;1;1.1;1.2;1.3;1.4;1.5;m;m;None;26-04-2011 08:00:00.0000;04-06-2011 08:00:00.0000;CodeLutin;Moi;RAS - - -Ancillary instrumentation -~~~~~~~~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - mooring;ancillaryInstrumentation - -Format des colonnes -------------------- - -+-----------------------------+----------------------------------+ -| Colonne | Type | -+=============================+==================================+ -| mooring |FK(Mooring#code) | -+-----------------------------+----------------------------------+ -| ancillaryInstrumentation |FK(AncillaryInstrumentation#name) | -+-----------------------------+----------------------------------+ - -Exemple -------- - -:: - - mooring;ancillaryInstrumentation - MOORING1;Inst1 - Operation / OperationMetadataValue / GearMetadataValue ====================================================== @@ -862,8 +770,8 @@ Exemple voyage;baracoudaCode;age;length;percentAtAge;metadata;strata PELGAS2011;ENGR-ENC;1;7.5;1;Ifremer reading;Golfe de Gascogne -Résultats Esdu -============== +Résultats Esdu pour les voyages +=============================== Esdu / Echotype ~~~~~~~~~~~~~~~ @@ -1235,3 +1143,210 @@ Exemple voyage;name;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality PELGAS2011;-6 43.5 0;-6;43.5;0;0.25;0.25;0;0;1 +Bouée +===== + +Bouée +~~~~~ + +Colonnes requises +----------------- + +:: + + mission;code;description;depth;northLimit;eastLimit;southLimit;upLimit;downLimit;units;zunits;projection;deploymentDate;retrievalDate;siteName;operator;comments + +Format des colonnes +------------------- + ++-----------------------------+------------------------+ +| Colonne | Type | ++=============================+========================+ +| mission |FK(Mission#name) | ++-----------------------------+------------------------+ +| code |text | ++-----------------------------+------------------------+ +| description |text | ++-----------------------------+------------------------+ +| depth |(float) | ++-----------------------------+------------------------+ +| northLimit |(float) | ++-----------------------------+------------------------+ +| eastLimit |(float) | ++-----------------------------+------------------------+ +| southLimit |(float) | ++-----------------------------+------------------------+ +| upLimit |(float) | ++-----------------------------+------------------------+ +| downLimit |(float) | ++-----------------------------+------------------------+ +| units |text | ++-----------------------------+------------------------+ +| zunits |text | ++-----------------------------+------------------------+ +| projection |text | ++-----------------------------+------------------------+ +| deploymentDate |(date) | ++-----------------------------+------------------------+ +| retrievalDate |(date) | ++-----------------------------+------------------------+ +| siteName |text | ++-----------------------------+------------------------+ +| operator |text | ++-----------------------------+------------------------+ +| comments |text | ++-----------------------------+------------------------+ + +Exemple +------- + +:: + + mission;code;description;depth;northLimit;eastLimit;southLimit;upLimit;downLimit;units;zunits;projection;deploymentDate;retrievalDate;siteName;operator;comments + PELGAS;MOORING1;Mooring 1;1;1.1;1.2;1.3;1.4;1.5;m;m;None;26-04-2011 08:00:00.0000;04-06-2011 08:00:00.0000;CodeLutin;Moi;RAS + + +Ancillary instrumentation +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + mooring;ancillaryInstrumentation + +Format des colonnes +------------------- + ++-----------------------------+----------------------------------+ +| Colonne | Type | ++=============================+==================================+ +| mooring |FK(Mooring#code) | ++-----------------------------+----------------------------------+ +| ancillaryInstrumentation |FK(AncillaryInstrumentation#name) | ++-----------------------------+----------------------------------+ + +Exemple +------- + +:: + + mooring;ancillaryInstrumentation + MOORING1;Inst1 + +Résultats bouée +=============== + +Echotype +~~~~~~~~ + +Colonnes requises +----------------- + +:: + + mooring;echotypeName;depthStratumId;meaning;baracoudaCode + +Format des colonnes +------------------- + ++-----------------+--------------------------+ +| Colonne | Type | ++=================+==========================+ +| echotypeName |text | ++-----------------+--------------------------+ +| meaning |text | ++-----------------+--------------------------+ +| mooring |FK(Mooring#code) | ++-----------------+--------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++-----------------+--------------------------+ + +Exemple +------- + +:: + + mooring;echotypeName;depthStratumId;meaning;baracoudaCode + MOORING1;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM + +Résultats Esdu pour les bouées +============================== + +Esdu / Echotype +~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + mooring;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + +Format des colonnes +------------------- + ++----------------+-------------------------------------------------------------+ +| Colonne | Type | ++================+=============================================================+ +| mooring |FK(Mooring#code) | ++----------------+-------------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------+-------------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------+-------------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------+-------------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------+-------------------------------------------------------------+ + +Exemple +------- + +:: + + mooring;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + MOORING1;2011-04-26 13:29:12.0000;D1;0;P0379;P0379;1 + +Esdu / Echotype / Species Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + mooring;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality + +Format des colonnes +------------------- + ++----------------+-------------------------------------------------------------+ +| Colonne | Type | ++================+=============================================================+ +| mooring |FK(Mooring#code) | ++----------------+-------------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------+-------------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------+-------------------------------------------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+-------------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+-------------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------+-------------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------+-------------------------------------------------------------+ + +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 + -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm