[Echobase-commits] r540 - in trunk/src/site: . rst

13 Apr 2012

Author: tchemit
Date: 2012-04-13 14:36:56 +0200 (Fri, 13 Apr 2012)
New Revision: 540

Url: http://forge.codelutin.com/repositories/revision/echobase/540

Log:
refs #484: Documentation (ajout d'exemples)

Modified:
   trunk/src/site/rst/imports.rst
   trunk/src/site/site_fr.xml

Modified: trunk/src/site/rst/imports.rst
===================================================================

--- trunk/src/site/rst/imports.rst	2012-04-13 12:05:18 UTC (rev 539)
+++ trunk/src/site/rst/imports.rst	2012-04-13 12:36:56 UTC (rev 540)
@@ -21,9 +21,9 @@
 .. * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .. * #L%
 .. -
-=======================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Liste des colonnes des imports EchoBase
-=======================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. contents:: Table des matières
     :depth: 2
@@ -33,11 +33,12 @@
     :depth: 2
 
 Abstract
---------
+========
 
 Ce document donne la définition de tous les imports.
 
-Sur les types :
+Format des colonnes
+~~~~~~~~~~~~~~~~~~~
 
 - FK(XXX#yyy) désigne une clef étrangère requise (XXX sur la propriété yyy).
 - (int) un entier (pas du nullité possible)
@@ -50,21 +51,59 @@
 - (esdu cell) nom de cellule esdu - elementary : esduName[_elementaryCellName]
   avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS
 
+Note importantes
+~~~~~~~~~~~~~~~~
+
+- Le nom des colonnes est sensible à la casse, il faut donc bien respecter les
+  noms donnés dans cette page.
+
+- Le contenu des cellules (et aussi les nom de colonnes) peuvent être encapsulés
+  par des **"**.
+
+
 Voyage / Transit / Transect
----------------------------
+===========================
 
 Voyage
 ~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  name;startDate;endDate;startPort;endPort
+
+Format des colonnes
+-------------------
+
 - name
 - startDate (date)
 - endDate   (date)
 - startPort
 - endPort
 
+Exemple
+-------
+
+::
+
+  name;startDate;endDate;startPort;endPort
+  PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;Santander;Concarneau
+
 Transit
 ~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;description;startTime;endTime;startLocality;endLocality
+
+Format des colonnes
+-------------------
+
 - voyage        FK(voyage#name)
 - description
 - startTime     (date)
@@ -72,9 +111,27 @@
 - startLocality
 - endLocality
 
+Exemple
+-------
+
+::
+
+  voyage;description;startTime;endTime;startLocality;endLocality
+  PELGAS2011;PELGAS11CAMP1;2011-04-26 08:00:01.0000;2011-05-08 20:00:00.0000;Santander;La Rochelle
+
 Transect
 ~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring
+
+Format des colonnes
+-------------------
+
 - voyage                FK(voyage#name)
 - vesselName            FK(Vessel#name)
 - title
@@ -92,12 +149,30 @@
 - geospatialVerticalMax (float)
 - linestring
 
+Exemple
+-------
+
+::
+
+  title;transectAbstract;stratum;comment;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
+
 Operation / OperationMetadataValue / GearMetadataValue
-------------------------------------------------------
+======================================================
 
 Operation
 ~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode
+
+Format des colonnes
+-------------------
+
 - vesselName                 FK(Vessel#name)
 - gearCode                   FK(Gear#casinoGearName)
 - depthStratumId             FK(DepthStratum#id)
@@ -111,29 +186,83 @@
 - gearShootingStartLongitude (float)
 - gearShootingEndLongitude   (float)
 
+Exemple
+-------
+
+::
+
+  vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode
+  THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000";45.4165605;-1.4492292;45.4029733;-1.4860902;"2011-05-05 07:42:19.0000";45.4301477;-1.4123682;"57x52
+
 OperationMetadataValue
 ~~~~~~~~~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  vesselName;operationId;metadataType;operationMetadataValue
+
+Format des colonnes
+-------------------
+
 - vesselName             FK(Vessel#name)
 - operationId            FK(Operation#id)
 - metadataType           FK(OperationMetadata#name)
 - operationMetadataValue
 
+Exemple
+-------
+
+::
+
+  vesselName;operationId;metadataType;operationMetadataValue
+  THALASSA II;P0422;MeanWaterDepth";43.42
+
 GearMetadataValue
 ~~~~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  vesselName;operationId;gearCode;metadataType;gearMetadataValue
+
+Format des colonnes
+-------------------
+
 - vesselName         FK(Vessel#name)
 - operationId        FK(Operation#id)
 - metadataType       FK(GearMetadata#name)
 - gearCode           FK(Gear#casinoGearName)
 - gearMetadataValue
 
+Exemple
+-------
+
+::
+
+  vesselName;operationId;gearCode;metadataType;gearMetadataValue
+  THALASSA II;P0422;57x52;CableLength";31.6666666666667
+
 TotalSample / SubSample / BiometrySample
-----------------------------------------
+========================================
 
 TotalSample
 ~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight
+
+Format des colonnes
+-------------------
+
 - operationId    FK(Operation#id)
 - baracoudaCode  FK(Species#baracoudaCode)
 - sizeCategory   FK(SizeCategory#name)
@@ -144,9 +273,27 @@
 - noPerKg        (Float-NA)
 - sortedWeight   (float)
 
+Exemple
+-------
+
+::
+
+  operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight
+  P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03
+
 SubSample
 ~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round
+
+Format des colonnes
+-------------------
+
 - operationId     FK(Operation#id)
 - baracoudaCode   FK(Species#baracoudaCode)
 - sizeCategory    FK(SizeCategory#name)
@@ -159,9 +306,27 @@
 
 (colonnes ignorées) subHaul units round
 
+Exemple
+-------
+
+::
+
+  operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round
+  P0372;ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5
+
 BiometrySample
 ~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  operationId;baracoudaCode;numFish;dataLabel;dataValue;name
+
+Format des colonnes
+-------------------
+
 - operationId   FK(Operation#id)
 - baracoudaCode FK(Species#baracoudaCode)
 - numFish       (int)
@@ -169,26 +334,80 @@
 - dataLabel
 - dataValue     (Float-NA)
 
+Exemple
+-------
+
+::
+
+  operationId;baracoudaCode;numFish;dataLabel;dataValue;name
+  P5002;ENGR-ENC";9394;NA;-1;"Age
+
 Acoustic
---------
+========
 
+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_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality
+
+Format des colonnes
+-------------------
+
 A faire...
 
+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_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality
+  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
+
 Résultats voyage
-----------------
+================
 
 Echotype
 ~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;echotypeName;depthStratumId;meaning;baracoudaCode
+
+Format des colonnes
+-------------------
+
 - echotypeName
 - meaning
 - voyage         FK(Voyage#name)
 - depthStratumId FK(DepthStratum#id)
 - baracoudaCode  FK(Species#baracoudaCode)
 
+Exemple
+-------
+
+::
+
+  voyage;echotypeName;depthStratumId;meaning;baracoudaCode
+  PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM
+
 LengthWeightKey
 ~~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata
+
+Format des colonnes
+-------------------
+
 - aParameter    (float)
 - bParameter    (float)
 - voyage        FK(Voyage#name)
@@ -196,9 +415,27 @@
 - baracoudaCode FK(Species#baracoudaCode)
 - strata        FK(Strata#name)
 
+Exemple
+-------
+
+::
+
+  voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata
+  PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne
+
 LengthAgeKey
 ~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;baracoudaCode;age;length;percentAtAge;metadata;strata
+
+Format des colonnes
+-------------------
+
 - voyage        FK(Voyage#name)
 - age           (int)
 - length        (float)
@@ -207,57 +444,147 @@
 - strata        FK(Strata#name)
 - baracoudaCode FK(Species#baracoudaCode)
 
+Exemple
+-------
+
+::
+
+  voyage;baracoudaCode;age;length;percentAtAge;metadata;strata
+  PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne
+
 Résultats Esdu
---------------
+==============
 
 Esdu / Echotype
 ~~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality
+
+Format des colonnes
+-------------------
+
 - voyage      FK(Voyage#name)
 - name        FK(esdu cell)
 - echotype    FK(Echotype#name)
 - dataQuality FK(DataQuality#qualityDataFlagValues)
-- ... DataMetadata#name ...
+- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
 
+Exemple
+-------
+
+::
+
+  voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality
+  PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1
+
 Esdu / Echotype / Species Category
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality
+
+Format des colonnes
+-------------------
+
 - voyage        FK(Voyage#name)
 - name          FK(esdu cell)
 - echotype      FK(Echotype#name)
 - sizeCategory  FK(SizeCategory#name)
 - baracoudaCode FK(Species#baracoudaCode)
 - dataQuality   FK(DataQuality#qualityDataFlagValues)
-- ... DataMetadata#name ...
+- 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
+  PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0";4;0;20;0.05;0;0.00100292822891053;0;0;0;1
+
 Esdu / Species / Age Category
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage
+
+Format des colonnes
+-------------------
+
 - voyage              FK(Voyage#name)
 - name                FK(esdu cell)
 - baracoudaCode       FK(Species#baracoudaCode)
 - ageCategory
 - ageCategoryMeaning
 - dataQuality         FK(DataQuality#qualityDataFlagValues)
-- ... DataMetadata#name ...
+- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
 
+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
+
 Esdu / Species / Size Category
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage
+
+Format des colonnes
+-------------------
+
 - voyage              FK(Voyage#name)
 - name                FK(esdu cell)
 - baracoudaCode       FK(Species#baracoudaCode)
 - sizeCategory
 - sizeCategoryMeaning
 - dataQuality         FK(DataQuality#qualityDataFlagValues)
-- ... DataMetadata#name ...
+- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
 
+Exemple
+-------
+
+::
+
+  name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage
+  2011-04-26 13:35:19.0000;MICR-POU";4;5190.7652880528;1297691.3220132;"mid point of 1 cm size bin";1;"PELGAS2011
+
 Region
-------
+======
 
 Region
 ~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;name;cellType;regionEnvCoordinates;surface;dataQuality
+
+Format des colonnes
+-------------------
+
 - voyage               FK(Voyage#name)
 - cellType             FK(CellType)
 - dataQuality          FK(DataQuality#qualityDataFlagValues)
@@ -265,27 +592,81 @@
 - regionEnvCoordinates
 - surface              (float)
 
+Exemple
+-------
+
+::
+
+  voyage;name;cellType;regionEnvCoordinates;surface;dataQuality
+  PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1
+
 Region Association
 ~~~~~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;regionName;esduName
+
+Format des colonnes
+-------------------
+
 - voyage     FK(Voyage)
 - regionName FK(Cell#name)
 - esduName   FK(Cell#name)
 
+Exemple
+-------
+
+::
+
+  voyage;regionName;esduName
+  PELGAS2011";1;"2011-05-02 09:36:54.0000
+
 Region results
 ~~~~~~~~~~~~~~
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality
+
+Format des colonnes
+-------------------
+
 - voyage        FK(Voyage#name)
 - name          FK(Cell#name)
 - baracoudaCode FK(Species#baracoudaCode)
 - echotype      FK(Echotype#name)
 - sizeCategory  FK(SizeCategory#name)
 - dataQuality   FK(DataQuality#qualityDataFlagValues)
-- ... DataMetadata#name ...
+- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
 
+Exemple
+-------
+
+::
+
+  voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality
+  PELGAS2011;6;CLUP-HAR;0;D2";NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1
+
 Map
----
+===
 
+Colonnes requises
+-----------------
+
+::
+
+  voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality
+
+Format des colonnes
+-------------------
+
 - voyage               FK(Voyage#name)
 - name
 - baracoudaCode        FK(Species#baracoudaCode)
@@ -298,20 +679,12 @@
 - gridLongitudeLag     (float)
 - gridLatitudeLag      (float)
 - gridDepthLag         (float)
-- ... DataMetadata#name ...
+- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
 
+Exemple
+-------
 
+::
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+  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

Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml	2012-04-13 12:05:18 UTC (rev 539)
+++ trunk/src/site/site_fr.xml	2012-04-13 12:36:56 UTC (rev 540)
@@ -34,12 +34,6 @@
   <custom>
     <fluidoSkin>
       <topBarEnabled>true</topBarEnabled>
-      <!--topBarIcon>
-        <name>${project.name}</name>
-        <alt>${project.name}</alt>
-        <src>./images/echobase-logo.png</src>
-        <href>/index.html</href>
-      </topBarIcon-->
       <googleSearch/>
       <sideBarEnabled>false</sideBarEnabled>
       <searchEnabled>true</searchEnabled>

    

[Echobase-commits] r540 - in trunk/src/site: . rst

tchemit＠users.forge.codelutin.com