[Echobase-commits] 01/02: Update docuementation

7 Jul 2016

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 a175b26074134d7c15768e6047ee3e7322452def
Author: Julien Ruchaud <julien.ruchaud@debux.org>
Date:   Thu Jul 7 14:15:43 2016 +0200

    Update docuementation
---
 src/site/en/rst/importData.rst | 54 ++++++++++++++++++++++--------------------
 src/site/rst/importData.rst    | 42 ++++++++++++++++----------------
 2 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst
index e82d848..0c5b405 100644
--- a/src/site/en/rst/importData.rst
+++ b/src/site/en/rst/importData.rst
@@ -55,9 +55,9 @@ Columns format
 +---------------+---------------------------------------------------------------+
 | (date)        |ISO date format: *yyyy-MM-dd HH:mm:ss.SSSS*                    |
 +---------------+---------------------------------------------------------------+
-| (esdu cell)   |esdu cell name: <date>_<depth>[_(S|B)]                         |
+| (esdu cell)   |esdu cell name: <date>_<num>[_(S|B)]                           |
 |               | with date format yyyy-MM-dd HH:mm:ss.SSSS                     |
-|               | with depth for depth number                                   |
+|               | with num for cell number                                      |
 |               | with S (surface) or B (bottom) for the elementary cell        |
 +---------------+---------------------------------------------------------------+
 
@@ -85,19 +85,19 @@ Required columns
 Columns formats
 ---------------
 
