branch feature/8180 updated (499517a -> edc70c3)
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 499517a Migrate database and add ancillary instrumentation new edc70c3 Complete documentation on Ancillary instrumentation 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 edc70c38e076ce437e327c22383bca9c0d8ba264 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jul 4 12:00:48 2016 +0200 Complete documentation on Ancillary instrumentation import Summary of changes: src/site/en/rst/importData.rst | 63 ++++++++++++++++++++++++++++++++++++++++++ src/site/rst/importData.rst | 63 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 1 deletion(-) -- 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 edc70c38e076ce437e327c22383bca9c0d8ba264 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jul 4 12:00:48 2016 +0200 Complete documentation on Ancillary instrumentation import --- src/site/en/rst/importData.rst | 63 ++++++++++++++++++++++++++++++++++++++++++ src/site/rst/importData.rst | 63 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst index 2f3352f..bf94842 100644 --- a/src/site/en/rst/importData.rst +++ b/src/site/en/rst/importData.rst @@ -23,6 +23,8 @@ Importing data in EchoBase ========================== +.. contents:: + Abstract ======== @@ -198,6 +200,37 @@ Example Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000;-1.5896666667;43.7055;110;-1.541;43.7606666667;110;-176453.0000037 4851310.5,-171051 4857434.0000037 +Ancillary instrumentation +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Required columns +---------------- + +:: + + voyage;vessel;ancillaryInstrumentation + +Columns formats +--------------- + ++-----------------------------+----------------------------------+ +| Colonne | Type | ++=============================+==================================+ +| voyage |FK(Voyage#name) | ++-----------------------------+----------------------------------+ +| vessel |FK(Vessel#name) | ++-----------------------------+----------------------------------+ +| ancillaryInstrumentation |FK(AncillaryInstrumentation#name) | ++-----------------------------+----------------------------------+ + +Example +------- + +:: + + voyage;vessel;ancillaryInstrumentation + PELGAS2011;Arlequin2 / la colombine;Inst1 + Mooring ======= @@ -260,6 +293,36 @@ 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 ====================================================== diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index 9ecac81..ba5425f 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -162,7 +162,7 @@ Format des colonnes +------------------------+----------------+ | Colonne | Type | +========================+================+ -| voyage |FK(voyage#name) | +| voyage |FK(Voyage#name) | +------------------------+----------------+ | vesselName |FK(Vessel#name) | +------------------------+----------------+ @@ -203,6 +203,37 @@ Exemple title;transectAbstract;stratum;comments;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000;-1.5896666667;43.7055;110;-1.541;43.7606666667;110;-176453.0000037 4851310.5,-171051 4857434.0000037 +Ancillary instrumentation +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;vessel;ancillaryInstrumentation + +Format des colonnes +------------------- + ++-----------------------------+----------------------------------+ +| Colonne | Type | ++=============================+==================================+ +| voyage |FK(Voyage#name) | ++-----------------------------+----------------------------------+ +| vessel |FK(Vessel#name) | ++-----------------------------+----------------------------------+ +| ancillaryInstrumentation |FK(AncillaryInstrumentation#name) | ++-----------------------------+----------------------------------+ + +Exemple +------- + +:: + + voyage;vessel;ancillaryInstrumentation + PELGAS2011;Arlequin2 / la colombine;Inst1 + Bouée ===== @@ -265,6 +296,36 @@ 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 ====================================================== -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm