r336 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-entities/src/main/java/fr/ifremer/echobase/entities/data echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta echobase-entities/src/main/java/fr/ifremer/echobase/entities/references echobase-entities/src/main/xmi echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/csv ec
Author: tchemit Date: 2012-03-08 18:07:22 +0100 (Thu, 08 Mar 2012) New Revision: 336 Url: http://forge.codelutin.com/repositories/revision/echobase/336 Log: - Add missing references - Move echotype, lengthAgeKey and lengthWeightKey to data package - Link strata to DepthStratum Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/EchotypeDAOImpl.java Removed: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/EchotypeDAOImpl.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/I18nAble.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/ColumnMeta.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java trunk/echobase-entities/src/main/xmi/echobase.zargo trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ResultsImportServiceTest.java trunk/echobase-tools/pom.xml trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthAgeKeyLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesCategoryLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/StrataLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataTypeLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/EchotypeLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LengthAgeKeyLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SpeciesLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderIT.java trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv trunk/echobase-tools/src/test/resources/csv/new/input-DataType.csv trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv trunk/echobase-tools/src/test/resources/csv/new/input-GearMetadata.csv trunk/echobase-tools/src/test/resources/csv/new/input-Species.csv trunk/src/doc/reunions/reunion-2012-03-06.txt Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2012-03-08 17:07:22 UTC (rev 336) @@ -51,8 +51,8 @@ "URL du site de l'application", "", URL.class), CSV_SEPARATOR("csv.separator", - "Caractère de séparation pour les fichiers csv", - ";", char.class), + "Caractère de séparation pour les fichiers csv", + ";", char.class), WAR_DIRECTORY("war.directory", "Répertoire où est stoqué le war", "${data.directory}/war", File.class), Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-03-08 17:07:22 UTC (rev 336) @@ -29,7 +29,10 @@ import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.DataAcquisition; import fr.ifremer.echobase.entities.data.DataProcessing; +import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.GearMetadataValue; +import fr.ifremer.echobase.entities.data.LengthAgeKey; +import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.entities.data.Operation; import fr.ifremer.echobase.entities.data.OperationMetadataValue; import fr.ifremer.echobase.entities.data.Result; @@ -53,15 +56,12 @@ import fr.ifremer.echobase.entities.references.DataQuality; import fr.ifremer.echobase.entities.references.DataType; import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.Echotype; import fr.ifremer.echobase.entities.references.EchotypeCategory; import fr.ifremer.echobase.entities.references.Gear; import fr.ifremer.echobase.entities.references.GearCharacteristic; import fr.ifremer.echobase.entities.references.GearCharacteristicValue; import fr.ifremer.echobase.entities.references.GearMetadata; import fr.ifremer.echobase.entities.references.Impacte; -import fr.ifremer.echobase.entities.references.LengthAgeKey; -import fr.ifremer.echobase.entities.references.LengthWeightKey; import fr.ifremer.echobase.entities.references.MeasureType; import fr.ifremer.echobase.entities.references.MeasurementMetadata; import fr.ifremer.echobase.entities.references.Mission; Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java 2012-03-08 17:07:22 UTC (rev 336) @@ -24,8 +24,8 @@ package fr.ifremer.echobase; import com.google.common.base.Predicate; +import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.references.AcousticInstrument; -import fr.ifremer.echobase.entities.references.Echotype; import fr.ifremer.echobase.entities.references.SizeCategory; /** Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/I18nAble.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/I18nAble.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/I18nAble.java 2012-03-08 17:07:22 UTC (rev 336) @@ -30,6 +30,6 @@ * @since 0.3 */ public interface I18nAble { - + String getI18nKey(); } Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-03-08 17:07:22 UTC (rev 336) @@ -113,6 +113,7 @@ result.add(EchoBaseEntityEnum.ReferenceDatumType); result.add(EchoBaseEntityEnum.VesselType); result.add(EchoBaseEntityEnum.EchotypeCategory); + result.add(EchoBaseEntityEnum.DepthStratum); result.add(EchoBaseEntityEnum.Strata); result.add(EchoBaseEntityEnum.CellMethod); result.add(EchoBaseEntityEnum.AcousticInstrument); @@ -121,7 +122,6 @@ result.add(EchoBaseEntityEnum.Species); result.add(EchoBaseEntityEnum.GearCharacteristic); result.add(EchoBaseEntityEnum.ReferenceDatum); - result.add(EchoBaseEntityEnum.DepthStratum); result.add(EchoBaseEntityEnum.Category); result.add(EchoBaseEntityEnum.ReferencingMethod); result.add(EchoBaseEntityEnum.GearCharacteristicValue); @@ -131,10 +131,7 @@ result.add(EchoBaseEntityEnum.SampleDataType); result.add(EchoBaseEntityEnum.SampleType); result.add(EchoBaseEntityEnum.Vessel); -// result.add(EchoBaseEntityEnum.Echotype); result.add(EchoBaseEntityEnum.DataMetadata); -// result.add(EchoBaseEntityEnum.LengthAgeKey); -// result.add(EchoBaseEntityEnum.LengthWeightKey); result.add(EchoBaseEntityEnum.CellType); result.add(EchoBaseEntityEnum.Impacte); result.add(EchoBaseEntityEnum.Mission); @@ -158,7 +155,6 @@ List<EchoBaseEntityEnum> result = Lists.newLinkedList(); // with no dep - result.add(EchoBaseEntityEnum.Strata); result.add(EchoBaseEntityEnum.SexCategory); result.add(EchoBaseEntityEnum.AgeCategory); result.add(EchoBaseEntityEnum.SizeCategory); @@ -185,6 +181,7 @@ result.add(EchoBaseEntityEnum.ReferencingMethod); // with deps + result.add(EchoBaseEntityEnum.Strata); result.add(EchoBaseEntityEnum.AcousticInstrument); result.add(EchoBaseEntityEnum.Vessel); result.add(EchoBaseEntityEnum.ReferenceDatum); @@ -192,12 +189,9 @@ result.add(EchoBaseEntityEnum.GearMetadata); result.add(EchoBaseEntityEnum.GearCharacteristicValue); result.add(EchoBaseEntityEnum.Gear); -// result.add(EchoBaseEntityEnum.LengthAgeKey); result.add(EchoBaseEntityEnum.SpeciesCategory); -// result.add(EchoBaseEntityEnum.LengthWeightKey); result.add(EchoBaseEntityEnum.TSParameters); -// result.add(EchoBaseEntityEnum.Echotype); result.add(EchoBaseEntityEnum.DataMetadata); result.add(EchoBaseEntityEnum.Category); result.add(EchoBaseEntityEnum.CategoryRef); @@ -218,9 +212,9 @@ } protected static void addEntries(DbMeta dbMeta, - List<MetaFilenameAware> entities, - List<MetaFilenameAware> associations, - EchoBaseEntityEnum[] types) { + List<MetaFilenameAware> entities, + List<MetaFilenameAware> associations, + EchoBaseEntityEnum[] types) { for (EchoBaseEntityEnum type : types) { TableMeta tableMeta = getTableMeta(dbMeta, type); Copied: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/EchotypeDAOImpl.java (from rev 334, trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/EchotypeDAOImpl.java) =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/EchotypeDAOImpl.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/EchotypeDAOImpl.java 2012-03-08 17:07:22 UTC (rev 336) @@ -0,0 +1,52 @@ +/* + * #%L + * EchoBase :: Entities + * + * $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% + */ +package fr.ifremer.echobase.entities.data; + +import fr.ifremer.echobase.entities.references.Species; +import org.nuiton.topia.TopiaException; + +import java.util.List; + +/** + * User {@link EchotypeDAO} implementation. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class EchotypeDAOImpl<E extends Echotype> extends EchotypeDAOAbstract<E> { + + @Override + public Echotype findByIdAndSpecies(Integer id, + Species species) throws TopiaException { + List<E> allById = findAllById(id); + Echotype result = null; + for (E echotype : allById) { + if (echotype.getSpecies().contains(species)) { + result = echotype; + break; + } + } + return result; + } +} Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/EchotypeDAOImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/ColumnMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/ColumnMeta.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/ColumnMeta.java 2012-03-08 17:07:22 UTC (rev 336) @@ -24,7 +24,6 @@ package fr.ifremer.echobase.entities.meta; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.ObjectUtil; import java.io.Serializable; import java.util.Date; Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2012-03-08 17:07:22 UTC (rev 336) @@ -80,7 +80,7 @@ @Override public String getFilename() { - return source.name()+".csv"; + return source.name() + ".csv"; } @Override Deleted: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/EchotypeDAOImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/EchotypeDAOImpl.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/EchotypeDAOImpl.java 2012-03-08 17:07:22 UTC (rev 336) @@ -1,50 +0,0 @@ -/* - * #%L - * EchoBase :: Entities - * - * $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% - */ -package fr.ifremer.echobase.entities.references; - -import org.nuiton.topia.TopiaException; - -import java.util.List; - -/** - * User {@link EchotypeDAO} implementation. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.2 - */ -public class EchotypeDAOImpl<E extends Echotype> extends EchotypeDAOAbstract<E> { - - @Override - public Echotype findByIdAndSpecies(Integer id, Species species) throws TopiaException { - List<E> allById = findAllById(id); - Echotype result = null; - for (E echotype : allById) { - if (echotype.getSpecies().contains(species)) { - result = echotype; - break; - } - } - return result; - } -} Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java 2012-03-08 17:07:22 UTC (rev 336) @@ -36,10 +36,10 @@ import fr.ifremer.echobase.entities.data.CellDAO; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.Echotype; -import fr.ifremer.echobase.entities.references.LengthAgeKey; -import fr.ifremer.echobase.entities.references.LengthWeightKey; -import fr.ifremer.echobase.entities.references.LengthWeightKeyDAO; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.LengthAgeKey; +import fr.ifremer.echobase.entities.data.LengthWeightKey; +import fr.ifremer.echobase.entities.data.LengthWeightKeyDAO; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.SpeciesCategory; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java 2012-03-08 17:07:22 UTC (rev 336) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.Echotype; +import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.references.Species; import java.util.Map; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java 2012-03-08 17:07:22 UTC (rev 336) @@ -25,8 +25,8 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.Echotype; -import fr.ifremer.echobase.entities.references.EchotypeImpl; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.EchotypeImpl; import fr.ifremer.echobase.entities.references.Species; import java.io.Serializable; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java 2012-03-08 17:07:22 UTC (rev 336) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services.csv; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.LengthAgeKey; +import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.Strata; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java 2012-03-08 17:07:22 UTC (rev 336) @@ -24,8 +24,8 @@ package fr.ifremer.echobase.services.csv; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.LengthAgeKey; -import fr.ifremer.echobase.entities.references.LengthAgeKeyImpl; +import fr.ifremer.echobase.entities.data.LengthAgeKey; +import fr.ifremer.echobase.entities.data.LengthAgeKeyImpl; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.Strata; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java 2012-03-08 17:07:22 UTC (rev 336) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services.csv; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.LengthWeightKey; +import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java 2012-03-08 17:07:22 UTC (rev 336) @@ -24,8 +24,8 @@ package fr.ifremer.echobase.services.csv; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.LengthWeightKey; -import fr.ifremer.echobase.entities.references.LengthWeightKeyImpl; +import fr.ifremer.echobase.entities.data.LengthWeightKey; +import fr.ifremer.echobase.entities.data.LengthWeightKeyImpl; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ResultsImportServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ResultsImportServiceTest.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ResultsImportServiceTest.java 2012-03-08 17:07:22 UTC (rev 336) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.services; -import fr.ifremer.echobase.entities.references.Echotype; -import fr.ifremer.echobase.entities.references.LengthAgeKey; -import fr.ifremer.echobase.entities.references.LengthWeightKey; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.LengthAgeKey; +import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; import fr.ifremer.echobase.services.configurations.ResultsImportMode; import fr.ifremer.echobase.services.csv.CsvFileImportResult; Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/pom.xml 2012-03-08 17:07:22 UTC (rev 336) @@ -196,14 +196,14 @@ <profile> <activation> <file> - <exists>src/test/private/echobase</exists> + <exists>src/test/private/echobase-2012-03-01</exists> </file> </activation> <id>echobase-csv-inputs</id> <build> <testResources> <testResource> - <directory>src/test/private/echobase</directory> + <directory>src/test/private/echobase-2012-03-01</directory> <includes> <include>**/*.csv</include> </includes> Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java 2012-03-08 17:07:22 UTC (rev 336) @@ -37,7 +37,7 @@ public class DepthStratumLoader extends EntityLoader<DepthStratum> { public DepthStratumLoader() { - super(DepthStratum.class, FileType.BARACOUDA, FileType.NEW); + super(DepthStratum.class, FileType.NEW); } @Override Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-03-08 17:07:22 UTC (rev 336) @@ -26,10 +26,10 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.Echotype; import fr.ifremer.echobase.entities.references.EchotypeCategory; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.services.DbEditorService; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthAgeKeyLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthAgeKeyLoader.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthAgeKeyLoader.java 2012-03-08 17:07:22 UTC (rev 336) @@ -27,8 +27,8 @@ import com.healthmarketscience.jackcess.Database; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.LengthAgeKey; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.logging.Log; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoader.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoader.java 2012-03-08 17:07:22 UTC (rev 336) @@ -27,8 +27,8 @@ import com.healthmarketscience.jackcess.Database; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.LengthWeightKey; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.SpeciesCategory; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java 2012-03-08 17:07:22 UTC (rev 336) @@ -41,7 +41,7 @@ public class ReferenceDatumLoader extends EntityLoader<ReferenceDatum> { public ReferenceDatumLoader() { - super(ReferenceDatum.class, FileType.BARACOUDA, FileType.NEW); + super(ReferenceDatum.class, FileType.NEW); } @Override Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesCategoryLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesCategoryLoader.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesCategoryLoader.java 2012-03-08 17:07:22 UTC (rev 336) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.healthmarketscience.jackcess.Database; import fr.ifremer.echobase.EchoBaseFunctions; -import fr.ifremer.echobase.entities.references.LengthWeightKey; +import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.entities.references.SexCategory; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/StrataLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/StrataLoader.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/StrataLoader.java 2012-03-08 17:07:22 UTC (rev 336) @@ -23,16 +23,18 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.entities.references.DepthStratum; import fr.ifremer.echobase.entities.references.Strata; import fr.ifremer.echobase.services.csv.CsvModelUtil; import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; +import java.util.List; + /** * Loader of {@link Strata}. - * <p/> - * TODO Import it. * * @author tchemit <chemit@codelutin.com> * @since 0.2 @@ -46,6 +48,8 @@ @Override protected EntityCsvModel<Strata> createCsvImportModel(TableMeta meta) { + List<DepthStratum> depthStratums = getEntities(DepthStratum.class); + EntityCsvModel<Strata> model = EntityCsvModel.newModel( getCsvSeparator(), meta @@ -55,8 +59,8 @@ model.newMandatoryColumn(Strata.PROPERTY_MIN_LATITUDE, CsvModelUtil.PRIMITIVE_FLOAT); model.newMandatoryColumn(Strata.PROPERTY_MAX_LONGITUDE, CsvModelUtil.PRIMITIVE_FLOAT); model.newMandatoryColumn(Strata.PROPERTY_MIN_LONGITUDE, CsvModelUtil.PRIMITIVE_FLOAT); - model.newMandatoryColumn(Strata.PROPERTY_DEPTH_STRATUM); model.newMandatoryColumn(Strata.PROPERTY_SEAFLOOR_SUBSTRATE); + model.addForeignKeyForImport(Strata.PROPERTY_DEPTH_STRATUM, Strata.PROPERTY_DEPTH_STRATUM, DepthStratum.class, depthStratums, EchoBaseFunctions.DEPTH_STRATUM_ID); return model; } } \ No newline at end of file Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java 2012-03-08 17:07:22 UTC (rev 336) @@ -30,12 +30,12 @@ import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.EchotypeDAO; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.AreaOfOperation; -import fr.ifremer.echobase.entities.references.Echotype; -import fr.ifremer.echobase.entities.references.EchotypeDAO; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.services.csv.CsvModelUtil; Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -41,7 +41,8 @@ protected File exportdir; - static final String date = new SimpleDateFormat("dd-MM-yyyy").format(new Date()); + static final String date = + new SimpleDateFormat("dd-MM-yyyy").format(new Date()); @Test public void createEchoBaseLegacyDataDb() throws Exception { Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -59,7 +59,7 @@ if (!msAccessFile.exists()) { if (log.isWarnEnabled()) { log.warn("Could not find " + msAccessFile + - ", the test will be skip."); + ", the test will be skip."); } } Assume.assumeTrue(msAccessFile.exists()); Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-03-08 17:07:22 UTC (rev 336) @@ -56,6 +56,9 @@ protected static final long timestamp = System.currentTimeMillis(); + /** La version du jeux de données utilisé. */ + public static final String ECHOBASE_CSV_VERSION = "2012-03-01"; + public static File getBasedir() { if (basedir == null) { String tmp = System.getProperty("basedir"); @@ -79,7 +82,8 @@ public static File getCsvResourceDirectory() { File basedir = getBasedir(); - File sourceDir = FileUtil.getFileFromFQN(basedir, "src.test.private.echobase.csv"); + File sourceDir = FileUtil.getFileFromFQN( + basedir, "src.test.private.echobase-" + ECHOBASE_CSV_VERSION + ".csv"); return sourceDir; } Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -99,7 +99,7 @@ if (!msAccessFile.exists()) { if (log.isWarnEnabled()) { log.warn("Could not find " + msAccessFile + - ", the test will be skip."); + ", the test will be skip."); } } Assume.assumeTrue(msAccessFile.exists()); @@ -206,7 +206,7 @@ } protected void loadDependencies(MetaFilenameAware meta, - Set<MetaFilenameAware> dones) throws IOException, TopiaException { + Set<MetaFilenameAware> dones) throws IOException, TopiaException { // mark it as load (to prevent reloading of it twice) @@ -330,7 +330,7 @@ } } Preconditions.checkNotNull(result, "Could not find EntityLoader for " + - entityClass.getName()); + entityClass.getName()); return result; } Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -214,7 +214,9 @@ private static class ToFileFromMeta implements Function<File, File> { private MetaFilenameAware meta; + private FileType fileType; + private CellLoader loader; public ToFileFromMeta(CellLoader loader, MetaFilenameAware meta) { Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -35,11 +35,11 @@ public class DataMetadataLoaderIT extends AbstractLoaderIT<DataMetadata, DataMetadataLoader> { public DataMetadataLoaderIT() { - super(DataMetadataLoader.class, 34, 28); + super(DataMetadataLoader.class, 35, 28); } @Test - public void testGenerateNewEntities() throws Exception { + public void testGenerateNewEntities() throws Exception { generateNewEntities(); } Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataTypeLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataTypeLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataTypeLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -35,7 +35,7 @@ public class DataTypeLoaderIT extends AbstractLoaderIT<DataType, DataTypeLoader> { public DataTypeLoaderIT() { - super(DataTypeLoader.class, 15, 0); + super(DataTypeLoader.class, 16, 0); } @Test Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/EchotypeLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/EchotypeLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/EchotypeLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.tools.loaders; -import fr.ifremer.echobase.entities.references.Echotype; +import fr.ifremer.echobase.entities.data.Echotype; import org.junit.Test; /** Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -35,7 +35,7 @@ public class GearMetadataLoaderIT extends AbstractLoaderIT<GearMetadata, GearMetadataLoader> { public GearMetadataLoaderIT() { - super(GearMetadataLoader.class, 3, 0); + super(GearMetadataLoader.class, 7, 0); } @Test Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LengthAgeKeyLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LengthAgeKeyLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LengthAgeKeyLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.tools.loaders; -import fr.ifremer.echobase.entities.references.LengthAgeKey; +import fr.ifremer.echobase.entities.data.LengthAgeKey; import org.junit.Test; /** Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.tools.loaders; -import fr.ifremer.echobase.entities.references.LengthWeightKey; +import fr.ifremer.echobase.entities.data.LengthWeightKey; import org.junit.Test; /** Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -35,7 +35,7 @@ public class SampleLoaderIT extends AbstractLoaderIT<Sample, SampleLoader> { public SampleLoaderIT() { - super(SampleLoader.class, 0,335110); + super(SampleLoader.class, 0, 335110); } @Test Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SpeciesLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SpeciesLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SpeciesLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -35,7 +35,7 @@ public class SpeciesLoaderIT extends AbstractLoaderIT<Species, SpeciesLoader> { public SpeciesLoaderIT() { - super(SpeciesLoader.class, 217, 0); + super(SpeciesLoader.class, 220, 0); } @Test Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderIT.java 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderIT.java 2012-03-08 17:07:22 UTC (rev 336) @@ -24,11 +24,11 @@ package fr.ifremer.echobase.tools.loaders; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.MetaFilenameAware; import fr.ifremer.echobase.entities.meta.TableMeta; -import fr.ifremer.echobase.entities.references.Echotype; import fr.ifremer.echobase.tools.FileType; import org.junit.Assert; import org.junit.Test; Modified: trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2012-03-08 17:07:22 UTC (rev 336) @@ -1,35 +1,36 @@ -DataMetadataID;DataTypeID;LongName;StandardName;Units;ReferenceDatumID;Positive;Calendar;Axis;ValidMin;ValidMax;ScaleFactor;AddOffset;FillValue;CellMethods;Comment -LongitudeStart;Longitude;Cell longitude;longitude;decimal_degrees_east;WGS84;east;;X;-180;180;;;999;CellStart;Longitude of cell start; -LatitudeStart;Latitude;Cell latitude;latitude;decimal_degrees_north;WGS84;north;;Y;-90;90;;;999;CellStart;Latitude of cell start; -TimeStart;Time;Time;time;days since 1899-01-01T00:00:00Z;;;gregorian;T;0;90000;;;99999;CellStart;Time of cell start; -DepthRefSurfaceStart;Depth;Cell depth;depth;m;Sea Surface;Down;;Z;0;12000;;;99999;CellStart;Depth of cell start, ref. surface; -DepthRefBottomStart;Depth;Cell depth;depth;m;Sea Floor;Up;;Z;0;12000;;;99999;CellStart;Depth of cell start, ref. bottom; -LongitudeEnd;Longitude;Cell longitude;longitude;decimal_degrees_east;WGS84;east;;X;-180;180;;;999;CellEnd;Longitude of cell end; -LatitudeEnd;Latitude;Cell latitude;latitude;decimal_degrees_north;WGS84;north;;Y;-90;90;;;999;CellEnd;Latitude of cell end; -TimeEnd;Time;Time;time;days since 1899-01-01T00:00:00Z;;;gregorian;T;0;90000;;;99999;CellEnd;Time of cell end; -DepthRefSurfaceEnd;Depth;Cell depth;depth;m;Sea Surface;Down;;Z;0;12000;;;99999;CellEnd;Depth of cell end, ref. surface; -DepthRefBottomEnd;Depth;Cell depth;depth;m;Sea Floor;Up;;Z;0;12000;;;99999;CellEnd;Depth of cell end, ref. bottom; -LongitudeBary;Longitude;Cell longitude;longitude;decimal_degrees_east;WGS84;east;;X;-180;180;;;999;CellBarycenter;Longitude of cell barycenter; -LatitudeBary;Latitude;Cell latitude;latitude;decimal_degrees_north;WGS84;north;;Y;-90;90;;;999;CellBarycenter;Latitude of cell barycenter; -TimeBary;Time;Time;time;days since 1899-01-01T00:00:00Z;;;gregorian;T;0;90000;;;99999;CellBarycenter;Time of cell barycenter; -DepthRefSurfaceBary;Depth;Cell depth;depth;m;Sea Surface;Down;;Z;0;12000;;;99999;CellBarycenter;Depth of cell barycenter, ref. surface; -DepthRefBottomBary;Depth;Cell depth;depth;m;Sea Floor;Up;;Z;0;12000;;;99999;CellBarycenter;Depth of cell barycenter, ref. bottom; -LongitudeEnv;Longitude;Cell longitude;longitude;decimal_degrees_east;WGS84;east;;X;-180;180;;;999;CellEnveloppe;Longitude of cell enveloppe point; -LatitudeEnv;Latitude;Cell latitude;latitude;decimal_degrees_north;WGS84;north;;Y;-90;90;;;999;CellEnveloppe;Latitude of cell enveloppe point; -TimeEnv;Time;Time;time;days since 1899-01-01T00:00:00Z;;;gregorian;T;0;90000;;;99999;CellEnveloppe;Time of cell enveloppe point; -DepthRefSurfaceEnv;Depth;Cell depth;depth;m;Sea Surface;Down;;Z;0;12000;;;99999;CellEnveloppe;Depth of cell enveloppe point, ref. surface; -DepthRefBottomEnv;Depth;Cell depth;depth;m;Sea Floor;Up;;Z;0;12000;;;99999;CellEnveloppe;Depth of cell enveloppe point, ref. bottom; -NASC;Acoustic density;Nautical area scattering coefficient;;m²/nmi²;;;;;0;3000000;;;99999;Mean;; -sa;Acoustic density;Area backscattering coefficient;sound_intensity_level_in_water;m²/m²;;;;;0;3000000;;;99999;Mean;; -sv;Acoustic density;Volume backscattering coefficient;acoustic_volume_backscatter;m-1;;;;;0;99999;;;99999;Mean;; -Sv;Acoustic density;Volume backscattering strength;;dB ref. 1m-1;;;;;-100;20;;;99999;Mean;; -Volume;Volume;Cell volume;volume;m3;;;;;0;99999;;;99999;Total;Cell volume; -Surface;Surface;Cell surface;;m2;;;;;0;99999;;;99999;Total;Cell area; -ReferenceStationCatch;ReferenceStationCatch;ID of the fishing station associated to the cell;;;;;;;;;;;999;;; -ReferenceStationBiometry;ReferenceStationBiometry;ID of the fishing station with biological measurements associated to the cell;;;;;;;;;;;999;;; -Biomass;Biomass;Biomass estimate (in weight);;tons;;;;;0;999999;;;9999999;Total;Estimated biomass in cell; -Abundance;Abundance;Abundance estimate (in number of fish);;no. of fish;;;;;0;999999999;;;9999999999;Total;Estimated abundance in cell; -MeanLength;MeanLength;Mean length of fish in cell;;cm;;;;;0;1000;;;99999;Mean;; -MeanWeight;MeanWeight;Mean weight of fish in cell;;g;;;;;0;1000000;;;9999999;Mean;; -Formula;Formula;How was computed the sA value allocated to the cell/echotype combination?;;;;;;;;;;;;;; -MeanXe;MeanXe;Mean acoustic scaling factor in (region) cells;;;;;;;0;10;;;999;Mean;; \ No newline at end of file +"DataMetadataID";"DataTypeID";"LongName";"StandardName";"Units";"ReferenceDatumID";"Positive";"Calendar";"Axis";"ValidMin";"ValidMax";"ScaleFactor";"AddOffset";"FillValue";"CellMethods";"Comment" +"LongitudeStart";"Longitude";"Cell longitude";"longitude";"decimal_degrees_east";"WGS84";"east";;"X";-180;180;;;999;"CellStart";"Longitude of cell start" +"LatitudeStart";"Latitude";"Cell latitude";"latitude";"decimal_degrees_north";"WGS84";"north";;"Y";-90;90;;;999;"CellStart";"Latitude of cell start" +"TimeStart";"Time";"Time";"time";"days since 1899-01-01T00:00:00Z";;;"gregorian";"T";0;90000;;;99999;"CellStart";"Time of cell start" +"DepthRefSurfaceStart";"Depth";"Cell depth";"depth";"m";"Sea Surface";"Down";;"Z";0;12000;;;99999;"CellStart";"Depth of cell start, ref. surface" +"DepthRefBottomStart";"Depth";"Cell depth";"depth";"m";"Sea Floor";"Up";;"Z";0;12000;;;99999;"CellStart";"Depth of cell start, ref. bottom" +"LongitudeEnd";"Longitude";"Cell longitude";"longitude";"decimal_degrees_east";"WGS84";"east";;"X";-180;180;;;999;"CellEnd";"Longitude of cell end" +"LatitudeEnd";"Latitude";"Cell latitude";"latitude";"decimal_degrees_north";"WGS84";"north";;"Y";-90;90;;;999;"CellEnd";"Latitude of cell end" +"TimeEnd";"Time";"Time";"time";"days since 1899-01-01T00:00:00Z";;;"gregorian";"T";0;90000;;;99999;"CellEnd";"Time of cell end" +"DepthRefSurfaceEnd";"Depth";"Cell depth";"depth";"m";"Sea Surface";"Down";;"Z";0;12000;;;99999;"CellEnd";"Depth of cell end, ref. surface" +"DepthRefBottomEnd";"Depth";"Cell depth";"depth";"m";"Sea Floor";"Up";;"Z";0;12000;;;99999;"CellEnd";"Depth of cell end, ref. bottom" +"LongitudeBary";"Longitude";"Cell longitude";"longitude";"decimal_degrees_east";"WGS84";"east";;"X";-180;180;;;999;"CellBarycenter";"Longitude of cell barycenter" +"LatitudeBary";"Latitude";"Cell latitude";"latitude";"decimal_degrees_north";"WGS84";"north";;"Y";-90;90;;;999;"CellBarycenter";"Latitude of cell barycenter" +"TimeBary";"Time";"Time";"time";"days since 1899-01-01T00:00:00Z";;;"gregorian";"T";0;90000;;;99999;"CellBarycenter";"Time of cell barycenter" +"DepthRefSurfaceBary";"Depth";"Cell depth";"depth";"m";"Sea Surface";"Down";;"Z";0;12000;;;99999;"CellBarycenter";"Depth of cell barycenter, ref. surface" +"DepthRefBottomBary";"Depth";"Cell depth";"depth";"m";"Sea Floor";"Up";;"Z";0;12000;;;99999;"CellBarycenter";"Depth of cell barycenter, ref. bottom" +"LongitudeEnv";"Longitude";"Cell longitude";"longitude";"decimal_degrees_east";"WGS84";"east";;"X";-180;180;;;999;"CellEnveloppe";"Longitude of cell enveloppe point" +"LatitudeEnv";"Latitude";"Cell latitude";"latitude";"decimal_degrees_north";"WGS84";"north";;"Y";-90;90;;;999;"CellEnveloppe";"Latitude of cell enveloppe point" +"TimeEnv";"Time";"Time";"time";"days since 1899-01-01T00:00:00Z";;;"gregorian";"T";0;90000;;;99999;"CellEnveloppe";"Time of cell enveloppe point" +"DepthRefSurfaceEnv";"Depth";"Cell depth";"depth";"m";"Sea Surface";"Down";;"Z";0;12000;;;99999;"CellEnveloppe";"Depth of cell enveloppe point, ref. surface" +"DepthRefBottomEnv";"Depth";"Cell depth";"depth";"m";"Sea Floor";"Up";;"Z";0;12000;;;99999;"CellEnveloppe";"Depth of cell enveloppe point, ref. bottom" +"NASC";"Acoustic density";"Nautical area scattering coefficient";;"m²/nmi²";;;;;0;3000000;;;99999;"Mean"; +"sa";"Acoustic density";"Area backscattering coefficient";"sound_intensity_level_in_water";"m²/m²";;;;;0;3000000;;;99999;"Mean"; +"sv";"Acoustic density";"Volume backscattering coefficient";"acoustic_volume_backscatter";"m-1";;;;;0;99999;;;99999;"Mean"; +"Sv";"Acoustic density";"Volume backscattering strength";;"dB ref. 1m-1";;;;;-100;20;;;99999;"Mean"; +"Volume";"Volume";"Cell volume";"volume";"m3";;;;;0;99999;;;99999;"Total";"Cell volume" +"Surface";"Surface";"Cell surface";;"m2";;;;;0;99999;;;99999;"Total";"Cell area" +"ReferenceStationCatch";"ReferenceStationCatch";"ID of the fishing station associated to the cell";;;;;;;;;;;999;; +"ReferenceStationBiometry";"ReferenceStationBiometry";"ID of the fishing station with biological measurements associated to the cell";;;;;;;;;;;999;; +"Biomass";"Biomass";"Biomass estimate (in weight)";;"tons";;;;;0;999999;;;9999999;"Total";"Estimated biomass in cell" +"Abundance";"Abundance";"Abundance estimate (in number of fish)";;"no. of fish";;;;;0;999999999;;;9999999999;"Total";"Estimated abundance in cell" +"MeanLength";"MeanLength";"Mean length of fish in cell";;"cm";;;;;0;1000;;;99999;"Mean"; +"MeanWeight";"MeanWeight";"Mean weight of fish in cell";;"g";;;;;0;1000000;;;9999999;"Mean"; +"Formula";"Formula";"How was computed the sA value allocated to the cell/echotype combination?";;;;;;;;;;;;; +"MeanXe";"MeanXe";"Mean acoustic scaling factor in (region) cells";;;;;;;0;10;;;999;"Mean"; +"EsduFlag";"EsduFlag";"ESDU Flag: 0 discard, : keep";;"boolean";;;;;0;1;;;999;"Mean"; Modified: trunk/echobase-tools/src/test/resources/csv/new/input-DataType.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-DataType.csv 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/resources/csv/new/input-DataType.csv 2012-03-08 17:07:22 UTC (rev 336) @@ -14,3 +14,4 @@ MeanWeight;Double; Formula;String; MeanXe;Double; +EsduFlag;String; Modified: trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv 2012-03-08 17:07:22 UTC (rev 336) @@ -5,7 +5,7 @@ 57x52;01/01/00;;1;57x52;Chalut pélagique 57/52;;;5;;;1;1 76x70;01/01/00;;1;76x70;Chalut pélagique 76/70;;;5;;;1;1 942OBS;01/01/00;;1;942OBS;Chalut pélagique (2 navires);;;5;;;1;1 -Bolinche;01/01/00;;1;PS;Filets tournants avec coulisse (sennes coulissantes);"Nom anglais : Surrounding nets with purse lines (purse seines) +PS;01/01/00;;1;PS;Filets tournants avec coulisse (sennes coulissantes);"Nom anglais : Surrounding nets with purse lines (purse seines) code ISSCFG : 01.1.0";07/12/2011 16:31:24.407001;1;;1;1;0 FC - NEUSTON;01/01/00;;0;NEUSTON;Chalut épi-pélagique « de surface » 1250mu;;;5;;;1;1 FILET CARRE;01/01/00;;0;CARRE;FILET CARRE 500mu;;;5;;;1;1 Modified: trunk/echobase-tools/src/test/resources/csv/new/input-GearMetadata.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-GearMetadata.csv 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/resources/csv/new/input-GearMetadata.csv 2012-03-08 17:07:22 UTC (rev 336) @@ -1,4 +1,8 @@ MetadataType;MetadataTypeMeaning;MetadataTypeGroup;OperationEvent CableLength;Length of cable used;Cable;Global MinSpeed;Minimum speed during operation;Speed;Global -MaxSpeed;Maximum speed during operation;Speed;Global \ No newline at end of file +MaxSpeed;Maximum speed during operation;Speed;Global +AverageSpeed;Average speed during operation;Speed;Global +VesselHeading;Average vessel heading during operation;Heading;Global +DriftHeading;Vessel drift heading during operation;Heading;Global +DriftSpeed;Vessel drift speed during operation;Speed;Global \ No newline at end of file Modified: trunk/echobase-tools/src/test/resources/csv/new/input-Species.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-Species.csv 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/echobase-tools/src/test/resources/csv/new/input-Species.csv 2012-03-08 17:07:22 UTC (rev 336) @@ -215,4 +215,7 @@ 99999;99999;99999;"NONVIVA";"Non vivant";;"NONV";;"DECH-ET2" 99999;99999;99999;"NONVIVA";"Non vivant";;"NONV";;"XXXX-XX1" 99999;99999;99999;"NONVIVA";"Non vivant";;"NONV";;"XXXX-XX2" -99999;99999;99999;"NONVIVA";"Non vivant";;"NONV";;"XXXX-XXX" \ No newline at end of file +99999;99999;99999;"NONVIVA";"Non vivant";;"NONV";;"XXXX-XXX" +1866;423200000;70;"CENTNIR";"Centrolophus niger";"(Gmelin, 1789)";"CENO";;"CENT-NIR" +864;165400000;45;"CARIDAX";"Caridea";"Dana, 1852";"SOPLEOC";;"CARI-DAX" +864;165400000;45;"CARIDAX";"Caridea";"Dana, 1852";"SOPLEOC";;"CARI-DAC" \ No newline at end of file Modified: trunk/src/doc/reunions/reunion-2012-03-06.txt =================================================================== --- trunk/src/doc/reunions/reunion-2012-03-06.txt 2012-03-08 17:05:49 UTC (rev 335) +++ trunk/src/doc/reunions/reunion-2012-03-06.txt 2012-03-08 17:07:22 UTC (rev 336) @@ -12,9 +12,14 @@ - valider les imports déjà réalisés - valider le référentiel définitif +Modèle +------ + Référentiels manquants ----------------------- +~~~~~~~~~~~~~~~~~~~~~~ +Il manque encore quelques référentiels pour terminer l'import 2011. + - Gear.PROPERTY_NAME "PS" - GearMetadata.PROPERTY_NAME "AverageSpeed" - GearMetadata.PROPERTY_NAME "VesselHeading" @@ -22,8 +27,28 @@ - GearMetadata.PROPERTY_NAME "DriftSpeed" - Species.PROPERTY_BARACOUDA_CODE "CARI-DAC" -Pour le référentiel Strata on devrait utiliser une foreign key vers DepthStratum ? +Modification référentiel +~~~~~~~~~~~~~~~~~~~~~~~~ +Lier le référentiel Strata et DepthStratum + +Déplacer les entités Echotype, LengthAgeKey et LengthWeightKey dans le +paquetage data car au final il s'agit de données et non pas référentiel. + +Base initiale +~~~~~~~~~~~~~ + +La base initiale a été au final scindée en deux : + +- une archive contenant tout le référentiel +- une archive contenant toutes les données historiques + +Divers +------ + +Vérifier la décoration de SpeciesCategory (il manque des choses) + + Import nouvelles données ------------------------
participants (1)
-
tchemit＠users.forge.codelutin.com