-+------------+-------+
-| Column     | Type  |
-+============+=======+
-| name       |text   |
-+------------+-------+
-| startDate  |(date) |
-+------------+-------+
-| endDate    |(date) |
-+------------+-------+
-| startPort  |text   |
-+------------+-------+
-| endPort    |text   |
-+------------+-------+
++------------+----------------+
+| Column     | Type           |
++============+================+
+| name       |text            |
++------------+----------------+
+| startDate  |(date)          |
++------------+----------------+
+| endDate    |(date)          |
++------------+----------------+
+| startPort  |FK(Port#code)   |
++------------+----------------+
+| endPort    |FK(Port#code)   |
++------------+----------------+
 
 Example
 -------
@@ -105,7 +105,7 @@ Example
 ::
 
   name;startDate;endDate;startPort;endPort
-  PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;Santander;Concarneau
+  PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;BSH189;BSH4265
 
 Transit
 ~~~~~~~
@@ -152,7 +152,7 @@ Required columns
 
 ::
 
-  title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring
+  title;transectAbstract;stratum;comments;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring
 
 Columns formats
 ---------------
@@ -198,7 +198,7 @@ Example
 
 ::
 
-  title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring
+  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
 
 
@@ -216,7 +216,7 @@ Columns formats
 ---------------
 
 +-----------------------------+----------------------------------+
-| Colonne                     | Type                             |
+| Column                      | Type                             |
 +=============================+==================================+
 | voyage                      |FK(Voyage#name)                   |
 +-----------------------------+----------------------------------+
@@ -489,7 +489,7 @@ Required columns
 
 ::
 
-  MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EI [...]
+  MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EI [...]
 
 Columns formats
 ---------------
@@ -646,14 +646,16 @@ Columns formats
 +---------------------------------------------------------+------------------------------------------+
 | dataQuality                                             |FK(DataQuality#qualityDataFlagValues) //E |
 +---------------------------------------------------------+------------------------------------------+
+| label                                                   |text                                 //BW |
++---------------------------------------------------------+------------------------------------------+
 
 Example
 -------
 
 ::
 
-  MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EI [...]
-  2011/06/23 10:09:00.0000;NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000;43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;variable;1
+  MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EI [...]
+  2011/06/23 10:09:00.0000;NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000;43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;variable;1;0
 
 Results per voyage
 ==================
@@ -1168,7 +1170,7 @@ Columns formats
 ---------------
 
 +-----------------------------+----------------------------------+
-| Colonne                     | Type                             |
+| Column                      | Type                             |
 +=============================+==================================+
 | mooring                     |FK(Mooring#code)                  |
 +-----------------------------+----------------------------------+
@@ -1200,7 +1202,7 @@ Columns formats
 ---------------
 
 +-----------------+--------------------------+
-| Colonne         | Type                     |
+| Column          | Type                     |
 +=================+==========================+
 | echotypeName    |text                      |
 +-----------------+--------------------------+
@@ -1238,7 +1240,7 @@ Columns formats
 ---------------
 
 +----------------+-------------------------------------------------------------+
-| Colonne        | Type                                                        |
+| Column         | Type                                                        |
 +================+=============================================================+
 | mooring        |FK(Mooring#code)                                             |
 +----------------+-------------------------------------------------------------+
@@ -1273,7 +1275,7 @@ Columns formats
 ---------------
 
 +----------------+-------------------------------------------------------------+
-| Colonne        | Type                                                        |
+| Column         | Type                                                        |
 +================+=============================================================+
 | mooring        |FK(Mooring#code)                                             |
 +----------------+-------------------------------------------------------------+
diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst
index f6b3b59..222623c 100644
--- a/src/site/rst/importData.rst
+++ b/src/site/rst/importData.rst
@@ -54,9 +54,9 @@ Format des colonnes
 +---------------+---------------------------------------------------------------+
 | (date)        |unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS*             |
 +---------------+---------------------------------------------------------------+
-| (esdu cell)   |nom de cellule esdu : <date>_<depth>[_(S|B)]                   |
+| (esdu cell)   |nom de cellule esdu : <date>_<num>[_(S|B)]                     |
 |               | avec date au format yyyy-MM-dd HH:mm:ss.SSSS                  |
-|               | avec depth pour le numéro de profondeur                       |
+|               | avec num pour le numéro de cellule                            |
 |               | avec S (surface) ou B (bottom) pour les cellules élémentaires |
 +---------------+---------------------------------------------------------------+
 
@@ -89,19 +89,19 @@ Colonnes requises
 Format des colonnes
 -------------------
 
-+------------+-------+
-| Colonne    | Type  |
-+============+=======+
-| name       |text   |
-+------------+-------+
-| startDate  |(date) |
-+------------+-------+
-| endDate    |(date) |
-+------------+-------+
-| startPort  |text   |
-+------------+-------+
-| endPort    |text   |
-+------------+-------+
++------------+----------------+
+| Colonne    | Type           |
++============+================+
+| name       |text            |
++------------+----------------+
+| startDate  |(date)          |
++------------+----------------+
+| endDate    |(date)          |
++------------+----------------+
+| startPort  |FK(Port#code)   |
++------------+----------------+
+| endPort    |FK(Port#code)   |
++------------+----------------+
 
 Exemple
 -------
@@ -109,7 +109,7 @@ Exemple
 ::
 
   name;startDate;endDate;startPort;endPort
-  PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;Santander;Concarneau
+  PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;BSH189;BSH4265
 
 Transit
 ~~~~~~~
@@ -156,7 +156,7 @@ Colonnes requises
 
 ::
 
-  title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring
+  title;transectAbstract;stratum;comments;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring
 
 Format des colonnes
 -------------------
@@ -492,7 +492,7 @@ Colonnes requises
 
 ::
 
-  MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EI [...]
+  MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EI [...]
 
 Format des colonnes
 -------------------
@@ -649,14 +649,16 @@ Format des colonnes
 +---------------------------------------------------------+------------------------------------------+
 | dataQuality                                             |FK(DataQuality#qualityDataFlagValues) //E |
 +---------------------------------------------------------+------------------------------------------+
+| label                                                   |text                                 //BW |
++---------------------------------------------------------+------------------------------------------+
 
 Exemple
 -------
 
 ::
 
-  MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EI [...]
-  2011/06/23 10:09:00.0000;NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000;43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;variable;1
+  MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EI [...]
+  2011/06/23 10:09:00.0000;NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000;43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;variable;1;1
 
 Résultats voyage
 ================

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Echobase-commits] 01/02: Update docuementation

codelutin.com scm