Author: tchemit Date: 2012-09-22 15:46:36 +0200 (Sat, 22 Sep 2012) New Revision: 686 Url: http://forge.codelutin.com/repositories/revision/echobase/686 Log: simplify import/export screen add doc entries add missing svn properties add missing headers Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml trunk/src/site/rst/exportData.rst trunk/src/site/rst/exportDb.rst trunk/src/site/rst/importData.rst trunk/src/site/rst/modifyData.rst trunk/src/site/rst/removeData.rst Removed: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureFree-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureReferential-validation.xml trunk/src/site/rst/imports.rst trunk/src/site/rst/removeimports.rst Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_childs.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_data.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataAcquisition_dataProcessing.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataProcessing_cell.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_gearMetadataValue.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_operationMetadataValue.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_sample.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Sample_sampleData.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_dataAcquisition.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_operation.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transit_transect.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthAgeKey.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthWeightKey.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_postCell.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_transit.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Cell.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataAcquisition.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata2.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataProcessing.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data_backup.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/GearMetadataValue.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthAgeKey.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthWeightKey.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Operation.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/OperationMetadataValue.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Sample.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SampleData.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SpeciesCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transect.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transit.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Voyage.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AcousticInstrument.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AgeCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AreaOfOperation.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellMethod.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataMetadata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataQuality.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DepthStratum.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/EchotypeCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Gear.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/GearMetadata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Mission.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationEvent.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationMetadata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatum.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatumType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleDataType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleType.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SexCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SizeCategory.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Species.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Strata.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/TSParameters.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Vessel.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/VesselType.csv.gz trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp trunk/echobase-ui/src/main/webapp/images/menu2.jpg trunk/src/doc/reunions/reunion-2012-09-20.txt trunk/src/site/rst/importDb.rst trunk/src/site/rst/model.rst trunk/src/site/site_fr.xml Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.csv; +/* + * #%L + * EchoBase :: Domain + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ + import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_childs.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Cell_data.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataAcquisition_dataProcessing.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/DataProcessing_cell.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_gearMetadataValue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_operationMetadataValue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Operation_sample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Sample_sampleData.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_dataAcquisition.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transect_operation.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Transit_transect.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthAgeKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_lengthWeightKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_postCell.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_transit.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Cell.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataAcquisition.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataMetadata2.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/DataProcessing.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Data_backup.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/GearMetadataValue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthAgeKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/LengthWeightKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Operation.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/OperationMetadataValue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Sample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SampleData.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/SpeciesCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transect.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Transit.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Voyage.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AcousticInstrument.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AgeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/AreaOfOperation.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellMethod.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/CellType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataMetadata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataQuality.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DataType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/DepthStratum.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/EchotypeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Gear.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/GearMetadata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Mission.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationEvent.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/OperationMetadata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatum.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/ReferenceDatumType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleDataType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SampleType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SexCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SizeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Species.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Strata.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/TSParameters.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Vessel.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/VesselType.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2012-09-22 13:46:36 UTC (rev 686) @@ -23,7 +23,6 @@ */ package fr.ifremer.echobase.ui.actions.exportDb; -import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.exportdb.ExportDbConfiguration; import fr.ifremer.echobase.services.exportdb.ExportDbMode; @@ -74,26 +73,6 @@ getModel().setFileName(fileName); } - @InputConfig(methodName = "input") - public String configureReferential() throws Exception { - return execute(); - } - - @InputConfig(methodName = "input") - public String configureReferentialAndData() throws Exception { - return execute(); - } - - @InputConfig(methodName = "input") - public String configureData() throws Exception { - return execute(); - } - - @InputConfig(methodName = "input") - public String configureAll() throws Exception { - return execute(); - } - @Override protected ExportDbConfiguration createModel() { ExportDbConfiguration result = new ExportDbConfiguration(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-09-22 13:46:36 UTC (rev 686) @@ -95,20 +95,10 @@ } @InputConfig(methodName = "input") - public String configureReferential() throws Exception { + public String configure() throws Exception { return execute(); } - @InputConfig(methodName = "input") - public String configureData() throws Exception { - return execute(); - } - - @InputConfig(methodName = "input") - public String configureFree() throws Exception { - return execute(); - } - public void setInputFileName(String fileName) { getModel().getInput().setFileName(fileName); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.removeData; +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ + import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.workingDb; +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ + import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.workingDb; +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ + import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java 2012-09-22 13:46:36 UTC (rev 686) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.workingDb; +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ + import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.data.Voyage; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -31,13 +31,13 @@ <package name="exportDb" extends="loggued" namespace="/exportDb"> <!-- Configure export (input) --> - <action name="configure" method="input" + <action name="configureInput" method="input" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> </action> <!-- Configure export --> - <action name="configure*" method="configure{1}" + <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -31,13 +31,13 @@ <package name="importDb" extends="loggued" namespace="/importDb"> <!-- Configure import (input) --> - <action name="configure" method="input" + <action name="configureInput" method="input" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> </action> <!-- Configure import (validate) --> - <action name="configure*" method="configure{1}" + <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -1,35 +0,0 @@ -<!-- - #%L - EchoBase :: UI - - $Id$ - $HeadURL$ - %% - 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% - --> -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="input"> - <field-validator type="fieldexpression"> - <param name="expression">model.input.file != null</param> - <message key="echobase.error.importDb.input.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureFree-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureFree-validation.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureFree-validation.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -1,35 +0,0 @@ -<!-- - #%L - EchoBase :: UI - - $Id$ - $HeadURL$ - %% - 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% - --> -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="input"> - <field-validator type="fieldexpression"> - <param name="expression">model.input.file != null</param> - <message key="echobase.error.importDb.input.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureReferential-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureReferential-validation.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureReferential-validation.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -1,39 +0,0 @@ -<!-- - #%L - EchoBase :: UI - - $Id$ - $HeadURL$ - %% - 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% - --> -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="input"> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression">model.input.file != null</param> - <message key="echobase.error.importDb.input.required"/> - </field-validator> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression">model.input.fileName.endsWith(".echobase")</param> - <message key="echobase.error.importDb.input.extension.mismatch"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml (from rev 681, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-configureData-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importDb/Configure-validation.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,39 @@ +<!-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + 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% + --> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="input"> + <field-validator type="fieldexpression"> + <param name="expression">model.input.file != null</param> + <message key="echobase.error.importDb.input.required"/> + </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression">model.input.fileName.endsWith(".echobase")</param> + <message key="echobase.error.importDb.input.extension.mismatch"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-22 13:46:36 UTC (rev 686) @@ -297,14 +297,12 @@ echobase.legend.dbeditor.show=Displaying '%s' echobase.legend.embeddedApplication.configuration=Portable database configuration echobase.legend.exportDb.configuration.files=Export configuration -echobase.legend.exportDb.configuration.selectExportDbMode=Select export db mode echobase.legend.exportDb.resume=Resume of database export echobase.legend.importData.configuration.selectImportType=Type of import selection echobase.legend.importData.configure=Import configuration echobase.legend.importData.createMission=Mission caracteristics echobase.legend.importData.result.resume=Results of data import echobase.legend.importDb.configuration=Configure import -echobase.legend.importDb.configuration.selectImportDbMode=Select import db mode echobase.legend.importDb.resume=Results of database import echobase.legend.libreOfficeQuery=Translate a SQL query from Libre Office echobase.legend.removeData.resume=Results of Import removal Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-22 13:46:36 UTC (rev 686) @@ -297,14 +297,12 @@ echobase.legend.dbeditor.show=Visualisation de '%s' echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export -echobase.legend.exportDb.configuration.selectExportDbMode=Choix du mode d'export echobase.legend.exportDb.resume=Résumé de l'export de base echobase.legend.importData.configuration.selectImportType=Sélection du type d'import echobase.legend.importData.configure=Configurer l'import echobase.legend.importData.createMission=Caractéristiques de la mission echobase.legend.importData.result.resume=Résultats de l'import de données echobase.legend.importDb.configuration=Configuration de l'import -echobase.legend.importDb.configuration.selectImportDbMode=Choix du mode d'import echobase.legend.importDb.resume=Résumé de l'import de base de données echobase.legend.libreOfficeQuery=Traduire une requête SQL issue de Libre Office echobase.legend.removeData.resume=Résumé de la suppression d'un import Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-22 13:46:36 UTC (rev 686) @@ -89,11 +89,11 @@ <s:if test="%{admin}"> <s:if test="%{workingDbSelected}"> <li> - <s:a action="configure" namespace="/importDb" cssClass="impBase"> + <s:a action="configureInput" namespace="/importDb" cssClass="impBase"> <span><s:text name="echobase.menu.importDb"/></s:a></span> </li> <li> - <s:a action="configure" namespace="/exportDb" cssClass="expBase"> + <s:a action="configureInput" namespace="/exportDb" cssClass="expBase"> <span><s:text name="echobase.menu.exportDb"/></s:a></span> </li> <li> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-22 13:46:36 UTC (rev 686) @@ -30,152 +30,58 @@ jQuery(document).ready(function () { + function reload(value) { + $('#extraInfos').hide(); + $('[class~="' + value + '"]').show(); + } + // to change form when mode is changed $('[name="model.exportDbMode"]').change(function (event) { - $('[class~="exportDbMode"]').hide(); - $('#' + this.value).show(); - $('#' + this.value + ' .errorMessage').hide(); + reload(this.value); }); - // show incoming mode var incomingVal = $('[name="model.exportDbMode"][checked="checked"]').val(); - $('#' + incomingVal).show(); + reload(incomingVal); }); </script> -<fieldset> - <legend> - <s:text name="echobase.legend.exportDb.configuration.selectExportDbMode"/> - </legend> - <s:radio id='mode' key='model.exportDbMode' list="modes" cssClass="cleanBoth" - label='%{getText("echobase.common.exportDbMode")}' - required="true" template="myradiomap"/> -</fieldset> - -<s:form id="REFERENTIAL" namespace="/exportDb" method="POST" - cssClass="hidden exportDbMode"> - +<s:form namespace="/exportDb" method="POST"> <fieldset> <legend> <s:text name="echobase.legend.exportDb.configuration.files"/> </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','export-referential')}" + <s:a href="%{getDocumentation('exportDb.html', null)}" target="doc"> <s:text name="echobase.action.show.exportDb.documentation"/> </s:a> </div> <br/> - <s:hidden key="model.exportDbMode" value="REFERENTIAL" label=''/> - <s:textfield key="model.fileName" required="true" size="100" - label="%{getText('echobase.label.exportDbFileName')} (*)"/> + <s:radio id='mode' key='model.exportDbMode' list="modes" + cssClass="cleanBoth" + label='%{getText("echobase.common.exportDbMode")}' + required="true" template="myradiomap"/> - <div class="cleanBoth"> - (*) <s:text name="echobase.info.exportDb.archive"/> - </div> - </fieldset> - <br/> - <s:submit action="configureReferential" - value='%{getText("echobase.action.export")}'/> - -</s:form> - - -<s:form id="REFERENTIAL_AND_DATA" namespace="/exportDb" method="POST" - cssClass="hidden exportDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.exportDb.configuration.files"/> - </legend> - - <div class="cleanBoth help"> - <s:a - href="%{getDocumentation('importDb.html','export-referential-and-data')}" - target="doc"> - <s:text name="echobase.action.show.exportDb.documentation"/> - </s:a> - </div> + <div class="cleanBoth"></div> <br/> - - <s:hidden key="model.exportDbMode" value="REFERENTIAL_AND_DATA" label=''/> <s:textfield key="model.fileName" required="true" size="100" label="%{getText('echobase.label.exportDbFileName')} (*)"/> - <s:checkboxlist list="voyages" key="model.voyageIds" - template="mycheckboxlist" - label="%{getText('echobase.label.voyageToSelect')}"/> - - <div class="cleanBoth"> - (*) <s:text name="echobase.info.exportDb.archive"/> - </div> - </fieldset> - <br/> - <s:submit action="configureReferentialAndData" - value='%{getText("echobase.action.export")}'/> - -</s:form> - - -<s:form id="DATA" namespace="/exportDb" method="POST" - cssClass="hidden exportDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.exportDb.configuration.files"/> - </legend> - - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','export-data')}" - target="doc"> - <s:text name="echobase.action.show.exportDb.documentation"/> - </s:a> - </div> + <div class="cleanBoth"></div> <br/> - <s:hidden key="model.exportDbMode" value="DATA" label=''/> - <s:textfield key="model.fileName" required="true" size="100" - label="%{getText('echobase.label.exportDbFileName')} (*)"/> - <s:checkboxlist list="voyages" key="model.voyageIds" - template="mycheckboxlist" - label="%{getText('echobase.label.voyageToSelect')}"/> - - <div class="cleanBoth"> - (*) <s:text name="echobase.info.exportDb.archive"/> + <div id='extraInfos' class="DATA REFERENTIAL_AND_DATA"> + <s:checkboxlist list="voyages" key="model.voyageIds" id='voyages' + template="mycheckboxlist" + label="%{getText('echobase.label.voyageToSelect')}"/> </div> - </fieldset> - <br/> - <s:submit action="configureData" - value='%{getText("echobase.action.export")}'/> -</s:form> - -<s:form id="ALL" namespace="/exportDb" method="POST" - cssClass="hidden exportDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.exportDb.configuration.files"/> - </legend> - - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','export-all')}" - target="doc"> - <s:text name="echobase.action.show.exportDb.documentation"/> - </s:a> - </div> - <br/> - - <s:hidden key="model.exportDbMode" value="ALL" label=''/> - <s:textfield key="model.fileName" required="true" size="100" - label="%{getText('echobase.label.exportDbFileName')} (*)"/> - <div class="cleanBoth"> + <br/> (*) <s:text name="echobase.info.exportDb.archive"/> </div> </fieldset> <br/> - <s:submit action="configureAll" value='%{getText("echobase.action.export")}'/> - -</s:form> \ No newline at end of file + <s:submit action="configure" value='%{getText("echobase.action.export")}'/> +</s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-22 13:46:36 UTC (rev 686) @@ -28,98 +28,29 @@ <script type="text/javascript"> - jQuery(document).ready(function () { - - // to change form when mode is changed - $('[name="model.importDbMode"]').change(function (event) { - $('[class~="importDbMode"]').hide(); - $('#' + this.value).show(); - $('#' + this.value + ' .errorMessage').hide(); - }); - - // show incoming mode - var incomingVal = $('[name="model.importDbMode"][checked="checked"]').val(); - $('#' + incomingVal).show(); - }); </script> -<fieldset> - <legend> - <s:text name="echobase.legend.importDb.configuration.selectImportDbMode"/> - </legend> - <s:radio id='mode' key='model.importDbMode' list="modes" cssClass="cleanBoth" - label='%{getText("echobase.common.importDbMode")}' - required="true" template="myradiomap"/> -</fieldset> -<s:form id="REFERENTIAL" namespace="/importDb" method="POST" - enctype="multipart/form-data" cssClass="hidden importDbMode"> - +<s:form namespace="/importDb" method="POST" enctype="multipart/form-data"> <fieldset> <legend> <s:text name="echobase.legend.importDb.configuration"/> </legend> - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','import-referential')}" + <s:a href="%{getDocumentation('importDb.html',null)}" target="doc"> <s:text name="echobase.action.show.importDb.documentation"/> </s:a> </div> <br/> - <s:hidden key="model.importDbMode" value="REFERENTIAL" label=''/> - <s:file name="input" required="true" key="echobase.common.importDbFile"/> - - </fieldset> - <br/> - <s:submit action="configureReferential" - value='%{getText("echobase.action.import")}'/> -</s:form> - -<s:form id="DATA" namespace="/importDb" method="POST" - enctype="multipart/form-data" cssClass="hidden importDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.importDb.configuration"/> - </legend> - - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','data')}" - target="doc"> - <s:text name="echobase.action.show.importDb.documentation"/> - </s:a> - </div> + <s:radio id='mode' key='model.importDbMode' list="modes" cssClass="cleanBoth" + label='%{getText("echobase.common.importDbMode")}' + required="true" template="myradiomap"/> + <div class="cleanBoth"></div> <br/> - <s:hidden key="model.importDbMode" value="DATA" label=''/> <s:file name="input" required="true" key="echobase.common.importDbFile"/> </fieldset> <br/> - <s:submit action="configureData" - value='%{getText("echobase.action.import")}'/> + <s:submit action="configure" value='%{getText("echobase.action.import")}'/> </s:form> - -<s:form id="FREE" namespace="/importDb" method="POST" - enctype="multipart/form-data" cssClass="hidden importDbMode"> - - <fieldset> - <legend> - <s:text name="echobase.legend.importDb.configuration"/> - </legend> - - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','free')}" - target="doc"> - <s:text name="echobase.action.show.importDb.documentation"/> - </s:a> - </div> - <br/> - <s:hidden key="model.importDbMode" value="FREE" label=''/> - <s:file name="input" required="true" key="echobase.common.importDbFile"/> - - </fieldset> - <br/> - <s:submit action="configureFree" - value='%{getText("echobase.action.import")}'/> -</s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-22 13:46:36 UTC (rev 686) @@ -2,7 +2,7 @@ #%L EchoBase :: UI $Id$ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/webap... $ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/echobase-ui/src/main/webapp/images/menu2.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/doc/reunions/reunion-2012-09-20.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Added: trunk/src/site/rst/exportData.rst =================================================================== --- trunk/src/site/rst/exportData.rst (rev 0) +++ trunk/src/site/rst/exportData.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,41 @@ +.. - +.. * #%L +.. * EchoBase +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 - 2012 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% +.. - + +==================== +Exporter des données +==================== + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +======== + +Ce document explique comment exporter les données depuis EchoBase. + +TODO Property changes on: trunk/src/site/rst/exportData.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/src/site/rst/exportDb.rst (from rev 681, trunk/src/site/rst/importDb.rst) =================================================================== --- trunk/src/site/rst/exportDb.rst (rev 0) +++ trunk/src/site/rst/exportDb.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,93 @@ +.. - +.. * #%L +.. * EchoBase +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 - 2012 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% +.. - + +================= +Export d'une base +================= + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +-------- + +EchoBase permet d'export une partie ou l'ensemble d'une base de travail au +format *.echobase* qui est ensuite réimportable dans une autre instance d'EchoBase. + +- Cliquer sur le menu *Exporter une base*. + +- Configurer l'export + +Une fichier au format *.echobase* sera créé, il est ensuite possible de +l'importer sur une autre instance d'EchoBase. + +Il existe plusieurs modes d'export que nous détaillons ci-dessous. + +Export referential +~~~~~~~~~~~~~~~~~~ + +Dans ce mode on exporte uniquement le référentiel de la base de travail. + +Il vous suffit de renseigner le nom du fichier d'export (l'extension +*.echobase*) sera automatiquement rajoutée, puis de cliquer sur *Exporter*. + +Une fois l'export réalisé, le fichier sera téléchargeable. + +Export referential and data +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Dans ce mode on exporte le référentiel et les données sélectionnées +de la base de travail. + +Il vous suffit de renseigner le nom du fichier d'export (l'extension +*.echobase*) sera automatiquement rajoutée, de sélectionner les données +à exporter puis de cliquer sur *Exporter*. + +Une fois l'export réalisé, le fichier sera téléchargeable. + + +Export data +~~~~~~~~~~~ + +Dans ce mode on exporte uniquement les données sélectionnées de la base de +travail. + +Il vous suffit de renseigner le nom du fichier d'export (l'extension +*.echobase*) sera automatiquement rajoutée, de sélectionner les données +à exporter puis de cliquer sur *Exporter*. + +Une fois l'export réalisé, le fichier sera téléchargeable. + +Export All +~~~~~~~~~~ + +Dans ce mode, on exporte toute la base de travail. + +Il vous suffit de renseigner le nom du fichier d'export (l'extension +*.echobase*) sera automatiquement rajoutée, puis de cliquer sur *Exporter*. + +Une fois l'export réalisé, le fichier sera téléchargeable. Copied: trunk/src/site/rst/importData.rst (from rev 681, trunk/src/site/rst/imports.rst) =================================================================== --- trunk/src/site/rst/importData.rst (rev 0) +++ trunk/src/site/rst/importData.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,694 @@ +.. - +.. * #%L +.. * EchoBase +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 - 2012 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% +.. - + +================================= +Importerdes données dans EchoBase +================================= + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +======== + +Ce document donne la définition de tous les imports de données. + +Format des colonnes +~~~~~~~~~~~~~~~~~~~ + +- FK(XXX#yyy) désigne une clef étrangère requise (XXX sur la propriété yyy). +- (int) un entier (pas du nullité possible) +- (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 + +Note importantes +~~~~~~~~~~~~~~~~ + +- Le nom des colonnes est sensible à la casse, il faut donc bien respecter les + noms donnés dans cette page. + +- Le contenu des cellules (et aussi les nom de colonnes) peuvent être encapsulés + par des **"**. + + +Voyage / Transit / Transect +=========================== + +Voyage +~~~~~~ + +Colonnes requises +----------------- + +:: + + name;startDate;endDate;startPort;endPort + +Format des colonnes +------------------- + +- name +- startDate (date) +- endDate (date) +- startPort +- endPort + +Exemple +------- + +:: + + name;startDate;endDate;startPort;endPort + PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;Santander;Concarneau + +Transit +~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;description;startTime;endTime;startLocality;endLocality + +Format des colonnes +------------------- + +- voyage FK(voyage#name) +- description +- startTime (date) +- endTime (date) +- startLocality +- endLocality + +Exemple +------- + +:: + + voyage;description;startTime;endTime;startLocality;endLocality + PELGAS2011;PELGAS11CAMP1;2011-04-26 08:00:01.0000;2011-05-08 20:00:00.0000;Santander;La Rochelle + +Transect +~~~~~~~~ + +Colonnes requises +----------------- + +:: + + title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring + +Format des colonnes +------------------- + +- voyage FK(voyage#name) +- vesselName FK(Vessel#name) +- title +- transectAbstract +- stratum +- comment +- dateCreated (date) +- timeCoverageStart (date) +- timeCoverageEnd (date) +- geospatialLonMin (float) +- geospatialLonMax (float) +- geospatialLatMin (float) +- geospatialLatMax (float) +- geospatialVerticalMin (float) +- geospatialVerticalMax (float) +- linestring + +Exemple +------- + +:: + + title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring + Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000";-1.5896666667;43.7055;110;-1.541;43.7606666667;110;"-176453.0000037 4851310.5,-171051 4857434.0000037 + +Operation / OperationMetadataValue / GearMetadataValue +====================================================== + +Operation +~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode + +Format des colonnes +------------------- + +- vesselName FK(Vessel#name) +- gearCode FK(Gear#casinoGearName) +- depthStratumId FK(DepthStratum#id) +- operationId +- midHaulLatitude (float) +- midHaulLongitude (float) +- gearShootingStartTime (date) +- gearShootingEndTime (date) +- gearShootingStartLatitude (float) +- gearShootingEndLatitude (float) +- gearShootingStartLongitude (float) +- gearShootingEndLongitude (float) + +Exemple +------- + +:: + + vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode + THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000";45.4165605;-1.4492292;45.4029733;-1.4860902;"2011-05-05 07:42:19.0000";45.4301477;-1.4123682;"57x52 + +OperationMetadataValue +~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + vesselName;operationId;metadataType;operationMetadataValue + +Format des colonnes +------------------- + +- vesselName FK(Vessel#name) +- operationId FK(Operation#id) +- metadataType FK(OperationMetadata#name) +- operationMetadataValue + +Exemple +------- + +:: + + vesselName;operationId;metadataType;operationMetadataValue + THALASSA II;P0422;MeanWaterDepth";43.42 + +GearMetadataValue +~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + vesselName;operationId;gearCode;metadataType;gearMetadataValue + +Format des colonnes +------------------- + +- vesselName FK(Vessel#name) +- operationId FK(Operation#id) +- metadataType FK(GearMetadata#name) +- gearCode FK(Gear#casinoGearName) +- gearMetadataValue + +Exemple +------- + +:: + + vesselName;operationId;gearCode;metadataType;gearMetadataValue + THALASSA II;P0422;57x52;CableLength";31.6666666666667 + +TotalSample / SubSample / BiometrySample +======================================== + +TotalSample +~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight + +Format des colonnes +------------------- + +- operationId FK(Operation#id) +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory FK(SizeCategory#name) +- sampleWeight (float) +- numberSampled (Integer-NA) +- meanLength (Float-NA) +- meanWeight (Float-NA) +- noPerKg (Float-NA) +- sortedWeight (float) + +Exemple +------- + +:: + + operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight + P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03 + +SubSample +~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round + +Format des colonnes +------------------- + +- operationId FK(Operation#id) +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory FK(SizeCategory#name) +- sexCategory FK(SexCategory#name) +- sampleWeight (float) +- numberSampled (int) +- numberAtLength (float) +- weightAtLength (Float-NA) +- lengthClass + +(colonnes ignorées) subHaul units round + +Exemple +------- + +:: + + operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round + P0372;ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5 + +BiometrySample +~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + operationId;baracoudaCode;numFish;dataLabel;dataValue;name + +Format des colonnes +------------------- + +- operationId FK(Operation#id) +- baracoudaCode FK(Species#baracoudaCode) +- numFish (int) +- name FK(SampleDataType#name) +- dataLabel +- dataValue (Float-NA) + +Exemple +------- + +:: + + operationId;baracoudaCode;numFish;dataLabel;dataValue;name + P5002;ENGR-ENC";9394;NA;-1;"Age + +Acoustic +~~~~~~~~ + +Colonnes requises +----------------- + +:: + + MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality + +Format des colonnes +------------------- + +A faire... + +Exemple +------- + +:: + + MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality + 2011/06/23 10:09:00.0000";NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;"2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000";43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;"variable";1 + +Résultats voyage +================ + +Echotype +~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;echotypeName;depthStratumId;meaning;baracoudaCode + +Format des colonnes +------------------- + +- echotypeName +- meaning +- voyage FK(Voyage#name) +- depthStratumId FK(DepthStratum#id) +- baracoudaCode FK(Species#baracoudaCode) + +Exemple +------- + +:: + + voyage;echotypeName;depthStratumId;meaning;baracoudaCode + PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM + +LengthWeightKey +~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata + +Format des colonnes +------------------- + +- aParameter (float) +- bParameter (float) +- voyage FK(Voyage#name) +- sizeCategory FK(SizeCategory#name) +- baracoudaCode FK(Species#baracoudaCode) +- strata FK(Strata#name) + +Exemple +------- + +:: + + voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata + PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne + +LengthAgeKey +~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;baracoudaCode;age;length;percentAtAge;metadata;strata + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- age (int) +- length (float) +- percentAtAge (float) +- metadata +- strata FK(Strata#name) +- baracoudaCode FK(Species#baracoudaCode) + +Exemple +------- + +:: + + voyage;baracoudaCode;age;length;percentAtAge;metadata;strata + PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne + +Résultats Esdu +============== + +Esdu / Echotype +~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(esdu cell) +- echotype FK(Echotype#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1 + +Esdu / Echotype / Species Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(esdu cell) +- echotype FK(Echotype#name) +- sizeCategory FK(SizeCategory#name) +- baracoudaCode FK(Species#baracoudaCode) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality + PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0";4;0;20;0.05;0;0.00100292822891053;0;0;0;1 + +Esdu / Species / Age Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(esdu cell) +- baracoudaCode FK(Species#baracoudaCode) +- ageCategory +- ageCategoryMeaning +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage + 2011-04-26 13:35:19.0000;ENGR-ENC";3;3377.00492644042;"fish age-group (years)";1;"PELGAS2011 + +Esdu / Species / Size Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(esdu cell) +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory +- sizeCategoryMeaning +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + 2011-04-26 13:35:19.0000;MICR-POU";4;5190.7652880528;1297691.3220132;"mid point of 1 cm size bin";1;"PELGAS2011 + +Region +====== + +Region +~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;cellType;regionEnvCoordinates;surface;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- cellType FK(CellType) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- name +- regionEnvCoordinates +- surface (float) + +Exemple +------- + +:: + + voyage;name;cellType;regionEnvCoordinates;surface;dataQuality + PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1 + +Region Association +~~~~~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;regionName;esduName + +Format des colonnes +------------------- + +- voyage FK(Voyage) +- regionName FK(Cell#name) +- esduName FK(Cell#name) + +Exemple +------- + +:: + + voyage;regionName;esduName + PELGAS2011";1;"2011-05-02 09:36:54.0000 + +Region results +~~~~~~~~~~~~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name FK(Cell#name) +- baracoudaCode FK(Species#baracoudaCode) +- echotype FK(Echotype#name) +- sizeCategory FK(SizeCategory#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) + +Exemple +------- + +:: + + voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality + PELGAS2011;6;CLUP-HAR;0;D2";NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1 + +Map +=== + +Map +~~~ + +Colonnes requises +----------------- + +:: + + voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality + +Format des colonnes +------------------- + +- voyage FK(Voyage#name) +- name +- baracoudaCode FK(Species#baracoudaCode) +- 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 +------- + +:: + + 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 Property changes on: trunk/src/site/rst/importData.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/rst/importDb.rst =================================================================== --- trunk/src/site/rst/importDb.rst 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/rst/importDb.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -21,9 +21,9 @@ .. * #L% .. - -========================== -Import / Export d'une base -========================== +================= +Import d'une base +================= .. contents:: Table des matières :depth: 2 @@ -35,76 +35,8 @@ Abstract -------- -Ce document explique comment importer / exporter des bases au format EchoBase. +Ce document explique comment importer des bases au format EchoBase. -Export EchoBase ---------------- - -EchoBase permet d'export une partie ou l'ensemble d'une base de travial au -format *.echobase* qui est ensuite réimportable dans une autre instance d'EchoBase. - -- Cliquer sur le menu *Exporter une base*. - -- Configurer l'export - -Une fichier au format *.echobase* sera créé, il est ensuite possible de -l'importer sur une autre instance d'EchoBase. - -Il existe plusieurs modes d'export que nous détaillons ci-dessous. - -Export referential -~~~~~~~~~~~~~~~~~~ - -Dans ce mode on exporte uniquement le référentiel de la base de travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - -Export referential and data -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Dans ce mode on exporte le référentiel et les données sélectionnées -de la base de travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, de sélectionner les données -à exporter puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - - -Export data -~~~~~~~~~~~ - -Dans ce mode on exporte uniquement les données sélectionnées de la base de -travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, de sélectionner les données -à exporter puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - -Export All -~~~~~~~~~~ - -Dans ce mode, on exporte toute la base de travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - -Import EchoBase ---------------- - -Tout export de base au format *.echobase* est ensuite réimportable sur n'importe -qu'elle autre instance d'EchoBase. - -TODO Expliquer le fonctionnement de l'import et la politique des collisions... - Import Referential ~~~~~~~~~~~~~~~~~~ Deleted: trunk/src/site/rst/imports.rst =================================================================== --- trunk/src/site/rst/imports.rst 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/rst/imports.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -1,694 +0,0 @@ -.. - -.. * #%L -.. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2011 - 2012 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% -.. - - -======================================= -Liste des colonnes des imports EchoBase -======================================= - -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - -Abstract -======== - -Ce document donne la définition de tous les imports. - -Format des colonnes -~~~~~~~~~~~~~~~~~~~ - -- FK(XXX#yyy) désigne une clef étrangère requise (XXX sur la propriété yyy). -- (int) un entier (pas du nullité possible) -- (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 - -Note importantes -~~~~~~~~~~~~~~~~ - -- Le nom des colonnes est sensible à la casse, il faut donc bien respecter les - noms donnés dans cette page. - -- Le contenu des cellules (et aussi les nom de colonnes) peuvent être encapsulés - par des **"**. - - -Voyage / Transit / Transect -=========================== - -Voyage -~~~~~~ - -Colonnes requises ------------------ - -:: - - name;startDate;endDate;startPort;endPort - -Format des colonnes -------------------- - -- name -- startDate (date) -- endDate (date) -- startPort -- endPort - -Exemple -------- - -:: - - name;startDate;endDate;startPort;endPort - PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;Santander;Concarneau - -Transit -~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;description;startTime;endTime;startLocality;endLocality - -Format des colonnes -------------------- - -- voyage FK(voyage#name) -- description -- startTime (date) -- endTime (date) -- startLocality -- endLocality - -Exemple -------- - -:: - - voyage;description;startTime;endTime;startLocality;endLocality - PELGAS2011;PELGAS11CAMP1;2011-04-26 08:00:01.0000;2011-05-08 20:00:00.0000;Santander;La Rochelle - -Transect -~~~~~~~~ - -Colonnes requises ------------------ - -:: - - title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring - -Format des colonnes -------------------- - -- voyage FK(voyage#name) -- vesselName FK(Vessel#name) -- title -- transectAbstract -- stratum -- comment -- dateCreated (date) -- timeCoverageStart (date) -- timeCoverageEnd (date) -- geospatialLonMin (float) -- geospatialLonMax (float) -- geospatialLatMin (float) -- geospatialLatMax (float) -- geospatialVerticalMin (float) -- geospatialVerticalMax (float) -- linestring - -Exemple -------- - -:: - - title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring - Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000";-1.5896666667;43.7055;110;-1.541;43.7606666667;110;"-176453.0000037 4851310.5,-171051 4857434.0000037 - -Operation / OperationMetadataValue / GearMetadataValue -====================================================== - -Operation -~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode - -Format des colonnes -------------------- - -- vesselName FK(Vessel#name) -- gearCode FK(Gear#casinoGearName) -- depthStratumId FK(DepthStratum#id) -- operationId -- midHaulLatitude (float) -- midHaulLongitude (float) -- gearShootingStartTime (date) -- gearShootingEndTime (date) -- gearShootingStartLatitude (float) -- gearShootingEndLatitude (float) -- gearShootingStartLongitude (float) -- gearShootingEndLongitude (float) - -Exemple -------- - -:: - - vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode - THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000";45.4165605;-1.4492292;45.4029733;-1.4860902;"2011-05-05 07:42:19.0000";45.4301477;-1.4123682;"57x52 - -OperationMetadataValue -~~~~~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - vesselName;operationId;metadataType;operationMetadataValue - -Format des colonnes -------------------- - -- vesselName FK(Vessel#name) -- operationId FK(Operation#id) -- metadataType FK(OperationMetadata#name) -- operationMetadataValue - -Exemple -------- - -:: - - vesselName;operationId;metadataType;operationMetadataValue - THALASSA II;P0422;MeanWaterDepth";43.42 - -GearMetadataValue -~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - vesselName;operationId;gearCode;metadataType;gearMetadataValue - -Format des colonnes -------------------- - -- vesselName FK(Vessel#name) -- operationId FK(Operation#id) -- metadataType FK(GearMetadata#name) -- gearCode FK(Gear#casinoGearName) -- gearMetadataValue - -Exemple -------- - -:: - - vesselName;operationId;gearCode;metadataType;gearMetadataValue - THALASSA II;P0422;57x52;CableLength";31.6666666666667 - -TotalSample / SubSample / BiometrySample -======================================== - -TotalSample -~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight - -Format des colonnes -------------------- - -- operationId FK(Operation#id) -- baracoudaCode FK(Species#baracoudaCode) -- sizeCategory FK(SizeCategory#name) -- sampleWeight (float) -- numberSampled (Integer-NA) -- meanLength (Float-NA) -- meanWeight (Float-NA) -- noPerKg (Float-NA) -- sortedWeight (float) - -Exemple -------- - -:: - - operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight - P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03 - -SubSample -~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round - -Format des colonnes -------------------- - -- operationId FK(Operation#id) -- baracoudaCode FK(Species#baracoudaCode) -- sizeCategory FK(SizeCategory#name) -- sexCategory FK(SexCategory#name) -- sampleWeight (float) -- numberSampled (int) -- numberAtLength (float) -- weightAtLength (Float-NA) -- lengthClass - -(colonnes ignorées) subHaul units round - -Exemple -------- - -:: - - operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round - P0372;ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5 - -BiometrySample -~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - operationId;baracoudaCode;numFish;dataLabel;dataValue;name - -Format des colonnes -------------------- - -- operationId FK(Operation#id) -- baracoudaCode FK(Species#baracoudaCode) -- numFish (int) -- name FK(SampleDataType#name) -- dataLabel -- dataValue (Float-NA) - -Exemple -------- - -:: - - operationId;baracoudaCode;numFish;dataLabel;dataValue;name - P5002;ENGR-ENC";9394;NA;-1;"Age - -Acoustic -~~~~~~~~ - -Colonnes requises ------------------ - -:: - - MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality - -Format des colonnes -------------------- - -A faire... - -Exemple -------- - -:: - - MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality - 2011/06/23 10:09:00.0000";NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;"2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000";43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;"variable";1 - -Résultats voyage -================ - -Echotype -~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;echotypeName;depthStratumId;meaning;baracoudaCode - -Format des colonnes -------------------- - -- echotypeName -- meaning -- voyage FK(Voyage#name) -- depthStratumId FK(DepthStratum#id) -- baracoudaCode FK(Species#baracoudaCode) - -Exemple -------- - -:: - - voyage;echotypeName;depthStratumId;meaning;baracoudaCode - PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM - -LengthWeightKey -~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata - -Format des colonnes -------------------- - -- aParameter (float) -- bParameter (float) -- voyage FK(Voyage#name) -- sizeCategory FK(SizeCategory#name) -- baracoudaCode FK(Species#baracoudaCode) -- strata FK(Strata#name) - -Exemple -------- - -:: - - voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata - PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne - -LengthAgeKey -~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;baracoudaCode;age;length;percentAtAge;metadata;strata - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- age (int) -- length (float) -- percentAtAge (float) -- metadata -- strata FK(Strata#name) -- baracoudaCode FK(Species#baracoudaCode) - -Exemple -------- - -:: - - voyage;baracoudaCode;age;length;percentAtAge;metadata;strata - PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne - -Résultats Esdu -============== - -Esdu / Echotype -~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1 - -Esdu / Echotype / Species Category -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- sizeCategory FK(SizeCategory#name) -- baracoudaCode FK(Species#baracoudaCode) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0";4;0;20;0.05;0;0.00100292822891053;0;0;0;1 - -Esdu / Species / Age Category -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(esdu cell) -- baracoudaCode FK(Species#baracoudaCode) -- ageCategory -- ageCategoryMeaning -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;ENGR-ENC";3;3377.00492644042;"fish age-group (years)";1;"PELGAS2011 - -Esdu / Species / Size Category -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(esdu cell) -- baracoudaCode FK(Species#baracoudaCode) -- sizeCategory -- sizeCategoryMeaning -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;MICR-POU";4;5190.7652880528;1297691.3220132;"mid point of 1 cm size bin";1;"PELGAS2011 - -Region -====== - -Region -~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;cellType;regionEnvCoordinates;surface;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- cellType FK(CellType) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- name -- regionEnvCoordinates -- surface (float) - -Exemple -------- - -:: - - voyage;name;cellType;regionEnvCoordinates;surface;dataQuality - PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1 - -Region Association -~~~~~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;regionName;esduName - -Format des colonnes -------------------- - -- voyage FK(Voyage) -- regionName FK(Cell#name) -- esduName FK(Cell#name) - -Exemple -------- - -:: - - voyage;regionName;esduName - PELGAS2011";1;"2011-05-02 09:36:54.0000 - -Region results -~~~~~~~~~~~~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name FK(Cell#name) -- baracoudaCode FK(Species#baracoudaCode) -- echotype FK(Echotype#name) -- sizeCategory FK(SizeCategory#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) - -Exemple -------- - -:: - - voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality - PELGAS2011;6;CLUP-HAR;0;D2";NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1 - -Map -=== - -Map -~~~ - -Colonnes requises ------------------ - -:: - - voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality - -Format des colonnes -------------------- - -- voyage FK(Voyage#name) -- name -- baracoudaCode FK(Species#baracoudaCode) -- 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 -------- - -:: - - voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality - PELGAS2011;-6 43.5 0;ENGR-ENC";0;;-6;43.5;0;0.25;0.25;0;0;1 Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/rst/model.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -38,8 +38,13 @@ On donne ici des explications sur le modèle. -Le modèle conçu sous argoUML est téléchargeable `ici`_ . +Téléchargement +============== +- `Télécharger le modèle au format argoUML`_. + +- `Télécharger le modèle au format freeMind`_. + Modèle du référentiel ===================== @@ -74,7 +79,8 @@ - `Sous modèle pêcherie`_ -.. _ici: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-entities/src/main... +.. _Télécharger le modèle au format argoUML: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-entities/src/main... +.. _Télécharger le modèle au format freeMind: http://svn.forge.codelutin.com/svn/echobase/trunk/src/doc/model/EchoBase_str... .. _Vue générale du référentiel: model/referenceAll.png .. _Référentiel AcousticInstrument: model/referenceAcousticInstrument.png Added: trunk/src/site/rst/modifyData.rst =================================================================== --- trunk/src/site/rst/modifyData.rst (rev 0) +++ trunk/src/site/rst/modifyData.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,41 @@ +.. - +.. * #%L +.. * EchoBase +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 - 2012 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% +.. - + +==================== +modifier des données +==================== + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +======== + +Ce document explique comment modifier les données depuis EchoBase. + +TODO Property changes on: trunk/src/site/rst/modifyData.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/src/site/rst/removeData.rst (from rev 681, trunk/src/site/rst/removeimports.rst) =================================================================== --- trunk/src/site/rst/removeData.rst (rev 0) +++ trunk/src/site/rst/removeData.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -0,0 +1,237 @@ +.. - +.. * #%L +.. * EchoBase +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 - 2012 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% +.. - + +======================= +Suppression des imports +======================= + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Abstract +-------- + +Ce document décrit ce qui se passe lors de la suppression d'un import. + +Import Voyage complêt +--------------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Le voyage en question et tout ce qui y est rattaché (Transit,...) et aussi : + +- category (utilise EchoType) +- echotype + +Question: + Les echotypes sont-ils uniquement lié au voyage ? Si oui on peut utiliser + une composition qui évitent de devoir supprimer à la main les echotypes. + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué suite à cet import, à savoir : + +- import Transect +- import Operation +- import Catches +- import Acoustic +- import Résultats Voyage +- import Résultats Esdu +- import Region +- import Map + + +Import Voyage / Transit / Transect +---------------------------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Le voyage en question et tout ce qui y est rattaché (Transit,...) et aussi : + +- category (utilise EchoType) +- echotype + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué suite à cet import, à savoir : + +- import Transect +- import Operation +- import Catches +- import Acoustic +- import Résultats Voyage +- import Résultats Esdu +- import Region +- import Map + +Import Transect +--------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Le transect en question et tout ce qui y est rattaché, ainsi que les *postCell* +et leur résultats. + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué suite à cet import, à savoir : + +- import Operation (*) +- import Catches (*) +- import Acoustic (*) +- import Résultats Esdu (**) +- import Region (**) +- import Map (**) + +(*) tous ceux sur la branche du transect +(**) tous ceux du voyage + +Import Operation +---------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +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 : + +- import Catches (*) + +(*) tous ceux sur la branche des opérations + +Import Catches +-------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les échantillons captures (Sample) en question et tout ce qui y est rattaché +(SampleData). + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. + +Import Acoustic +--------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les données acoustiques et tout ce qui y est rattaché (DataAcquisition, Cell, Result), +ainsi que les *postCell* et leur résultats. + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué sur ce voyage, à savoir : + +- import Résultats Esdu (*) +- import Region (*) +- import Map (*) + +(*) tous ceux du voyage + +Import Résultats voyage +----------------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les données rattachés à un voyage après-coup, à savoir : + +- echotype +- lengthageKey +- lengthWeightKey + +Mais aussi tous les résultats (car il peuvent dépendre des données précédentes). + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Seront supprimés de la table des imports les imports suivants qui aurait pu +être effectué suite à cet import, à savoir : + +- import Résultats Esdu (*) +- import Region (*) +- import Map (*) + +(*) tous ceux du voyage + +Immort Résultats Esdu +--------------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les résultats attachés aux cellules de type *ESDU*. + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. + +Import Region +------------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les postCells de type *Region* et tout ce qui y est rattaché (Result) + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. + +Import Map +---------- + +Données à supprimer +~~~~~~~~~~~~~~~~~~~ + +Les postCells de type *Map* et tout ce qui y est rattaché (Result) + +Imports à retirer +~~~~~~~~~~~~~~~~~ + +Aucun sous import possible à retirer. \ No newline at end of file Property changes on: trunk/src/site/rst/removeData.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/src/site/rst/removeimports.rst =================================================================== --- trunk/src/site/rst/removeimports.rst 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/rst/removeimports.rst 2012-09-22 13:46:36 UTC (rev 686) @@ -1,237 +0,0 @@ -.. - -.. * #%L -.. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2011 - 2012 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% -.. - - -======================= -Suppression des imports -======================= - -.. contents:: Table des matières - :depth: 2 - -.. sectnum:: - :start: 1 - :depth: 2 - -Abstract --------- - -Ce document décrit ce qui se passe lors de la suppression d'un import. - -Import Voyage complêt ---------------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Le voyage en question et tout ce qui y est rattaché (Transit,...) et aussi : - -- category (utilise EchoType) -- echotype - -Question: - Les echotypes sont-ils uniquement lié au voyage ? Si oui on peut utiliser - une composition qui évitent de devoir supprimer à la main les echotypes. - -Seront supprimés de la table des imports les imports suivants qui aurait pu -être effectué suite à cet import, à savoir : - -- import Transect -- import Operation -- import Catches -- import Acoustic -- import Résultats Voyage -- import Résultats Esdu -- import Region -- import Map - - -Import Voyage / Transit / Transect ----------------------------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Le voyage en question et tout ce qui y est rattaché (Transit,...) et aussi : - -- category (utilise EchoType) -- echotype - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Seront supprimés de la table des imports les imports suivants qui aurait pu -être effectué suite à cet import, à savoir : - -- import Transect -- import Operation -- import Catches -- import Acoustic -- import Résultats Voyage -- import Résultats Esdu -- import Region -- import Map - -Import Transect ---------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Le transect en question et tout ce qui y est rattaché, ainsi que les *postCell* -et leur résultats. - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Seront supprimés de la table des imports les imports suivants qui aurait pu -être effectué suite à cet import, à savoir : - -- import Operation (*) -- import Catches (*) -- import Acoustic (*) -- import Résultats Esdu (**) -- import Region (**) -- import Map (**) - -(*) tous ceux sur la branche du transect -(**) tous ceux du voyage - -Import Operation ----------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -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 : - -- import Catches (*) - -(*) tous ceux sur la branche des opérations - -Import Catches --------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les échantillons captures (Sample) en question et tout ce qui y est rattaché -(SampleData). - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Aucun sous import possible à retirer. - -Import Acoustic ---------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les données acoustiques et tout ce qui y est rattaché (DataAcquisition, Cell, Result), -ainsi que les *postCell* et leur résultats. - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Seront supprimés de la table des imports les imports suivants qui aurait pu -être effectué sur ce voyage, à savoir : - -- import Résultats Esdu (*) -- import Region (*) -- import Map (*) - -(*) tous ceux du voyage - -Import Résultats voyage ------------------------ - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les données rattachés à un voyage après-coup, à savoir : - -- echotype -- lengthageKey -- lengthWeightKey - -Mais aussi tous les résultats (car il peuvent dépendre des données précédentes). - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Seront supprimés de la table des imports les imports suivants qui aurait pu -être effectué suite à cet import, à savoir : - -- import Résultats Esdu (*) -- import Region (*) -- import Map (*) - -(*) tous ceux du voyage - -Immort Résultats Esdu ---------------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les résultats attachés aux cellules de type *ESDU*. - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Aucun sous import possible à retirer. - -Import Region -------------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les postCells de type *Region* et tout ce qui y est rattaché (Result) - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Aucun sous import possible à retirer. - -Import Map ----------- - -Données à supprimer -~~~~~~~~~~~~~~~~~~~ - -Les postCells de type *Map* et tout ce qui y est rattaché (Result) - -Imports à retirer -~~~~~~~~~~~~~~~~~ - -Aucun sous import possible à retirer. \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-22 12:28:11 UTC (rev 685) +++ trunk/src/site/site_fr.xml 2012-09-22 13:46:36 UTC (rev 686) @@ -48,7 +48,7 @@ </bannerLeft> <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right" /> + <version position="right"/> <poweredBy> <logo href="http://maven.apache.org" name="Maven" @@ -98,15 +98,29 @@ <item name="English Version" href="./en/index.html"/> </menu> + <menu name="Administration"> + <item name="Téléchargement" + href="http://forge.codelutin.com/projects/echobase/files"/> + <item name="Installation" href="install.html"/> + </menu> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> - <item name="Installation" href="install.html"/> + <item name="Utilisation" href="usage.html"/> + + <menu name="Import/Export Base"> + <item name="Importer" href="importDb.html"/> + <item name="Exporter" href="exportDb.html"/> + </menu> + + <menu name="Gestion données"> + <item name="Importer" href="importData.html"/> + <item name="Modifier" href="modifyData.html"/> + <item name="Exporter" href="exportData.html"/> + <item name="Supprimer" href="removeData.html"/> + </menu> + <item name="Application embarquée" href="embedded.html"/> - <item name="Imports" href="imports.html"/> - <item name="Import/Export au format EchoBase" href="importDb.html"/> - <item name="Suppression des imports" href="removeimports.html"/> - <item name="Téléchargement" - href="http://forge.codelutin.com/projects/echobase/files"/> </menu> <menu name="Dev"> @@ -116,8 +130,6 @@ <item name="Historique des versions" href="changes-report.html"/> </menu> - - <menu ref="reports"/> <footer>