[Echobase-commits] 01/02: Revue de la docuentation + impacts modification imports (See #8178)

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 5a3027b02d937ce26fe9f78a7c6be40304853ad6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 14:12:53 2016 +0200 Revue de la docuentation + impacts modification imports (See #8178) --- src/site/en/rst/configure.rst.vm | 81 ++++ src/site/en/rst/embedded.rst | 5 + src/site/en/rst/exportData.rst | 5 + src/site/{ => en}/rst/gis.rst | 3 - src/site/en/rst/importData.rst | 797 +++++++++++++++---------------- src/site/en/rst/model.rst | 4 +- src/site/en/rst/removeData.rst | 2 +- src/site/en/rst/update.rst.vm | 59 +++ src/site/en/rst/usage.rst.vm | 2 - src/site/rst/gis.rst | 3 - src/site/rst/importData.rst | 997 ++++++++++++++++++++------------------- src/site/rst/install.rst.vm | 3 - src/site/rst/model.rst | 4 +- src/site/rst/removeData.rst | 2 +- src/site/rst/usage.rst.vm | 2 - src/site/site_en.xml | 5 +- 16 files changed, 1061 insertions(+), 913 deletions(-) diff --git a/src/site/en/rst/configure.rst.vm b/src/site/en/rst/configure.rst.vm new file mode 100644 index 0000000..5116923 --- /dev/null +++ b/src/site/en/rst/configure.rst.vm @@ -0,0 +1,81 @@ +.. - +.. * #%L +.. * EchoBase +.. * %% +.. * Copyright (C) 2011 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - + +================================== +Configurer EchoBase sur un serveur +================================== + +Modifier la configuration par défaut +------------------------------------ + +Si vous voulez modifier la configuration (voir le `détail des options disponibles`_), +il faut positionner un fichier nommé **echobase.properties** dans +**/etc/echobase.properties** puis redémarrer tomcat. + +Configuration Coser +------------------- + +Pour pouvoir effectuer un export au format *Coser*, vous devez avoir renseigner la configuration +**echobase.coser.api.url**, qui est une url qui pointe sur le service d'API de Coser. + +La valeur par défaut pointe sur l'instance de production du site des indicateurs. + +:: + + echobase.coser.api.url=http://www.ifremer.fr/SIH-indices-campagnes/json + +Configuration LizMap +~~~~~~~~~~~~~~~~~~~~ + +Pour pouvoir générer les cartes sur les données, on utilise *LizMap* (surcouche à *qgis-server*), vous devez renseigner +la configuration *echobase.lizmap.application.map.url*, qui est une url qui pointe sur l'instance de LizMap. + +La valeur par défaut point sur une instance de LlizMap installé en local dans le bon répertoire +(**/var/www/html/echobase-map**). + +:: + + echobase.lizmap.application.map.url=http://localhost/echobase-map/lizmap/www/index.php/view/map + + +Gestion des logs de l'application +--------------------------------- + + +Par défaut, l'application utilise l'emplacement **/var/local/echobase/data/logs** +pour y placer ses logs. + +Vous pouvez changer cela en modifiant le fichier +**/var/local/echobase/data/echobase-log.properties** qui est généré lors de la +première installation de l'application. + +Première utilisation +-------------------- + +Deux utilisateurs sont créés si la base est vide (première utilisation):: + + login / password : admin / admin + login / password : user / user + +Pour des raisons de sécurité, il est conseillé de modifier le mot de passe via +l'interface de gestion des utilisateurs. + +.. _détail des options disponibles: ./config-report.html diff --git a/src/site/en/rst/embedded.rst b/src/site/en/rst/embedded.rst index add612b..d3fcea3 100644 --- a/src/site/en/rst/embedded.rst +++ b/src/site/en/rst/embedded.rst @@ -107,11 +107,13 @@ Installation d'echobase - Se placer dans le répertoire où a été dézippée l'archive :: + cd Chemin vers l'archive dézippée - Enfin lancer le script :: + startEchobase.bat - Dans la console on doit voir l'application démarré et produire des logs @@ -148,16 +150,19 @@ Installation d'echobase - Se placer dans le répertoire où a été dézippée l'archive :: + cd Chemin vers l'archive dézippée - Rendre le script de démarrage exécutable :: + chmod +x startEchobase.sh - Enfin lancer le script :: + ./startEchobase.sh - Dans la console on doit voir l'application démarré et produire des logs diff --git a/src/site/en/rst/exportData.rst b/src/site/en/rst/exportData.rst index 248e591..31bfb90 100644 --- a/src/site/en/rst/exportData.rst +++ b/src/site/en/rst/exportData.rst @@ -39,6 +39,7 @@ One can use nested queries by inserting a saved query name in a new query, e.g.: :: + SELECT * FROM Voyage where topiaid IN ${QueryName} Importing queries from LibreOffice Base @@ -46,9 +47,13 @@ Importing queries from LibreOffice Base One can import SQL queries built using the user-friendly LibreOffice Base graphical SQL query builder. To do so: + - run LibreOffice Base, + - connect to an Echobase working database to display the Echobase data model in the LibreOffice Base graphical SQL query builder, + - define your SQL query and copy its SQL code, + - click "Import from Libre Office" in the Echobase data query menu and paste the SQL code from LibreOffice. The LibreOffice SQL code is then imported in your EchoBase SQL query. diff --git a/src/site/rst/gis.rst b/src/site/en/rst/gis.rst similarity index 97% copy from src/site/rst/gis.rst copy to src/site/en/rst/gis.rst index b50e820..32749f0 100644 --- a/src/site/rst/gis.rst +++ b/src/site/en/rst/gis.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst index 9bcc5ab..fe91611 100644 --- a/src/site/en/rst/importData.rst +++ b/src/site/en/rst/importData.rst @@ -32,30 +32,30 @@ This document provides details on the formats to be used to import text files in Columns format ~~~~~~~~~~~~~~ -+---------------+--------------------------------------------------------------+ -| Format name | Description | -+===============+==============================================================+ -| text |character string | -+---------------+--------------------------------------------------------------+ -| FK(XXX#yyy) |required foreign key (XXX on yyy property). | -+---------------+--------------------------------------------------------------+ -| (int) |a non-null integer | -+---------------+--------------------------------------------------------------+ -| (float) |a non-null float | -+---------------+--------------------------------------------------------------+ -| (Integer) |a potentially null integer | -+---------------+--------------------------------------------------------------+ -| (Integer-NA) |a potentially null integer (set to null if NA) | -+---------------+--------------------------------------------------------------+ -| Float |a potentially null float | -+---------------+--------------------------------------------------------------+ -| (Float-NA) |a potentially null float (set to null if NA) | -+---------------+--------------------------------------------------------------+ -| (date) |ISO date format: *yyyy-MM-dd HH:mm:ss.SSSS* | -+---------------+--------------------------------------------------------------+ -| (esdu cell) |nom de cellule esdu elementary : esduName[_elementaryCellName]| -| | avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS | -+---------------+--------------------------------------------------------------+ ++---------------+---------------------------------------------------------------+ +| Format name | Description | ++===============+===============================================================+ +| text |character string | ++---------------+---------------------------------------------------------------+ +| FK(XXX#yyy) |required foreign key (XXX on yyy property) | ++---------------+---------------------------------------------------------------+ +| (int) |a non-null integer | ++---------------+---------------------------------------------------------------+ +| (float) |a non-null float | ++---------------+---------------------------------------------------------------+ +| (Integer) |a potentially null integer | ++---------------+---------------------------------------------------------------+ +| (Integer-NA) |a potentially null integer (set to null if NA) | ++---------------+---------------------------------------------------------------+ +| Float |a potentially null float | ++---------------+---------------------------------------------------------------+ +| (Float-NA) |a potentially null float (set to null if NA) | ++---------------+---------------------------------------------------------------+ +| (date) |ISO date format: *yyyy-MM-dd HH:mm:ss.SSSS* | ++---------------+---------------------------------------------------------------+ +| (esdu cell) |nom de cellule esdu elementary : esduName[_elementaryCellName] | +| | avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS | ++---------------+---------------------------------------------------------------+ Important ~~~~~~~~~ @@ -81,19 +81,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 |text | ++------------+-------+ +| endPort |text | ++------------+-------+ Example ------- @@ -116,21 +116,21 @@ Required columns Columns formats --------------- -+----------------+---------------+ -| Column | Type | -+================+===============+ -| voyage |FK(voyage#name)| -+----------------+---------------+ -| description |text | -+----------------+---------------+ -| startTime |(date) | -+----------------+---------------+ -| endTime |(date) | -+----------------+---------------+ -| startLocality |text | -+----------------+---------------+ -| endLocality |text | -+----------------+---------------+ ++----------------+----------------+ +| Column | Type | ++================+================+ +| voyage |FK(voyage#name) | ++----------------+----------------+ +| description |text | ++----------------+----------------+ +| startTime |(date) | ++----------------+----------------+ +| endTime |(date) | ++----------------+----------------+ +| startLocality |text | ++----------------+----------------+ +| endLocality |text | ++----------------+----------------+ Example ------- @@ -153,41 +153,41 @@ Required columns Columns formats --------------- -+------------------------+---------------+ -| Column | Type | -+========================+===============+ -| voyage |FK(voyage#name)| -+------------------------+---------------+ -| vesselName |FK(Vessel#name)| -+------------------------+---------------+ -| title |text | -+------------------------+---------------+ -| transectAbstract |text | -+------------------------+---------------+ -| stratum |text | -+------------------------+---------------+ -| comment |text | -+------------------------+---------------+ -| dateCreated |(date) | -+------------------------+---------------+ -| timeCoverageStart |(date) | -+------------------------+---------------+ -| timeCoverageEnd |(date) | -+------------------------+---------------+ -| geospatialLonMin |(float) | -+------------------------+---------------+ -| geospatialLonMax |(float) | -+------------------------+---------------+ -| geospatialLatMin |(float) | -+------------------------+---------------+ -| geospatialLatMax |(float) | -+------------------------+---------------+ -| geospatialVerticalMin |(float) | -+------------------------+---------------+ -| geospatialVerticalMax |(float) | -+------------------------+---------------+ -| linestring |text | -+------------------------+---------------+ ++------------------------+----------------+ +| Column | Type | ++========================+================+ +| voyage |FK(voyage#name) | ++------------------------+----------------+ +| vesselName |FK(Vessel#name) | ++------------------------+----------------+ +| title |text | ++------------------------+----------------+ +| transectAbstract |text | ++------------------------+----------------+ +| stratum |text | ++------------------------+----------------+ +| comments |text | ++------------------------+----------------+ +| dateCreated |(date) | ++------------------------+----------------+ +| timeCoverageStart |(date) | ++------------------------+----------------+ +| timeCoverageEnd |(date) | ++------------------------+----------------+ +| geospatialLonMin |(float) | ++------------------------+----------------+ +| geospatialLonMax |(float) | ++------------------------+----------------+ +| geospatialLatMin |(float) | ++------------------------+----------------+ +| geospatialLatMax |(float) | ++------------------------+----------------+ +| geospatialVerticalMin |(float) | ++------------------------+----------------+ +| geospatialVerticalMax |(float) | ++------------------------+----------------+ +| linestring |text | ++------------------------+----------------+ Example ------- @@ -213,33 +213,33 @@ Required columns Columns formats --------------- -+-----------------------------+-----------------------+ -| Column | Type | -+=============================+=======================+ -| vesselName |FK(Vessel#name) | -+-----------------------------+-----------------------+ -| gearCode |FK(Gear#casinoGearName)| -+-----------------------------+-----------------------+ -| depthStratumId |FK(DepthStratum#id) | -+-----------------------------+-----------------------+ -| operationId |text | -+-----------------------------+-----------------------+ -| midHaulLatitude |(float) | -+-----------------------------+-----------------------+ -| midHaulLongitude |(float) | -+-----------------------------+-----------------------+ -| gearShootingStartTime |(date) | -+-----------------------------+-----------------------+ -| gearShootingEndTime |(date) | -+-----------------------------+-----------------------+ -| gearShootingStartLatitude |(float) | -+-----------------------------+-----------------------+ -| gearShootingEndLatitude |(float) | -+-----------------------------+-----------------------+ -| gearShootingStartLongitude |(float) | -+-----------------------------+-----------------------+ -| gearShootingEndLongitude |(float) | -+-----------------------------+-----------------------+ ++-----------------------------+------------------------+ +| Column | Type | ++=============================+========================+ +| vesselName |FK(Vessel#name) | ++-----------------------------+------------------------+ +| gearCode |FK(Gear#casinoGearName) | ++-----------------------------+------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------------------+------------------------+ +| operationId |text | ++-----------------------------+------------------------+ +| midHaulLatitude |(float) | ++-----------------------------+------------------------+ +| midHaulLongitude |(float) | ++-----------------------------+------------------------+ +| gearShootingStartTime |(date) | ++-----------------------------+------------------------+ +| gearShootingEndTime |(date) | ++-----------------------------+------------------------+ +| gearShootingStartLatitude |(float) | ++-----------------------------+------------------------+ +| gearShootingEndLatitude |(float) | ++-----------------------------+------------------------+ +| gearShootingStartLongitude |(float) | ++-----------------------------+------------------------+ +| gearShootingEndLongitude |(float) | ++-----------------------------+------------------------+ Example ------- @@ -262,17 +262,17 @@ Required columns Columns formats --------------- -+-------------------------+--------------------------+ -| Column | Type | -+=========================+==========================+ -| vesselName |FK(Vessel#name) | -+-------------------------+--------------------------+ -| operationId |FK(Operation#id) | -+-------------------------+--------------------------+ -| metadataType |FK(OperationMetadata#name)| -+-------------------------+--------------------------+ -| operationMetadataValue |text | -+-------------------------+--------------------------+ ++-------------------------+---------------------------+ +| Column | Type | ++=========================+===========================+ +| vesselName |FK(Vessel#name) | ++-------------------------+---------------------------+ +| operationId |FK(Operation#id) | ++-------------------------+---------------------------+ +| metadataType |FK(OperationMetadata#name) | ++-------------------------+---------------------------+ +| operationMetadataValue |text | ++-------------------------+---------------------------+ Example ------- @@ -295,19 +295,19 @@ Required columns Columns formats --------------- -+---------------------+-----------------------+ -| Column | Type | -+=====================+=======================+ -| vesselName |FK(Vessel#name) | -+---------------------+-----------------------+ -| operationId |FK(Operation#id) | -+---------------------+-----------------------+ -| metadataType |FK(GearMetadata#name) | -+---------------------+-----------------------+ -| gearCode |FK(Gear#casinoGearName)| -+---------------------+-----------------------+ -| gearMetadataValue |text | -+---------------------+-----------------------+ ++---------------------+------------------------+ +| Column | Type | ++=====================+========================+ +| vesselName |FK(Vessel#name) | ++---------------------+------------------------+ +| operationId |FK(Operation#id) | ++---------------------+------------------------+ +| metadataType |FK(GearMetadata#name) | ++---------------------+------------------------+ +| gearCode |FK(Gear#casinoGearName) | ++---------------------+------------------------+ +| gearMetadataValue |text | ++---------------------+------------------------+ Example ------- @@ -333,27 +333,27 @@ Required columns Columns formats --------------- -+-----------------+-------------------------+ -| Column | Type | -+=================+=========================+ -| operationId |FK(Operation#id) | -+-----------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+-----------------+-------------------------+ -| sizeCategory |FK(SizeCategory#name) | -+-----------------+-------------------------+ -| sampleWeight |(float) | -+-----------------+-------------------------+ -| numberSampled |(Integer-NA) | -+-----------------+-------------------------+ -| meanLength |(Float-NA) | -+-----------------+-------------------------+ -| meanWeight |(Float-NA) | -+-----------------+-------------------------+ -| noPerKg |(Float-NA) | -+-----------------+-------------------------+ -| sortedWeight |(float) | -+-----------------+-------------------------+ ++-----------------+--------------------------+ +| Column | Type | ++=================+==========================+ +| operationId |FK(Operation#id) | ++-----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++-----------------+--------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++-----------------+--------------------------+ +| sampleWeight |(float) | ++-----------------+--------------------------+ +| numberSampled |(Integer-NA) | ++-----------------+--------------------------+ +| meanLength |(Float-NA) | ++-----------------+--------------------------+ +| meanWeight |(Float-NA) | ++-----------------+--------------------------+ +| noPerKg |(Float-NA) | ++-----------------+--------------------------+ +| sortedWeight |(float) | ++-----------------+--------------------------+ Example ------- @@ -371,34 +371,34 @@ Required columns :: - operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round + operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;round Columns formats --------------- -+------------------+-------------------------+ -| Column | Type | -+==================+=========================+ -| operationId |FK(Operation#id) | -+------------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+------------------+-------------------------+ -| sizeCategory |FK(SizeCategory#name) | -+------------------+-------------------------+ -| sexCategory |FK(SexCategory#name) | -+------------------+-------------------------+ -| sampleWeight |(float) | -+------------------+-------------------------+ -| numberSampled |(int) | -+------------------+-------------------------+ -| numberAtLength |(float) | -+------------------+-------------------------+ -| weightAtLength |(Float-NA) | -+------------------+-------------------------+ -| lengthClass |text | -+------------------+-------------------------+ - -(ignored columns) subHaul units round ++------------------+--------------------------+ +| Column | Type | ++==================+==========================+ +| operationId |FK(Operation#id) | ++------------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++------------------+--------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++------------------+--------------------------+ +| sexCategory |FK(SexCategory#name) | ++------------------+--------------------------+ +| sampleWeight |(float) | ++------------------+--------------------------+ +| numberSampled |(int) | ++------------------+--------------------------+ +| numberAtLength |(float) | ++------------------+--------------------------+ +| weightAtLength |(Float-NA) | ++------------------+--------------------------+ +| lengthClass |text | ++------------------+--------------------------+ + +(ignored columns) subHaul round Example ------- @@ -457,159 +457,159 @@ Required columns Columns formats --------------- -+---------------------------------------------------------+-----------------------------------------+ -| Column | Type | -+=========================================================+=========================================+ -| MOVIES_EILayer |text //A| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset |(unused) //B| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\sndname |(unused) //C| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\sndident |(unused) //D| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\softChannelId |FK(AcousticInstrument#id) //E| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\channelName |(unused) //F| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\dataType |(unused) //G| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamType |(unused) //H| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\acousticFrequency |(unused) //I| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\startSample |(unused) //J| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle |(unused) //K| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle |(unused) //L| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\absorptionCoef |(Float-NA) //M| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\transmissionPower |(int) //N| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamAlongAngleSensitivity |(Float) //O| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamAthwartAngleSensitivity |(Float) //P| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beam3dBWidthAlong |(unused) //Q| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beam3dBWidthAthwart |(unused) //R| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamEquTwoWayAngle |(Float) //S| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamGain |(Float) //T| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamSACorrection |(Float) //U| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\bottomDetectionMinDepth |(unused) //V| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\bottomDetectionMaxDepth |(unused) //W| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\bottomDetectionMinLevel |(unused) //X| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\AlongTXRXWeightId |(unused) //Y| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\AthwartTXRXWeightId |(unused) //Z| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId |(unused) //AA| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId |(unused) //AB| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\bandWidth |(unused) //AC| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\tvgminrange |(unused) //AD| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\tvgmaxrange |(unused) //AE| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\pulseduration |(Float) //AF| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav |(unused) //AG| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\lat |(unused) //AH| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\long |(unused) //AI| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\alt |(unused) //AJ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\gndspeed |(unused) //AK| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\gndcourse |(unused) //AL| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\surfspeed |(unused) //AM| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\surfcourse |(unused) //AN| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\driftspeed |(unused) //AO| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\driftcourse |(unused) //AP| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\heading |(unused) //AQ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\roll |(unused) //AR| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\pitch |(unused) //AS| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\heave |(unused) //AT| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\depth |text //AU| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\draught |(unused) //AV| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset |(unused) //AW| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\cellnum |(int) //AX| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\celltype |(int) //AY| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\depthstart |(float) //AZ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\depthend |(float) //BA| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\indexstart |(unused) //BB| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\indexend |(unused) //BC| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\datestart |(date) //BD| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\dateend |(date) //BE| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\lat |(Float) //BF| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\long |(Float) //BG| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\volume |(Integer-NA) //BH| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\area |(int) //BI| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\diststart |(unused) //BJ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\distend |(unused) //BK| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\thresholdup |(int) //BL| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\thresholdlow |(int) //BM| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer |(unused) //BN| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer\\sa |(Float-NA) //BO| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer\\sv |(unused) //BP| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer\\ni |(Integer-NA) //BQ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer\\nt |(Integer-NA) //BR| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\boterr |(unused) //BR| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\boterr\\sa |(unused) //BT| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\boterr\\ni |(unused) //BU| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\soundcelerity |text //BV| -+---------------------------------------------------------+-----------------------------------------+ -| dataQuality |FK(DataQuality#qualityDataFlagValues) //E| -+---------------------------------------------------------+-----------------------------------------+ ++---------------------------------------------------------+------------------------------------------+ +| Column | Type | ++=========================================================+==========================================+ +| MOVIES_EILayer |text //A | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset |(unused) //B | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\sndname |(unused) //C | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\sndident |(unused) //D | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\softChannelId |FK(AcousticInstrument#id) //E | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\channelName |(unused) //F | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\dataType |(unused) //G | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamType |(unused) //H | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\acousticFrequency |(unused) //I | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\startSample |(unused) //J | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle |(unused) //K | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle |(unused) //L | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\absorptionCoef |(Float-NA) //M | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\transmissionPower |(int) //N | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamAlongAngleSensitivity |(Float) //O | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamAthwartAngleSensitivity |(Float) //P | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beam3dBWidthAlong |(unused) //Q | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beam3dBWidthAthwart |(unused) //R | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamEquTwoWayAngle |(Float) //S | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamGain |(Float) //T | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamSACorrection |(Float) //U | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMinDepth |(unused) //V | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMaxDepth |(unused) //W | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMinLevel |(unused) //X | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\AlongTXRXWeightId |(unused) //Y | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\AthwartTXRXWeightId |(unused) //Z | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId |(unused) //AA | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId |(unused) //AB | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\bandWidth |(unused) //AC | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\tvgminrange |(unused) //AD | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\tvgmaxrange |(unused) //AE | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\pulseduration |(Float) //AF | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav |(unused) //AG | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\lat |(unused) //AH | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\long |(unused) //AI | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\alt |(unused) //AJ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\gndspeed |(unused) //AK | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\gndcourse |(unused) //AL | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\surfspeed |(unused) //AM | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\surfcourse |(unused) //AN | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\driftspeed |(unused) //AO | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\driftcourse |(unused) //AP | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\heading |(unused) //AQ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\roll |(unused) //AR | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\pitch |(unused) //AS | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\heave |(unused) //AT | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\depth |text //AU | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\draught |(unused) //AV | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset |(unused) //AW | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\cellnum |(int) //AX | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\celltype |(int) //AY | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\depthstart |(float) //AZ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\depthend |(float) //BA | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\indexstart |(unused) //BB | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\indexend |(unused) //BC | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\datestart |(date) //BD | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\dateend |(date) //BE | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\lat |(Float) //BF | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\long |(Float) //BG | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\volume |(Integer-NA) //BH | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\area |(int) //BI | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\diststart |(unused) //BJ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\distend |(unused) //BK | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\thresholdup |(int) //BL | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\thresholdlow |(int) //BM | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer |(unused) //BN | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer\\sa |(Float-NA) //BO | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer\\sv |(unused) //BP | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer\\ni |(Integer-NA) //BQ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer\\nt |(Integer-NA) //BR | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\boterr |(unused) //BR | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\boterr\\sa |(unused) //BT | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\boterr\\ni |(unused) //BU | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\soundcelerity |text //BV | ++---------------------------------------------------------+------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) //E | ++---------------------------------------------------------+------------------------------------------+ Example ------- @@ -635,19 +635,19 @@ Required columns Columns formats --------------- -+-----------------+-------------------------+ -| Column | Type | -+=================+=========================+ -| echotypeName |text | -+-----------------+-------------------------+ -| meaning |text | -+-----------------+-------------------------+ -| voyage |FK(Voyage#name) | -+-----------------+-------------------------+ -| depthStratumId |FK(DepthStratum#id) | -+-----------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+-----------------+-------------------------+ ++-----------------+--------------------------+ +| Column | Type | ++=================+==========================+ +| echotypeName |text | ++-----------------+--------------------------+ +| meaning |text | ++-----------------+--------------------------+ +| voyage |FK(Voyage#name) | ++-----------------+--------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++-----------------+--------------------------+ Example ------- @@ -670,21 +670,21 @@ Required columns Columns formats --------------- -+----------------+-------------------------+ -| Column | Type | -+================+=========================+ -| aParameter |(float) | -+----------------+-------------------------+ -| bParameter |(float) | -+----------------+-------------------------+ -| voyage |FK(Voyage#name) | -+----------------+-------------------------+ -| sizeCategory |FK(SizeCategory#name) | -+----------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+----------------+-------------------------+ -| strata |FK(Strata#name) | -+----------------+-------------------------+ ++----------------+--------------------------+ +| Column | Type | ++================+==========================+ +| aParameter |(float) | ++----------------+--------------------------+ +| bParameter |(float) | ++----------------+--------------------------+ +| voyage |FK(Voyage#name) | ++----------------+--------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+--------------------------+ +| strata |FK(Strata#name) | ++----------------+--------------------------+ Example ------- @@ -707,23 +707,23 @@ Required columns Columns formats --------------- -+----------------+-------------------------+ -| Column | Type | -+================+=========================+ -| voyage |FK(Voyage#name) | -+----------------+-------------------------+ -| age |(int) | -+----------------+-------------------------+ -| length |(float) | -+----------------+-------------------------+ -| percentAtAge |(float) | -+----------------+-------------------------+ -| metadata |text | -+----------------+-------------------------+ -| strata |FK(Strata#name) | -+----------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+----------------+-------------------------+ ++----------------+--------------------------+ +| Column | Type | ++================+==========================+ +| voyage |FK(Voyage#name) | ++----------------+--------------------------+ +| age |(int) | ++----------------+--------------------------+ +| length |(float) | ++----------------+--------------------------+ +| percentAtAge |(float) | ++----------------+--------------------------+ +| metadata |text | ++----------------+--------------------------+ +| strata |FK(Strata#name) | ++----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+--------------------------+ Example ------- @@ -810,15 +810,15 @@ Example 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 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Esdu / Echotype / Species Category / Length +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Required columns +Required columns ---------------- :: - name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage Columns formats --------------- @@ -830,11 +830,15 @@ Columns formats +----------------------+-------------------------------------------------------+ | name |FK(esdu cell) | +----------------------+-------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------------+-------------------------------------------------------+ | baracoudaCode |FK(Species#baracoudaCode) | +----------------------+-------------------------------------------------------+ -| ageCategory |text | +| lengthClass |(float) | +----------------------+-------------------------------------------------------+ -| ageCategoryMeaning |text | +| sizeCategory |text | ++----------------------+-------------------------------------------------------+ +| sizeCategoryMeaning |text | +----------------------+-------------------------------------------------------+ | dataQuality |FK(DataQuality#qualityDataFlagValues) | +----------------------+-------------------------------------------------------+ @@ -846,18 +850,18 @@ Example :: - 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 + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + 2011-04-26 13:35:19.0000;D1;COMP-LEM;10.5;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011 -Esdu / Species / Size Category -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Esdu / Species / Age Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Required columns ---------------- :: - name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage Columns formats --------------- @@ -871,9 +875,9 @@ Columns formats +----------------------+-------------------------------------------------------+ | baracoudaCode |FK(Species#baracoudaCode) | +----------------------+-------------------------------------------------------+ -| sizeCategory |text | +| ageCategory |text | +----------------------+-------------------------------------------------------+ -| sizeCategoryMeaning |text | +| ageCategoryMeaning |text | +----------------------+-------------------------------------------------------+ | dataQuality |FK(DataQuality#qualityDataFlagValues) | +----------------------+-------------------------------------------------------+ @@ -885,8 +889,8 @@ Example :: - 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 + 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 Region ====== @@ -1051,3 +1055,4 @@ 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 + diff --git a/src/site/en/rst/model.rst b/src/site/en/rst/model.rst index 8819ad9..4f9a308 100644 --- a/src/site/en/rst/model.rst +++ b/src/site/en/rst/model.rst @@ -78,8 +78,8 @@ Sous modèle pêcherie - `Sous modèle pêcherie`_ -.. _Download model (argoUML format): http://svn.codelutin.com/echobase/trunk/echobase-domain/src/main/xmi/echobas... -.. _Download model (freeMind format): http://svn.codelutin.com/echobase/trunk/src/doc/model/EchoBase_structure_V5.... +.. _Download model (argoUML format): https://gitlab.nuiton.org/codelutin/echobase/raw/develop/echobase-domain/src... +.. _Download model (freeMind format): https://gitlab.nuiton.org/codelutin/echobase/raw/develop/src/doc/model/EchoB... .. _Vue générale du référentiel: model/referenceAll.png .. _Référentiel AcousticInstrument: model/referenceAcousticInstrument.png .. _Référentiel AreaOfOperation: model/referenceAreaOfOperation.png diff --git a/src/site/en/rst/removeData.rst b/src/site/en/rst/removeData.rst index d04210e..242e197 100644 --- a/src/site/en/rst/removeData.rst +++ b/src/site/en/rst/removeData.rst @@ -118,7 +118,7 @@ Les opérations de pêche et tout ce qui y est rattaché (OperationMetadata et GearMetadata et Sample). Imports à retirer -~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~ Seront supprimés de la table des imports les imports suivants qui aurait pu être effectué suite à cet import, à savoir : diff --git a/src/site/en/rst/update.rst.vm b/src/site/en/rst/update.rst.vm new file mode 100644 index 0000000..e6be93d --- /dev/null +++ b/src/site/en/rst/update.rst.vm @@ -0,0 +1,59 @@ +.. - +.. * #%L +.. * EchoBase +.. * %% +.. * Copyright (C) 2011 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - + +======== +Echobase +======== + +Mise à jour d'une version d'EchoBase sur un serveur +--------------------------------------------------- + +Pré-requis: + +- L'application doit déjà être installé dans le répertoire /var/local/echobase +- Être loggué sur une console avec l'utilisateur root. + +On suppose que tomcat a été installé via le système de paquets, et donc +que le répertoire **/var/lib/tomcat7** existe. + +Pour utiliser une nouvelle version de l'application, c'est très simple. + +- Supprimer les répertoires suivants : + +:: + + rm -rf /var/lib/tomcat7/webapps/echobase.war + rm -rf /var/lib/tomcat7/Catalina/localhost/echobase + +- Attendre que le répertoire **/var/lib/tomcat7/webapps/echobase** a bien été supprimé. + +- Mettre l'application dans tomcat : + +:: + + cd /var/local/echobase/war + wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war + unlink /var/local/echobase/echobase.war + ln -s /var/local/echobase/war/echobase-ui-${project.version}-full.war /var/local/echobase/echobase.war + cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps + +Tomcat va redéployer l'application et elle sera disponible d'ici peu à l'adresse + http://localhost:8080/echobase diff --git a/src/site/en/rst/usage.rst.vm b/src/site/en/rst/usage.rst.vm index e5e1ca7..6088c0b 100644 --- a/src/site/en/rst/usage.rst.vm +++ b/src/site/en/rst/usage.rst.vm @@ -1,8 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% diff --git a/src/site/rst/gis.rst b/src/site/rst/gis.rst index b50e820..32749f0 100644 --- a/src/site/rst/gis.rst +++ b/src/site/rst/gis.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index 1bc7c0d..0d3f8c0 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -2,7 +2,7 @@ .. * #%L .. * EchoBase .. * %% -.. * Copyright (C) 2011 | 2012 |Ifremer, Codelutin| +.. * Copyright (C) 2011 Ifremer, Codelutin .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Affero General Public License as published by @@ -31,30 +31,30 @@ Ce document donne la définition de tous les imports de données. Format des colonnes ~~~~~~~~~~~~~~~~~~~ -+---------------+--------------------------------------------------------------+ -| Notation | Type | -+===============+==============================================================+ -| text |une chaine de caractères | -+---------------+--------------------------------------------------------------+ -| FK(XXX#yyy) |désigne une clef étrangère requise (XXX sur la propriété yyy).| -+---------------+--------------------------------------------------------------+ -| (int) |un entier (pas du nullité possible) | -+---------------+--------------------------------------------------------------+ -| (float) |un décimal (pas de nullité possible) | -+---------------+--------------------------------------------------------------+ -| (Integer) |un entier avec nullité possible | -+---------------+--------------------------------------------------------------+ -| (Integer-NA) |un entier avec nullité possible (et nullité si NA) | -+---------------+--------------------------------------------------------------+ -| Float |un décimale avec nullité possible | -+---------------+--------------------------------------------------------------+ -| (Float-NA) |un décimale avec nullité possible (et nullité si NA) | -+---------------+--------------------------------------------------------------+ -| (date) |unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS* | -+---------------+--------------------------------------------------------------+ -| (esdu cell) |nom de cellule esdu elementary : esduName[_elementaryCellName]| -| | avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS | -+---------------+--------------------------------------------------------------+ ++---------------+---------------------------------------------------------------+ +| Notation | Type | ++===============+===============================================================+ +| text |une chaine de caractères | ++---------------+---------------------------------------------------------------+ +| FK(XXX#yyy) |désigne une clef étrangère requise (XXX sur la propriété yyy) | ++---------------+---------------------------------------------------------------+ +| (int) |un entier (pas du nullité possible) | ++---------------+---------------------------------------------------------------+ +| (float) |un décimal (pas de nullité possible) | ++---------------+---------------------------------------------------------------+ +| (Integer) |un entier avec nullité possible | ++---------------+---------------------------------------------------------------+ +| (Integer-NA) |un entier avec nullité possible (et nullité si NA) | ++---------------+---------------------------------------------------------------+ +| Float |un décimale avec nullité possible | ++---------------+---------------------------------------------------------------+ +| (Float-NA) |un décimale avec nullité possible (et nullité si NA) | ++---------------+---------------------------------------------------------------+ +| (date) |unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS* | ++---------------+---------------------------------------------------------------+ +| (esdu cell) |nom de cellule esdu elementary : esduName[_elementaryCellName] | +| | avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS | ++---------------+---------------------------------------------------------------+ Notes importantes ~~~~~~~~~~~~~~~~~ @@ -85,19 +85,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 |text | ++------------+-------+ +| endPort |text | ++------------+-------+ Exemple ------- @@ -120,21 +120,21 @@ Colonnes requises Format des colonnes ------------------- -+----------------+---------------+ -| Colonne | Type | -+================+===============+ -| voyage |FK(voyage#name)| -+----------------+---------------+ -| description |text | -+----------------+---------------+ -| startTime |(date) | -+----------------+---------------+ -| endTime |(date) | -+----------------+---------------+ -| startLocality |text | -+----------------+---------------+ -| endLocality |text | -+----------------+---------------+ ++----------------+----------------+ +| Colonne | Type | ++================+================+ +| voyage |FK(voyage#name) | ++----------------+----------------+ +| description |text | ++----------------+----------------+ +| startTime |(date) | ++----------------+----------------+ +| endTime |(date) | ++----------------+----------------+ +| startLocality |text | ++----------------+----------------+ +| endLocality |text | ++----------------+----------------+ Exemple ------- @@ -157,48 +157,48 @@ Colonnes requises Format des colonnes ------------------- -+------------------------+---------------+ -| Colonne | Type | -+========================+===============+ -| voyage |FK(voyage#name)| -+------------------------+---------------+ -| vesselName |FK(Vessel#name)| -+------------------------+---------------+ -| title |text | -+------------------------+---------------+ -| transectAbstract |text | -+------------------------+---------------+ -| stratum |text | -+------------------------+---------------+ -| comment |text | -+------------------------+---------------+ -| dateCreated |(date) | -+------------------------+---------------+ -| timeCoverageStart |(date) | -+------------------------+---------------+ -| timeCoverageEnd |(date) | -+------------------------+---------------+ -| geospatialLonMin |(float) | -+------------------------+---------------+ -| geospatialLonMax |(float) | -+------------------------+---------------+ -| geospatialLatMin |(float) | -+------------------------+---------------+ -| geospatialLatMax |(float) | -+------------------------+---------------+ -| geospatialVerticalMin |(float) | -+------------------------+---------------+ -| geospatialVerticalMax |(float) | -+------------------------+---------------+ -| linestring |text | -+------------------------+---------------+ ++------------------------+----------------+ +| Colonne | Type | ++========================+================+ +| voyage |FK(voyage#name) | ++------------------------+----------------+ +| vesselName |FK(Vessel#name) | ++------------------------+----------------+ +| title |text | ++------------------------+----------------+ +| transectAbstract |text | ++------------------------+----------------+ +| stratum |text | ++------------------------+----------------+ +| comments |text | ++------------------------+----------------+ +| dateCreated |(date) | ++------------------------+----------------+ +| timeCoverageStart |(date) | ++------------------------+----------------+ +| timeCoverageEnd |(date) | ++------------------------+----------------+ +| geospatialLonMin |(float) | ++------------------------+----------------+ +| geospatialLonMax |(float) | ++------------------------+----------------+ +| geospatialLatMin |(float) | ++------------------------+----------------+ +| geospatialLatMax |(float) | ++------------------------+----------------+ +| geospatialVerticalMin |(float) | ++------------------------+----------------+ +| geospatialVerticalMax |(float) | ++------------------------+----------------+ +| linestring |text | ++------------------------+----------------+ Exemple ------- :: - 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 Operation / OperationMetadataValue / GearMetadataValue @@ -217,33 +217,33 @@ Colonnes requises Format des colonnes ------------------- -+-----------------------------+-----------------------+ -| Colonne | Type | -+=============================+=======================+ -| vesselName |FK(Vessel#name) | -+-----------------------------+-----------------------+ -| gearCode |FK(Gear#casinoGearName)| -+-----------------------------+-----------------------+ -| depthStratumId |FK(DepthStratum#id) | -+-----------------------------+-----------------------+ -| operationId |text | -+-----------------------------+-----------------------+ -| midHaulLatitude |(float) | -+-----------------------------+-----------------------+ -| midHaulLongitude |(float) | -+-----------------------------+-----------------------+ -| gearShootingStartTime |(date) | -+-----------------------------+-----------------------+ -| gearShootingEndTime |(date) | -+-----------------------------+-----------------------+ -| gearShootingStartLatitude |(float) | -+-----------------------------+-----------------------+ -| gearShootingEndLatitude |(float) | -+-----------------------------+-----------------------+ -| gearShootingStartLongitude |(float) | -+-----------------------------+-----------------------+ -| gearShootingEndLongitude |(float) | -+-----------------------------+-----------------------+ ++-----------------------------+------------------------+ +| Colonne | Type | ++=============================+========================+ +| vesselName |FK(Vessel#name) | ++-----------------------------+------------------------+ +| gearCode |FK(Gear#casinoGearName) | ++-----------------------------+------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------------------+------------------------+ +| operationId |text | ++-----------------------------+------------------------+ +| midHaulLatitude |(float) | ++-----------------------------+------------------------+ +| midHaulLongitude |(float) | ++-----------------------------+------------------------+ +| gearShootingStartTime |(date) | ++-----------------------------+------------------------+ +| gearShootingEndTime |(date) | ++-----------------------------+------------------------+ +| gearShootingStartLatitude |(float) | ++-----------------------------+------------------------+ +| gearShootingEndLatitude |(float) | ++-----------------------------+------------------------+ +| gearShootingStartLongitude |(float) | ++-----------------------------+------------------------+ +| gearShootingEndLongitude |(float) | ++-----------------------------+------------------------+ Exemple ------- @@ -266,17 +266,17 @@ Colonnes requises Format des colonnes ------------------- -+-------------------------+--------------------------+ -| Colonne | Type | -+=========================+==========================+ -| vesselName |FK(Vessel#name) | -+-------------------------+--------------------------+ -| operationId |FK(Operation#id) | -+-------------------------+--------------------------+ -| metadataType |FK(OperationMetadata#name)| -+-------------------------+--------------------------+ -| operationMetadataValue |text | -+-------------------------+--------------------------+ ++-------------------------+---------------------------+ +| Colonne | Type | ++=========================+===========================+ +| vesselName |FK(Vessel#name) | ++-------------------------+---------------------------+ +| operationId |FK(Operation#id) | ++-------------------------+---------------------------+ +| metadataType |FK(OperationMetadata#name) | ++-------------------------+---------------------------+ +| operationMetadataValue |text | ++-------------------------+---------------------------+ Exemple ------- @@ -299,19 +299,19 @@ Colonnes requises Format des colonnes ------------------- -+---------------------+-----------------------+ -| Colonne | Type | -+=====================+=======================+ -| vesselName |FK(Vessel#name) | -+---------------------+-----------------------+ -| operationId |FK(Operation#id) | -+---------------------+-----------------------+ -| metadataType |FK(GearMetadata#name) | -+---------------------+-----------------------+ -| gearCode |FK(Gear#casinoGearName)| -+---------------------+-----------------------+ -| gearMetadataValue |text | -+---------------------+-----------------------+ ++---------------------+------------------------+ +| Colonne | Type | ++=====================+========================+ +| vesselName |FK(Vessel#name) | ++---------------------+------------------------+ +| operationId |FK(Operation#id) | ++---------------------+------------------------+ +| metadataType |FK(GearMetadata#name) | ++---------------------+------------------------+ +| gearCode |FK(Gear#casinoGearName) | ++---------------------+------------------------+ +| gearMetadataValue |text | ++---------------------+------------------------+ Exemple ------- @@ -337,27 +337,27 @@ Colonnes requises Format des colonnes ------------------- -+-----------------+-------------------------+ -| Colonne | Type | -+=================+=========================+ -| operationId |FK(Operation#id) | -+-----------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+-----------------+-------------------------+ -| sizeCategory |FK(SizeCategory#name) | -+-----------------+-------------------------+ -| sampleWeight |(float) | -+-----------------+-------------------------+ -| numberSampled |(Integer-NA) | -+-----------------+-------------------------+ -| meanLength |(Float-NA) | -+-----------------+-------------------------+ -| meanWeight |(Float-NA) | -+-----------------+-------------------------+ -| noPerKg |(Float-NA) | -+-----------------+-------------------------+ -| sortedWeight |(float) | -+-----------------+-------------------------+ ++-----------------+--------------------------+ +| Colonne | Type | ++=================+==========================+ +| operationId |FK(Operation#id) | ++-----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++-----------------+--------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++-----------------+--------------------------+ +| sampleWeight |(float) | ++-----------------+--------------------------+ +| numberSampled |(Integer-NA) | ++-----------------+--------------------------+ +| meanLength |(Float-NA) | ++-----------------+--------------------------+ +| meanWeight |(Float-NA) | ++-----------------+--------------------------+ +| noPerKg |(Float-NA) | ++-----------------+--------------------------+ +| sortedWeight |(float) | ++-----------------+--------------------------+ Exemple ------- @@ -375,34 +375,34 @@ Colonnes requises :: - operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round + operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;round Format des colonnes ------------------- -+------------------+-------------------------+ -| Colonne | Type | -+==================+=========================+ -| operationId |FK(Operation#id) | -+------------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+------------------+-------------------------+ -| sizeCategory |FK(SizeCategory#name) | -+------------------+-------------------------+ -| sexCategory |FK(SexCategory#name) | -+------------------+-------------------------+ -| sampleWeight |(float) | -+------------------+-------------------------+ -| numberSampled |(int) | -+------------------+-------------------------+ -| numberAtLength |(float) | -+------------------+-------------------------+ -| weightAtLength |(Float-NA) | -+------------------+-------------------------+ -| lengthClass |text | -+------------------+-------------------------+ - -(colonnes ignorées) subHaul units round ++------------------+--------------------------+ +| Colonne | Type | ++==================+==========================+ +| operationId |FK(Operation#id) | ++------------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++------------------+--------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++------------------+--------------------------+ +| sexCategory |FK(SexCategory#name) | ++------------------+--------------------------+ +| sampleWeight |(float) | ++------------------+--------------------------+ +| numberSampled |(int) | ++------------------+--------------------------+ +| numberAtLength |(float) | ++------------------+--------------------------+ +| weightAtLength |(Float-NA) | ++------------------+--------------------------+ +| lengthClass |text | ++------------------+--------------------------+ + +(colonnes ignorées) subHaul round Exemple ------- @@ -461,159 +461,159 @@ Colonnes requises Format des colonnes ------------------- -+---------------------------------------------------------+-----------------------------------------+ -| Colonne | Type | -+=========================================================+=========================================+ -| MOVIES_EILayer |text //A| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset |(colonne ignorée) //B| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\sndname |(colonne ignorée) //C| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\sndident |(colonne ignorée) //D| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\softChannelId |FK(AcousticInstrument#id) //E| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\channelName |(colonne ignorée) //F| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\dataType |(colonne ignorée) //G| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamType |(colonne ignorée) //H| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\acousticFrequency |(colonne ignorée) //I| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\startSample |(colonne ignorée) //J| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle |(colonne ignorée) //K| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle |(colonne ignorée) //L| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\absorptionCoef |(Float-NA) //M| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\transmissionPower |(int) //N| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamAlongAngleSensitivity |(Float) //O| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamAthwartAngleSensitivity |(Float) //P| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beam3dBWidthAlong |(colonne ignorée) //Q| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beam3dBWidthAthwart |(colonne ignorée) //R| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamEquTwoWayAngle |(Float) //S| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamGain |(Float) //T| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\beamSACorrection |(Float) //U| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\bottomDetectionMinDepth |(colonne ignorée) //V| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\bottomDetectionMaxDepth |(colonne ignorée) //W| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\bottomDetectionMinLevel |(colonne ignorée) //X| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\AlongTXRXWeightId |(colonne ignorée) //Y| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\AthwartTXRXWeightId |(colonne ignorée) //Z| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId |(colonne ignorée) //AA| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId |(colonne ignorée) //AB| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\bandWidth |(colonne ignorée) //AC| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\tvgminrange |(colonne ignorée) //AD| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\tvgmaxrange |(colonne ignorée) //AE| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\sndset\\pulseduration |(Float) //AF| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav |(colonne ignorée) //AG| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\lat |(colonne ignorée) //AH| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\long |(colonne ignorée) //AI| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\alt |(colonne ignorée) //AJ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\gndspeed |(colonne ignorée) //AK| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\gndcourse |(colonne ignorée) //AL| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\surfspeed |(colonne ignorée) //AM| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\surfcourse |(colonne ignorée) //AN| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\driftspeed |(colonne ignorée) //AO| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\driftcourse |(colonne ignorée) //AP| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\heading |(colonne ignorée) //AQ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\roll |(colonne ignorée) //AR| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\pitch |(colonne ignorée) //AS| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\heave |(colonne ignorée) //AT| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\depth |text //AU| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\shipnav\\draught |(colonne ignorée) //AV| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset |(colonne ignorée) //AW| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\cellnum |(int) //AX| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\celltype |(int) //AY| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\depthstart |(float) //AZ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\depthend |(float) //BA| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\indexstart |(colonne ignorée) //BB| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\indexend |(colonne ignorée) //BC| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\datestart |(date) //BD| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\dateend |(date) //BE| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\lat |(Float) //BF| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\long |(Float) //BG| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\volume |(Integer-NA) //BH| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\area |(int) //BI| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\diststart |(colonne ignorée) //BJ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\distend |(colonne ignorée) //BK| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\thresholdup |(int) //BL| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\cellset\\thresholdlow |(int) //BM| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer |(colonne ignorée) //BN| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer\\sa |(Float-NA) //BO| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer\\sv |(colonne ignorée) //BP| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer\\ni |(Integer-NA) //BQ| -+---------------------------------------------------------+-----------------------------------------+ -| MOVIES_EILayer\\eilayer\\nt |(Integer-NA) //BR| -+---------------------------------------------------------+-----------------------------------------+ -| 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 |text //BV| -+---------------------------------------------------------+-----------------------------------------+ -| dataQuality |FK(DataQuality#qualityDataFlagValues) //E| -+---------------------------------------------------------+-----------------------------------------+ ++---------------------------------------------------------+------------------------------------------+ +| Colonne | Type | ++=========================================================+==========================================+ +| MOVIES_EILayer |text //A | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset |(colonne ignorée) //B | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\sndname |(colonne ignorée) //C | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\sndident |(colonne ignorée) //D | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\softChannelId |FK(AcousticInstrument#id) //E | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\channelName |(colonne ignorée) //F | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\dataType |(colonne ignorée) //G | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamType |(colonne ignorée) //H | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\acousticFrequency |(colonne ignorée) //I | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\startSample |(colonne ignorée) //J | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle |(colonne ignorée) //K | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle |(colonne ignorée) //L | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\absorptionCoef |(Float-NA) //M | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\transmissionPower |(int) //N | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamAlongAngleSensitivity |(Float) //O | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamAthwartAngleSensitivity |(Float) //P | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beam3dBWidthAlong |(colonne ignorée) //Q | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beam3dBWidthAthwart |(colonne ignorée) //R | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamEquTwoWayAngle |(Float) //S | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamGain |(Float) //T | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\beamSACorrection |(Float) //U | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMinDepth |(colonne ignorée) //V | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMaxDepth |(colonne ignorée) //W | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMinLevel |(colonne ignorée) //X | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\AlongTXRXWeightId |(colonne ignorée) //Y | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\AthwartTXRXWeightId |(colonne ignorée) //Z | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId |(colonne ignorée) //AA | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId |(colonne ignorée) //AB | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\bandWidth |(colonne ignorée) //AC | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\tvgminrange |(colonne ignorée) //AD | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\tvgmaxrange |(colonne ignorée) //AE | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\sndset\\pulseduration |(Float) //AF | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav |(colonne ignorée) //AG | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\lat |(colonne ignorée) //AH | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\long |(colonne ignorée) //AI | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\alt |(colonne ignorée) //AJ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\gndspeed |(colonne ignorée) //AK | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\gndcourse |(colonne ignorée) //AL | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\surfspeed |(colonne ignorée) //AM | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\surfcourse |(colonne ignorée) //AN | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\driftspeed |(colonne ignorée) //AO | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\driftcourse |(colonne ignorée) //AP | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\heading |(colonne ignorée) //AQ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\roll |(colonne ignorée) //AR | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\pitch |(colonne ignorée) //AS | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\heave |(colonne ignorée) //AT | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\depth |text //AU | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\shipnav\\draught |(colonne ignorée) //AV | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset |(colonne ignorée) //AW | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\cellnum |(int) //AX | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\celltype |(int) //AY | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\depthstart |(float) //AZ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\depthend |(float) //BA | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\indexstart |(colonne ignorée) //BB | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\indexend |(colonne ignorée) //BC | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\datestart |(date) //BD | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\dateend |(date) //BE | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\lat |(Float) //BF | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\long |(Float) //BG | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\volume |(Integer-NA) //BH | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\area |(int) //BI | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\diststart |(colonne ignorée) //BJ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\distend |(colonne ignorée) //BK | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\thresholdup |(int) //BL | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\cellset\\thresholdlow |(int) //BM | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer |(colonne ignorée) //BN | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer\\sa |(Float-NA) //BO | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer\\sv |(colonne ignorée) //BP | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer\\ni |(Integer-NA) //BQ | ++---------------------------------------------------------+------------------------------------------+ +| MOVIES_EILayer\\eilayer\\nt |(Integer-NA) //BR | ++---------------------------------------------------------+------------------------------------------+ +| 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 |text //BV | ++---------------------------------------------------------+------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) //E | ++---------------------------------------------------------+------------------------------------------+ Exemple ------- @@ -639,19 +639,19 @@ Colonnes requises Format des colonnes ------------------- -+-----------------+-------------------------+ -| Colonne | Type | -+=================+=========================+ -| echotypeName |text | -+-----------------+-------------------------+ -| meaning |text | -+-----------------+-------------------------+ -| voyage |FK(Voyage#name) | -+-----------------+-------------------------+ -| depthStratumId |FK(DepthStratum#id) | -+-----------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+-----------------+-------------------------+ ++-----------------+--------------------------+ +| Colonne | Type | ++=================+==========================+ +| echotypeName |text | ++-----------------+--------------------------+ +| meaning |text | ++-----------------+--------------------------+ +| voyage |FK(Voyage#name) | ++-----------------+--------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++-----------------+--------------------------+ Exemple ------- @@ -674,21 +674,21 @@ Colonnes requises Format des colonnes ------------------- -+----------------+-------------------------+ -| Colonne | Type | -+================+=========================+ -| aParameter |(float) | -+----------------+-------------------------+ -| bParameter |(float) | -+----------------+-------------------------+ -| voyage |FK(Voyage#name) | -+----------------+-------------------------+ -| sizeCategory |FK(SizeCategory#name) | -+----------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+----------------+-------------------------+ -| strata |FK(Strata#name) | -+----------------+-------------------------+ ++----------------+--------------------------+ +| Colonne | Type | ++================+==========================+ +| aParameter |(float) | ++----------------+--------------------------+ +| bParameter |(float) | ++----------------+--------------------------+ +| voyage |FK(Voyage#name) | ++----------------+--------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+--------------------------+ +| strata |FK(Strata#name) | ++----------------+--------------------------+ Exemple ------- @@ -711,23 +711,23 @@ Colonnes requises Format des colonnes ------------------- -+----------------+-------------------------+ -| Colonne | Type | -+================+=========================+ -| voyage |FK(Voyage#name) | -+----------------+-------------------------+ -| age |(int) | -+----------------+-------------------------+ -| length |(float) | -+----------------+-------------------------+ -| percentAtAge |(float) | -+----------------+-------------------------+ -| metadata |text | -+----------------+-------------------------+ -| strata |FK(Strata#name) | -+----------------+-------------------------+ -| baracoudaCode |FK(Species#baracoudaCode)| -+----------------+-------------------------+ ++----------------+--------------------------+ +| Colonne | Type | ++================+==========================+ +| voyage |FK(Voyage#name) | ++----------------+--------------------------+ +| age |(int) | ++----------------+--------------------------+ +| length |(float) | ++----------------+--------------------------+ +| percentAtAge |(float) | ++----------------+--------------------------+ +| metadata |text | ++----------------+--------------------------+ +| strata |FK(Strata#name) | ++----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+--------------------------+ Exemple ------- @@ -814,83 +814,87 @@ 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 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Esdu / Echotype / Species Category / Length +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Colonnes requises ----------------- :: - name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage Format des colonnes ------------------- -+----------------------+-------------------------------------------------------+ -| Colonne | Type | -+======================+=======================================================+ -| voyage |FK(Voyage#name) | -+----------------------+-------------------------------------------------------+ -| name |FK(esdu cell) | -+----------------------+-------------------------------------------------------+ -| baracoudaCode |FK(Species#baracoudaCode) | -+----------------------+-------------------------------------------------------+ -| ageCategory |text | -+----------------------+-------------------------------------------------------+ -| ageCategoryMeaning |text | -+----------------------+-------------------------------------------------------+ -| dataQuality |FK(DataQuality#qualityDataFlagValues) | -+----------------------+-------------------------------------------------------+ -| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| -+----------------------+-------------------------------------------------------+ ++----------------------+--------------------------------------------------------+ +| Colonne | Type | ++======================+========================================================+ +| voyage |FK(Voyage#name) | ++----------------------+--------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------------+--------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------------+--------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+--------------------------------------------------------+ +| lengthClass |(float) | ++----------------------+--------------------------------------------------------+ +| sizeCategory |text | ++----------------------+--------------------------------------------------------+ +| sizeCategoryMeaning |text | ++----------------------+--------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+--------------------------------------------------------+ +| 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 + name;echotype;baracoudaCode;lengthClass;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + 2011-04-26 13:35:19.0000;D1;COMP-LEM;10.5;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011 -Esdu / Species / Size Category -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Esdu / Species / Age Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Colonnes requises ----------------- :: - name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage Format des colonnes ------------------- -+----------------------+-------------------------------------------------------+ -| Colonne | Type | -+======================+=======================================================+ -| voyage |FK(Voyage#name) | -+----------------------+-------------------------------------------------------+ -| name |FK(esdu cell) | -+----------------------+-------------------------------------------------------+ -| baracoudaCode |FK(Species#baracoudaCode) | -+----------------------+-------------------------------------------------------+ -| sizeCategory |text | -+----------------------+-------------------------------------------------------+ -| sizeCategoryMeaning |text | -+----------------------+-------------------------------------------------------+ -| dataQuality |FK(DataQuality#qualityDataFlagValues) | -+----------------------+-------------------------------------------------------+ -| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| -+----------------------+-------------------------------------------------------+ ++----------------------+--------------------------------------------------------+ +| Colonne | Type | ++======================+========================================================+ +| voyage |FK(Voyage#name) | ++----------------------+--------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------------+--------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+--------------------------------------------------------+ +| ageCategory |text | ++----------------------+--------------------------------------------------------+ +| ageCategoryMeaning |text | ++----------------------+--------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+--------------------------------------------------------+ +| 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 + 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 Region ====== @@ -976,23 +980,23 @@ Colonnes requises Format des colonnes ------------------- -+----------------------+-------------------------------------------------------+ -| Colonne | Type | -+======================+=======================================================+ -| voyage |FK(Voyage#name) | -+----------------------+-------------------------------------------------------+ -| name |FK(Cell#name) | -+----------------------+-------------------------------------------------------+ -| baracoudaCode |FK(Species#baracoudaCode) | -+----------------------+-------------------------------------------------------+ -| 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)| -+----------------------+-------------------------------------------------------+ ++----------------------+--------------------------------------------------------+ +| Colonne | Type | ++======================+========================================================+ +| voyage |FK(Voyage#name) | ++----------------------+--------------------------------------------------------+ +| name |FK(Cell#name) | ++----------------------+--------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+--------------------------------------------------------+ +| 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) | ++----------------------+--------------------------------------------------------+ Exemple ------- @@ -1018,35 +1022,35 @@ Colonnes requises Format des colonnes ------------------- -+----------------------+-------------------------------------------------------+ -| Colonne | Type | -+======================+=======================================================+ -| voyage |FK(Voyage#name) | -+----------------------+-------------------------------------------------------+ -| name |text | -+----------------------+-------------------------------------------------------+ -| baracoudaCode |FK(Species#baracoudaCode) | -+----------------------+-------------------------------------------------------+ -| sizeCategory |FK(SizeCategory#name) | -+----------------------+-------------------------------------------------------+ -| ageCategory |FK(AgeCategory#name) | -+----------------------+-------------------------------------------------------+ -| dataQuality |FK(DataQuality#qualityDataFlagValues) | -+----------------------+-------------------------------------------------------+ -| gridCellLongitude |(float) | -+----------------------+-------------------------------------------------------+ -| gridCellLatitude |(float) | -+----------------------+-------------------------------------------------------+ -| gridCellDepth |(float) | -+----------------------+-------------------------------------------------------+ -| gridLongitudeLag |(float) | -+----------------------+-------------------------------------------------------+ -| gridLatitudeLag |(float) | -+----------------------+-------------------------------------------------------+ -| gridDepthLag |(float) | -+----------------------+-------------------------------------------------------+ -| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| -+----------------------+-------------------------------------------------------+ ++----------------------+--------------------------------------------------------+ +| Colonne | Type | ++======================+========================================================+ +| voyage |FK(Voyage#name) | ++----------------------+--------------------------------------------------------+ +| name |text | ++----------------------+--------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+--------------------------------------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------------+--------------------------------------------------------+ +| ageCategory |FK(AgeCategory#name) | ++----------------------+--------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+--------------------------------------------------------+ +| gridCellLongitude |(float) | ++----------------------+--------------------------------------------------------+ +| gridCellLatitude |(float) | ++----------------------+--------------------------------------------------------+ +| gridCellDepth |(float) | ++----------------------+--------------------------------------------------------+ +| gridLongitudeLag |(float) | ++----------------------+--------------------------------------------------------+ +| gridLatitudeLag |(float) | ++----------------------+--------------------------------------------------------+ +| gridDepthLag |(float) | ++----------------------+--------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------------+--------------------------------------------------------+ Exemple ------- @@ -1074,29 +1078,29 @@ Colonnes requises Format des colonnes ------------------- -+----------------------+-------------------------------------------------------+ -| Colonne | Type | -+======================+=======================================================+ -| voyage |FK(Voyage#name) | -+----------------------+-------------------------------------------------------+ -| name |text | -+----------------------+-------------------------------------------------------+ -| dataQuality |FK(DataQuality#qualityDataFlagValues) | -+----------------------+-------------------------------------------------------+ -| gridCellLongitude |(float) | -+----------------------+-------------------------------------------------------+ -| gridCellLatitude |(float) | -+----------------------+-------------------------------------------------------+ -| gridCellDepth |(float) | -+----------------------+-------------------------------------------------------+ -| gridLongitudeLag |(float) | -+----------------------+-------------------------------------------------------+ -| gridLatitudeLag |(float) | -+----------------------+-------------------------------------------------------+ -| gridDepthLag |(float) | -+----------------------+-------------------------------------------------------+ -| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| -+----------------------+-------------------------------------------------------+ ++----------------------+--------------------------------------------------------+ +| Colonne | Type | ++======================+========================================================+ +| voyage |FK(Voyage#name) | ++----------------------+--------------------------------------------------------+ +| name |text | ++----------------------+--------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+--------------------------------------------------------+ +| gridCellLongitude |(float) | ++----------------------+--------------------------------------------------------+ +| gridCellLatitude |(float) | ++----------------------+--------------------------------------------------------+ +| gridCellDepth |(float) | ++----------------------+--------------------------------------------------------+ +| gridLongitudeLag |(float) | ++----------------------+--------------------------------------------------------+ +| gridLatitudeLag |(float) | ++----------------------+--------------------------------------------------------+ +| gridDepthLag |(float) | ++----------------------+--------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------------+--------------------------------------------------------+ Exemple ------- @@ -1105,3 +1109,4 @@ 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 + diff --git a/src/site/rst/install.rst.vm b/src/site/rst/install.rst.vm index ad67d40..e9d7c64 100644 --- a/src/site/rst/install.rst.vm +++ b/src/site/rst/install.rst.vm @@ -1,9 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 Ifremer, Codelutin .. * %% diff --git a/src/site/rst/model.rst b/src/site/rst/model.rst index 0c932a5..6a91f34 100644 --- a/src/site/rst/model.rst +++ b/src/site/rst/model.rst @@ -69,8 +69,8 @@ Sous modèle pêcherie - `Sous modèle pêcherie`_ -.. _Télécharger le modèle au format argoUML: http://svn.codelutin.com/echobase/trunk/echobase-domain/src/main/xmi/echobas... -.. _Télécharger le modèle au format freeMind: http://svn.codelutin.com/echobase/trunk/src/doc/model/EchoBase_structure_V5.... +.. _Télécharger le modèle au format argoUML: https://gitlab.nuiton.org/codelutin/echobase/raw/develop/echobase-domain/src... +.. _Télécharger le modèle au format freeMind: https://gitlab.nuiton.org/codelutin/echobase/raw/develop/src/doc/model/EchoB... .. _Vue générale du référentiel: model/referenceAll.png .. _Référentiel AcousticInstrument: model/referenceAcousticInstrument.png diff --git a/src/site/rst/removeData.rst b/src/site/rst/removeData.rst index 1cb5477..a241b8f 100644 --- a/src/site/rst/removeData.rst +++ b/src/site/rst/removeData.rst @@ -175,7 +175,7 @@ Les opérations de pêche et tout ce qui y est rattaché (OperationMetadata et GearMetadata et Sample). Imports à retirer -~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~ Seront supprimés de la table des imports les imports suivants qui aurait pu être effectué suite à cet import, à savoir : diff --git a/src/site/rst/usage.rst.vm b/src/site/rst/usage.rst.vm index 482b42c..2c25a4b 100644 --- a/src/site/rst/usage.rst.vm +++ b/src/site/rst/usage.rst.vm @@ -1,8 +1,6 @@ .. - .. * #%L .. * EchoBase -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2012 Ifremer, Codelutin .. * %% diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 1883708..0762b71 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -72,8 +72,8 @@ <menu name="Administration"> <item name="Download" href="https://forge.codelutin.com/projects/echobase/files"/> <item name="Install" href="install.html"/> - <!--<item name="Update" href="update.html"/>--> - <!--<item name="Configure" href="configure.html"/>--> + <item name="Update" href="update.html"/> + <item name="Configure" href="configure.html"/> </menu> <menu name="User"> @@ -98,6 +98,7 @@ <menu name="Dev"> <item name="Model" href="model.html"/> + <item name="Visualisation Gis" href="gis.html"/> <item name="Roadmap" href="https://forge.codelutin.com/projects/echobase/roadmap"/> <item name="Changelogs" href="changes-report.html"/> </menu> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.