[Echobase-commits] r820 - in trunk: echobase-ui/src/main/webapp src/site/en/rst src/site/rst

14 Jul 2013

Author: tchemit
Date: 2013-07-14 09:11:50 +0200 (Sun, 14 Jul 2013)
New Revision: 820

Url: http://forge.codelutin.com/projects/echobase/repository/revisions/820

Log:
add echobase favicon + fix some typo in importData doc

Added:
   trunk/echobase-ui/src/main/webapp/favicon_lutin.png
Modified:
   trunk/echobase-ui/src/main/webapp/favicon.png
   trunk/src/site/en/rst/importData.rst
   trunk/src/site/rst/importData.rst

Modified: trunk/echobase-ui/src/main/webapp/favicon.png
===================================================================
(Binary files differ)

Added: trunk/echobase-ui/src/main/webapp/favicon_lutin.png
===================================================================
(Binary files differ)


Property changes on: trunk/echobase-ui/src/main/webapp/favicon_lutin.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: trunk/src/site/en/rst/importData.rst
===================================================================

--- trunk/src/site/en/rst/importData.rst	2013-07-14 06:19:21 UTC (rev 819)
+++ trunk/src/site/en/rst/importData.rst	2013-07-14 07:11:50 UTC (rev 820)
@@ -151,7 +151,7 @@
 ::
 
   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
+  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
 ======================================================
@@ -188,7 +188,7 @@
 ::
 
   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
+  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
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -214,7 +214,7 @@
 ::
 
   vesselName;operationId;metadataType;operationMetadataValue
-  THALASSA II;P0422;MeanWaterDepth";43.42
+  THALASSA II;P0422;MeanWaterDepth;43.42
 
 GearMetadataValue
 ~~~~~~~~~~~~~~~~~
@@ -241,7 +241,7 @@
 ::
 
   vesselName;operationId;gearCode;metadataType;gearMetadataValue
-  THALASSA II;P0422;57x52;CableLength";31.6666666666667
+  THALASSA II;P0422;57x52;CableLength;31.6666666666667
 
 TotalSample / SubSample / BiometrySample
 ========================================
@@ -275,7 +275,7 @@
 ::
 
   operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight
-  P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03
+  P0435;ALLO-TEZ;0;0.21;36;6.4;6;166.66;0.03
 
 SubSample
 ~~~~~~~~~
@@ -308,7 +308,7 @@
 ::
 
   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
+  P0372;ENGR-ENC;0;N;3.37;198;12;7;0.08;0;5
 
 BiometrySample
 ~~~~~~~~~~~~~~
@@ -336,7 +336,7 @@
 ::
 
   operationId;baracoudaCode;numFish;dataLabel;dataValue;name
-  P5002;ENGR-ENC";9394;NA;-1;"Age
+  P5002;ENGR-ENC;9394;NA;-1;Age
 
 Acoustic
 ~~~~~~~~
@@ -359,7 +359,7 @@
 ::
 
   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
+  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
 ================
@@ -417,7 +417,7 @@
 ::
 
   voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata
-  PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne
+  PELGAS2011;0;2.48253468289872;3.37866337729714;ENGR-ENC;Golfe de Gascogne
 
 LengthAgeKey
 ~~~~~~~~~~~~
@@ -446,7 +446,7 @@
 ::
 
   voyage;baracoudaCode;age;length;percentAtAge;metadata;strata
-  PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne
+  PELGAS2011;ENGR-ENC;1;7.5;1;Ifremer reading;Golfe de Gascogne
 
 Résultats Esdu
 ==============
@@ -464,10 +464,10 @@
 Format des colonnes
 -------------------
 
-- voyage      FK(Voyage#name)
-- name        FK(esdu cell)
-- echotype    FK(Echotype#name)
-- dataQuality FK(DataQuality#qualityDataFlagValues)
+- voyage       FK(Voyage#name)
+- 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
@@ -476,7 +476,7 @@
 ::
 
   voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality
-  PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1
+  PELGAS2011;2011-04-26 13:29:12.0000;D1;0;P0379;P0379;1
 
 Esdu / Echotype / Species Category
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -497,7 +497,7 @@
 - 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)
+- méta-données  FK(DataMetadata#name) (une colonne par méta à importer)
 
 Exemple
 -------
@@ -505,7 +505,7 @@
 ::
 
   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
+  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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -526,7 +526,7 @@
 - ageCategory
 - ageCategoryMeaning
 - dataQuality         FK(DataQuality#qualityDataFlagValues)
-- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
+- méta-données        FK(DataMetadata#name) (une colonne par méta à importer)
 
 Exemple
 -------
@@ -534,7 +534,7 @@
 ::
 
   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
+  2011-04-26 13:35:19.0000;ENGR-ENC;3;3377.00492644042;fish age-group (years);1;PELGAS2011
 
 Esdu / Species / Size Category
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -555,7 +555,7 @@
 - sizeCategory
 - sizeCategoryMeaning
 - dataQuality         FK(DataQuality#qualityDataFlagValues)
-- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
+- méta-données        FK(DataMetadata#name) (une colonne par méta à importer)
 
 Exemple
 -------
@@ -563,7 +563,7 @@
 ::
 
   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
+  2011-04-26 13:35:19.0000;MICR-POU;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011
 
 Region
 ======
@@ -594,7 +594,7 @@
 ::
 
   voyage;name;cellType;regionEnvCoordinates;surface;dataQuality
-  PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1
+  PELGAS2011;1;RegionCLAS;-1.40644893137726 43.8651260867463 50;1224.75678263326;1
 
 Region Association
 ~~~~~~~~~~~~~~~~~~
@@ -619,7 +619,7 @@
 ::
 
   voyage;regionName;esduName
-  PELGAS2011";1;"2011-05-02 09:36:54.0000
+  PELGAS2011;1;2011-05-02 09:36:54.0000
 
 Region results
 ~~~~~~~~~~~~~~
@@ -640,7 +640,7 @@
 - echotype      FK(Echotype#name)
 - sizeCategory  FK(SizeCategory#name)
 - dataQuality   FK(DataQuality#qualityDataFlagValues)
-- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
+- méta-données  FK(DataMetadata#name) (une colonne par méta à importer)
 
 Exemple
 -------
@@ -648,7 +648,7 @@
 ::
 
   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
+  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
 ===
@@ -678,7 +678,7 @@
 - gridLongitudeLag     (float)
 - gridLatitudeLag      (float)
 - gridDepthLag         (float)
-- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
+- méta-données         FK(DataMetadata#name) (une colonne par méta à importer)
 
 Exemple
 -------
@@ -686,4 +686,4 @@
 ::
 
   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
+  PELGAS2011;-6 43.5 0;ENGR-ENC;0;;-6;43.5;0;0.25;0.25;0;0;1

Modified: trunk/src/site/rst/importData.rst
===================================================================
--- trunk/src/site/rst/importData.rst	2013-07-14 06:19:21 UTC (rev 819)
+++ trunk/src/site/rst/importData.rst	2013-07-14 07:11:50 UTC (rev 820)
@@ -149,7 +149,7 @@
 ::
 
   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
+  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
 ======================================================
@@ -186,7 +186,7 @@
 ::
 
   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
+  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
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -212,7 +212,7 @@
 ::
 
   vesselName;operationId;metadataType;operationMetadataValue
-  THALASSA II;P0422;MeanWaterDepth";43.42
+  THALASSA II;P0422;MeanWaterDepth;43.42
 
 GearMetadataValue
 ~~~~~~~~~~~~~~~~~
@@ -239,7 +239,7 @@
 ::
 
   vesselName;operationId;gearCode;metadataType;gearMetadataValue
-  THALASSA II;P0422;57x52;CableLength";31.6666666666667
+  THALASSA II;P0422;57x52;CableLength;31.6666666666667
 
 TotalSample / SubSample / BiometrySample
 ========================================
@@ -273,7 +273,7 @@
 ::
 
   operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight
-  P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03
+  P0435;ALLO-TEZ;0;0.21;36;6.4;6;166.66;0.03
 
 SubSample
 ~~~~~~~~~
@@ -306,7 +306,7 @@
 ::
 
   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
+  P0372;ENGR-ENC;0;N;3.37;198;12;7;0.08;0;5
 
 BiometrySample
 ~~~~~~~~~~~~~~
@@ -334,7 +334,7 @@
 ::
 
   operationId;baracoudaCode;numFish;dataLabel;dataValue;name
-  P5002;ENGR-ENC";9394;NA;-1;"Age
+  P5002;ENGR-ENC;9394;NA;-1;Age
 
 Acoustic
 ~~~~~~~~
@@ -422,7 +422,7 @@
 - *MOVIES_EILayer\\boterr* (colonne ignorée) //BR
 - *MOVIES_EILayer\\boterr\\sa* (colonne ignorée) //BT
 - *MOVIES_EILayer\\boterr\\ni* (colonne ignorée) //BU
-- *MOVIES_EILayer\\sndset\\soundcelerity"//BV
+- *MOVIES_EILayer\\sndset\\soundcelerity*//BV
 - *dataQuality* FK(DataQuality#qualityDataFlagValues) //E
 
 Exemple
@@ -431,7 +431,7 @@
 ::
 
   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
+  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
 ================
@@ -489,7 +489,7 @@
 ::
 
   voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata
-  PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne
+  PELGAS2011;0;2.48253468289872;3.37866337729714;ENGR-ENC;Golfe de Gascogne
 
 LengthAgeKey
 ~~~~~~~~~~~~
@@ -518,7 +518,7 @@
 ::
 
   voyage;baracoudaCode;age;length;percentAtAge;metadata;strata
-  PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne
+  PELGAS2011;ENGR-ENC;1;7.5;1;Ifremer reading;Golfe de Gascogne
 
 Résultats Esdu
 ==============
@@ -536,10 +536,10 @@
 Format des colonnes
 -------------------
 
-- voyage      FK(Voyage#name)
-- name        FK(esdu cell)
-- echotype    FK(Echotype#name)
-- dataQuality FK(DataQuality#qualityDataFlagValues)
+- voyage       FK(Voyage#name)
+- 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
@@ -548,7 +548,7 @@
 ::
 
   voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality
-  PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1
+  PELGAS2011;2011-04-26 13:29:12.0000;D1;0;P0379;P0379;1
 
 Esdu / Echotype / Species Category
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -577,7 +577,7 @@
 ::
 
   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
+  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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -598,7 +598,7 @@
 - ageCategory
 - ageCategoryMeaning
 - dataQuality         FK(DataQuality#qualityDataFlagValues)
-- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
+- méta-données        FK(DataMetadata#name) (une colonne par méta à importer)
 
 Exemple
 -------
@@ -606,7 +606,7 @@
 ::
 
   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
+  2011-04-26 13:35:19.0000;ENGR-ENC;3;3377.00492644042;fish age-group (years);1;PELGAS2011
 
 Esdu / Species / Size Category
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -627,7 +627,7 @@
 - sizeCategory
 - sizeCategoryMeaning
 - dataQuality         FK(DataQuality#qualityDataFlagValues)
-- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
+- méta-données        FK(DataMetadata#name) (une colonne par méta à importer)
 
 Exemple
 -------
@@ -635,7 +635,7 @@
 ::
 
   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
+  2011-04-26 13:35:19.0000;MICR-POU;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011
 
 Region
 ======
@@ -666,7 +666,7 @@
 ::
 
   voyage;name;cellType;regionEnvCoordinates;surface;dataQuality
-  PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1
+  PELGAS2011;1;RegionCLAS;-1.40644893137726 43.8651260867463 50;1224.75678263326;1
 
 Region Association
 ~~~~~~~~~~~~~~~~~~
@@ -691,7 +691,7 @@
 ::
 
   voyage;regionName;esduName
-  PELGAS2011";1;"2011-05-02 09:36:54.0000
+  PELGAS2011;1;2011-05-02 09:36:54.0000
 
 Region results
 ~~~~~~~~~~~~~~
@@ -712,7 +712,7 @@
 - echotype      FK(Echotype#name)
 - sizeCategory  FK(SizeCategory#name)
 - dataQuality   FK(DataQuality#qualityDataFlagValues)
-- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
+- méta-données  FK(DataMetadata#name) (une colonne par méta à importer)
 
 Exemple
 -------
@@ -720,7 +720,7 @@
 ::
 
   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
+  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
 ===
@@ -750,7 +750,7 @@
 - gridLongitudeLag     (float)
 - gridLatitudeLag      (float)
 - gridDepthLag         (float)
-- méta-données FK(DataMetadata#name) (une colonne par méta à importer)
+- méta-données         FK(DataMetadata#name) (une colonne par méta à importer)
 
 Exemple
 -------
@@ -758,4 +758,4 @@
 ::
 
   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
+  PELGAS2011;-6 43.5 0;ENGR-ENC;0;;-6;43.5;0;0.25;0.25;0;0;1

    

[Echobase-commits] r820 - in trunk: echobase-ui/src/main/webapp src/site/en/rst src/site/rst

tchemit＠users.forge.codelutin.com