[Echobase-commits] r195 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-entities/src/main/resources/i18n echobase-entities/src/main/xmi echobase-services/src/main/java/fr/ifremer/echobase/services echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders echobase-tools/src/test/resources/csv/new src/doc/reunions

Author: tchemit Date: 2011-12-15 21:46:14 +0100 (Thu, 15 Dec 2011) New Revision: 195 Url: http://forge.codelutin.com/repositories/revision/echobase/195 Log: - reference model for catches - remove toLowerCase in import Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoaderTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoaderTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationEventLoaderTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoaderTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoaderTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoaderTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoaderTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoaderTest.java trunk/echobase-tools/src/test/resources/csv/new/input-BiometryScale.csv trunk/echobase-tools/src/test/resources/csv/new/input-GearMetadata.csv trunk/echobase-tools/src/test/resources/csv/new/input-OperationEvent.csv trunk/echobase-tools/src/test/resources/csv/new/input-OperationMetadata.csv trunk/echobase-tools/src/test/resources/csv/new/input-SampleDataType.csv trunk/echobase-tools/src/test/resources/csv/new/input-SampleType.csv trunk/echobase-tools/src/test/resources/csv/new/input-SexCategory.csv trunk/echobase-tools/src/test/resources/csv/new/input-SizeCategory.csv Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportService.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderTest.java trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv trunk/src/doc/reunions/reunion-2011-12-14.txt Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2011-12-15 20:46:14 UTC (rev 195) @@ -73,7 +73,7 @@ import fr.ifremer.echobase.entities.references.ReferencingMethod; import fr.ifremer.echobase.entities.references.SampleDataType; import fr.ifremer.echobase.entities.references.SampleType; -import fr.ifremer.echobase.entities.references.SexeCategory; +import fr.ifremer.echobase.entities.references.SexCategory; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.SpeciesCategory; @@ -211,8 +211,8 @@ // SampleType decorator registerJXPathDecorator(locale, SampleType.class, "${name}$s - level ${level}$s"); - // SexeCategory decorator - registerJXPathDecorator(locale, SexeCategory.class, "${name}$s"); + // SexCategory decorator + registerJXPathDecorator(locale, SexCategory.class, "${name}$s"); // SizeCategory decorator registerJXPathDecorator(locale, SizeCategory.class, "${name}$s"); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2011-12-15 20:46:14 UTC (rev 195) @@ -34,8 +34,10 @@ import fr.ifremer.echobase.entities.references.DepthStratum; import fr.ifremer.echobase.entities.references.EchotypeCategory; import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.entities.references.OperationEvent; import fr.ifremer.echobase.entities.references.ReferenceDatum; import fr.ifremer.echobase.entities.references.ReferenceDatumType; +import fr.ifremer.echobase.entities.references.SampleDataType; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.Vessel; import org.nuiton.topia.persistence.TopiaEntity; @@ -55,7 +57,7 @@ public static final Function<Voyage, String> VOYAGE_NAME = new Function<Voyage, String>() { @Override public String apply(Voyage input) { - return input.getName().toLowerCase(); + return input.getName(); } }; @@ -69,14 +71,14 @@ public static final Function<Vessel, String> VESSEL_NAME = new Function<Vessel, String>() { @Override public String apply(Vessel input) { - return input.getName().toLowerCase(); + return input.getName(); } }; public static final Function<AcousticInstrument, String> ACOUSTIC_INSTRUMENT_ID = new Function<AcousticInstrument, String>() { @Override public String apply(AcousticInstrument input) { - return input.getId().toLowerCase(); + return input.getId(); } }; @@ -97,46 +99,46 @@ public static final Function<ReferenceDatumType, String> REFERENCE_DATUM_TYPE_NAME = new Function<ReferenceDatumType, String>() { @Override public String apply(ReferenceDatumType input) { - return input.getName().toLowerCase(); + return input.getName(); } }; public static final Function<ReferenceDatum, String> REFERENCE_DATUM_ID = new Function<ReferenceDatum, String>() { @Override public String apply(ReferenceDatum input) { - return input.getId().toLowerCase(); + return input.getId(); } }; public static final Function<Mission, String> MISSION_NAME = new Function<Mission, String>() { @Override public String apply(Mission input) { - return input.getName().toLowerCase(); + return input.getName(); } }; public static final Function<AreaOfOperation, String> AREA_OF_OPERATION_NAME = new Function<AreaOfOperation, String>() { @Override public String apply(AreaOfOperation input) { - return input.getName().toLowerCase(); + return input.getName(); } }; public static final Function<DataType, String> DATA_TYPE_NAME = new Function<DataType, String>() { @Override public String apply(DataType input) { - return input.getName().toLowerCase(); + return input.getName(); } }; public static final Function<CellMethod, String> CELL_METHOD_NAME = new Function<CellMethod, String>() { @Override public String apply(CellMethod input) { - return input.getName().toLowerCase(); + return input.getName(); } }; public static final Function<DataProcessing, String> DATA_PROCESSING_ID = new Function<DataProcessing, String>() { @Override public String apply(DataProcessing input) { - return input.getId().toLowerCase(); + return input.getId(); } }; @@ -153,20 +155,33 @@ return input.getTopiaId(); } }; - public static final Function<File,String> FILE_NAME = new Function<File, String>() { + public static final Function<File, String> FILE_NAME = new Function<File, String>() { @Override public String apply(File input) { return input.getName(); } }; + public static final Function<SampleDataType, String> SAMPLE_DATA_TYPE_RAPRI_CODE = new Function<SampleDataType, String>() { + @Override + public String apply(SampleDataType input) { + return String.valueOf(input.getRaptriBiometryDataType()); + } + }; + public static final Function<OperationEvent, String> OPERATION_EVENT_NAME = new Function<OperationEvent, String>() { + @Override + public String apply(OperationEvent input) { + return input.getName(); + } + }; + public static Function<Map<String, Object>, String> newRowFunction(final String key) { return new Function<Map<String, Object>, String>() { @Override public String apply(Map<String, Object> input) { - String id = input.get(key).toString().toLowerCase(); + String id = input.get(key).toString(); return id; } }; 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 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-12-15 20:46:14 UTC (rev 195) @@ -93,7 +93,7 @@ */ public static EchoBaseEntityEnum[] getReferenceTypes() { List<EchoBaseEntityEnum> result = Lists.newLinkedList(); - result.add(EchoBaseEntityEnum.SexeCategory); + result.add(EchoBaseEntityEnum.SexCategory); result.add(EchoBaseEntityEnum.AgeCategory); result.add(EchoBaseEntityEnum.SizeCategory); result.add(EchoBaseEntityEnum.MeasureType); @@ -119,6 +119,7 @@ result.add(EchoBaseEntityEnum.OperationType); result.add(EchoBaseEntityEnum.MeasurementMetadata); result.add(EchoBaseEntityEnum.SampleDataType); + result.add(EchoBaseEntityEnum.BiometryScale); result.add(EchoBaseEntityEnum.SampleType); result.add(EchoBaseEntityEnum.Vessel); result.add(EchoBaseEntityEnum.Echotype); @@ -148,7 +149,7 @@ List<EchoBaseEntityEnum> result = Lists.newLinkedList(); result.add(EchoBaseEntityEnum.Strata); - result.add(EchoBaseEntityEnum.SexeCategory); + result.add(EchoBaseEntityEnum.SexCategory); result.add(EchoBaseEntityEnum.AgeCategory); result.add(EchoBaseEntityEnum.SizeCategory); result.add(EchoBaseEntityEnum.Species); @@ -170,6 +171,8 @@ result.add(EchoBaseEntityEnum.CellMethod); result.add(EchoBaseEntityEnum.CellType); result.add(EchoBaseEntityEnum.DataMetadata); + result.add(EchoBaseEntityEnum.OperationMetadata); + result.add(EchoBaseEntityEnum.GearMetadata); return result.toArray(new EchoBaseEntityEnum[result.size()]); } Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-12-15 20:46:14 UTC (rev 195) @@ -22,6 +22,7 @@ echobase.common.binSizePingAxis= echobase.common.binSizeRangeAxis= echobase.common.binUnitsPingAxis= +echobase.common.biometryScale= echobase.common.calendar= echobase.common.calibration=calibration echobase.common.callsign= @@ -123,11 +124,15 @@ echobase.common.maxLatitude= echobase.common.maxLongitude= echobase.common.meaning= +echobase.common.meaningEn= +echobase.common.meaningFr= echobase.common.measureType= echobase.common.measurementBinSize= echobase.common.measurementMetadata= echobase.common.measurementUnit= echobase.common.metadata=metadata +echobase.common.metadataGroup= +echobase.common.metadataType= echobase.common.minLatitude= echobase.common.minLongitude= echobase.common.mission=mission @@ -153,6 +158,7 @@ echobase.common.pingDutyCycle= echobase.common.platform= echobase.common.positive= +echobase.common.precision= echobase.common.principalInvestigator=Chercheur echobase.common.principalInvestigatorEmail=Courriel du chercheur echobase.common.processingDescription= @@ -161,6 +167,7 @@ echobase.common.processingTemplate= echobase.common.project=Projet echobase.common.qualityDataFlagValues= +echobase.common.raptriBiometryDataType= echobase.common.referenceDatum=referenceDatum echobase.common.referenceDatumType= echobase.common.referencingMethod= @@ -176,7 +183,7 @@ echobase.common.sampling= echobase.common.scaleFactor= echobase.common.seafloorSubstrate= -echobase.common.sexeCategory= +echobase.common.sexCategory= echobase.common.sizeCategory= echobase.common.soundSpeedCalculations= echobase.common.sounderConstant= Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportService.java 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportService.java 2011-12-15 20:46:14 UTC (rev 195) @@ -123,37 +123,10 @@ ZipFile zipFile = new ZipFile(file); try { -// MetaFilenameAware[] entries = getEntries(); -// -// List<String> missingEntries = Lists.newArrayList(); Map<MetaFilenameAware, ZipEntry> entriestoConsume = discoverEntries( file, zipFile); -// // check that all mandatories -// for (MetaFilenameAware entry : entries) { -// String filename = entry.getFilename(); -// ZipEntry zipEntry = zipFile.getEntry("echobase/" + filename); -// -// if (zipEntry == null) { -// missingEntries.add(filename); -// } else { -// entriestoConsume.put(entry, zipEntry); -// } -// } -// -// if (!missingEntries.isEmpty()) { -// -// if (log.isWarnEnabled()) { -// log.warn("There is " + missingEntries.size() + "missing mandatory files " + -// " in import " + file + "\n" + StringUtil.join(missingEntries, "\n", false)); -// } -// -//// throw new EchoBaseTechnicalException( -//// "There is some missing mandatory files " + -//// missingEntries + " in import " + file); -// } - int size = entriestoConsume.size(); model.setNbSteps(size + 1); Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoader.java (rev 0) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,67 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.entities.references.BiometryScale; +import fr.ifremer.echobase.entities.references.SampleDataType; +import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.tools.FileType; + +import java.util.List; + +/** + * {@link BiometryScale} loader. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class BiometryScaleLoader extends EntityLoader<BiometryScale> { + + public BiometryScaleLoader() { + super(BiometryScale.class, FileType.NEW); + } + + @Override + protected EntityCsvModel<BiometryScale> createCsvImportModel(TableMeta meta) { + + List<SampleDataType> sampleDataTypes = + getEntities(SampleDataType.class); + + EntityCsvModel<BiometryScale> model = EntityCsvModel.newModel( + getCsvSeparator(), + meta + ); + + /* + raptriBiometryDataType;ScaleCode;ScaleMeaningEng;ScaleMeaningFr + */ + model.addForeignKeyForImport("raptriBiometryDataType", BiometryScale.PROPERTY_SAMPLE_DATA_TYPE, SampleDataType.class, sampleDataTypes, EchoBaseFunctions.SAMPLE_DATA_TYPE_RAPRI_CODE); + model.addDefaultColumn("ScaleCode",BiometryScale.PROPERTY_CODE, int.class); + model.newMandatoryColumn("ScaleMeaningEng",BiometryScale.PROPERTY_MEANING_EN); + model.newMandatoryColumn("ScaleMeaningFr",BiometryScale.PROPERTY_MEANING_FR); + return model; + } +} \ No newline at end of file Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -246,9 +246,9 @@ elementaryCellType = cellTypeDAO.findById("Elementary"); cellTypesByDepthStratumId = Maps.newTreeMap(); - cellTypesByDepthStratumId.put(CLAS_REGION.toLowerCase(), + cellTypesByDepthStratumId.put(CLAS_REGION, cellTypeDAO.findById(REGION_PREFIX + CLAS_REGION)); - cellTypesByDepthStratumId.put(SURF_REGION.toLowerCase(), + cellTypesByDepthStratumId.put(SURF_REGION, cellTypeDAO.findById(REGION_PREFIX + SURF_REGION)); Preconditions.checkNotNull(surfaceMetadata); @@ -269,25 +269,26 @@ @Override protected void importBaracoudaEntities(Database db) throws IOException, TopiaException { - String processingId = dataProcessingId.toLowerCase(); - loadDatas(); - DataProcessing dataProcessing = dataProcessingsById.get(processingId); - Preconditions.checkNotNull(tranchesByProcessingId); Preconditions.checkNotNull(valeurEchosByProcessingId); Preconditions.checkNotNull(scenarioByProcessingId); Preconditions.checkNotNull(esduByProcessingId); Preconditions.checkNotNull(trancheDefById); Preconditions.checkNotNull(eiConfigurationByProcessingId); + Preconditions.checkNotNull(dataProcessingsById); + DataProcessing dataProcessing = dataProcessingsById.get(dataProcessingId); + Preconditions.checkNotNull(dataProcessing, "Could not find data processing with id " + dataProcessingId + " between " + dataProcessingsById.keySet()); + // obtain acoustic dataMetadata for this data processing DataMetadataDAO dataMetadataDAO = EchoBaseDAOHelper.getDataMetadataDAO(getTransaction()); Map<String, Object> eiconfigurationRow = - eiConfigurationByProcessingId.get(processingId); + eiConfigurationByProcessingId.get(dataProcessingId); + Preconditions.checkNotNull(eiconfigurationRow); String unitSource = (String) eiconfigurationRow.get("ENERG_UNIT_SOURCE"); String campagne = (String) eiconfigurationRow.get("CAMPAGNE"); String longName = campagne + "_" + unitSource; @@ -306,7 +307,7 @@ int nbElementaryData = 0; Collection<Map<String, Object>> esduRows = - esduByProcessingId.get(processingId); + esduByProcessingId.get(dataProcessingId); Collection<Cell> esduCells; @@ -315,18 +316,18 @@ // this is a region to grab if (log.isInfoEnabled()) { - log.info("DataProcessing " + processingId + " is with region"); + log.info("DataProcessing " + dataProcessingId + " is with region"); } Map<String, Object> postStrateRow = findPostStrateRow( db, - processingId + dataProcessingId ); Preconditions.checkNotNull(postStrateRow); // there is a region for this data processing - Cell regionCell = createRegionCell(processingId, + Cell regionCell = createRegionCell(dataProcessingId, postStrateRow, esduRows, acousticMetadata); @@ -343,10 +344,10 @@ // means a data processing without any region if (log.isInfoEnabled()) { - log.info("DataProcessing " + processingId + " is with NO region"); + log.info("DataProcessing " + dataProcessingId + " is with NO region"); } - esduCells = createEsduCells(processingId, + esduCells = createEsduCells(dataProcessingId, null, esduRows, acousticMetadata @@ -394,7 +395,7 @@ String typeImage = (String) postStrateRow.get("Type_Image"); CellType cellType = - cellTypesByDepthStratumId.get(typeImage.toLowerCase()); + cellTypesByDepthStratumId.get(typeImage); Cell regionCell = dao.create( Cell.PROPERTY_CELL_TYPE, cellType, @@ -720,7 +721,7 @@ // get first line in EIT_VALEUR_ECHO using ID_EI_DEVIATION, DHTU_DEVIATION for (Map<String, Object> row : valeurEchos) { - String id = row.get("ID_EI_DEVIATION").toString().toLowerCase(); + String id = row.get("ID_EI_DEVIATION").toString(); if (!processingId.equals(id)) { // not a good id continue; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -26,9 +26,11 @@ import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.healthmarketscience.jackcess.Database; +import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.meta.AssociationMeta; @@ -39,6 +41,7 @@ import fr.ifremer.echobase.services.DbImportService; import fr.ifremer.echobase.services.EchoBaseServiceContext; import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.models.EntityAssociationImportModel; import fr.ifremer.echobase.services.models.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.io.IOUtils; @@ -49,6 +52,8 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.FileUtil; import org.nuiton.util.csv.Import; +import org.nuiton.util.csv.ImportModel; +import org.nuiton.util.csv.ImportToMap; import java.io.BufferedReader; import java.io.File; @@ -56,6 +61,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; +import java.io.Reader; import java.io.Writer; import java.text.ParseException; import java.util.List; @@ -345,7 +351,7 @@ BufferedReader bf = new BufferedReader(new FileReader(out)); try { - service.importFile(meta, bf, result); + importFile(meta, bf, result); } catch (EchoBaseTechnicalException eee) { throw eee; @@ -394,22 +400,112 @@ return universe; } +// protected <E> E getFK(Map<String, E> universe, String fk) { +// return getFK(universe, fk, true); +// } + protected <E> E getFK(Map<String, E> universe, String fk) { - return getFK(universe, fk, true, true); +// E entity = universe.get(lowerCase ? fk.toLowerCase() : fk); + E entity = universe.get(fk); +// if (strict) + Preconditions.checkNotNull(entity, "Could not find entity with id " + fk); +// else { +// if (entity == null) { +// if (log.isWarnEnabled()) { +// log.warn("Could not find entity with id " + fk); +// } +// } +// } + return entity; } - protected <E> E getFK(Map<String, E> universe, String fk, boolean lowerCase, boolean strict) { - E entity = universe.get(lowerCase ? fk.toLowerCase() : fk); - if (strict) - Preconditions.checkNotNull(entity, "Could not find entity with id " + fk); - else { - if (entity == null) { - if (log.isWarnEnabled()) { - log.warn("Could not find entity with id " + fk); + public <E extends TopiaEntity> void importFile(MetaFilenameAware entry, + Reader reader, + CsvImportResult csvResult) throws IOException { + + DbEditorService service = getDbEditorService(); + + if (entry instanceof AssociationMeta) { + + // load a association input + + AssociationMeta meta = (AssociationMeta) entry; + + if (log.isInfoEnabled()) { + log.info("Will import " + meta); + } + + EchoBaseEntityEnum source = meta.getSource(); + EchoBaseEntityEnum target = meta.getTarget(); + List<TopiaEntity> targetEntities = getEntities(target); + Map<String, TopiaEntity> targetsById = + Maps.uniqueIndex(targetEntities, EchoBaseFunctions.TO_TOPIAID); + + ImportModel<Map<String, Object>> model = + EntityAssociationImportModel.newImportModel( + getConfiguration().getCsvSeparator(), + meta + ); + + EchoBaseEntityEnum sourceType = meta.getSource(); + + ImportToMap importer = ImportToMap.newImport(model, reader); + + List<E> sourceEntities = getEntities(sourceType); + Map<String, E> sourcesById = + Maps.uniqueIndex(sourceEntities, EchoBaseFunctions.TO_TOPIAID); + try { + for (Map<String, Object> row : importer) { + String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + E e = sourcesById.get(topiaId); + String[] associations = (String[]) row.get("target"); + List<TopiaEntity> associationEntities = Lists.newArrayList(); + for (String association : associations) { + TopiaEntity targetEntity = targetsById.get(association); + associationEntities.add(targetEntity); + } + meta.setChilds(e, associationEntities); + csvResult.incrementsNumberUpdated(); } + + } finally { + + importer.close(); } + + } else { + + // normal entity table import + + TableMeta meta = (TableMeta) entry; + + if (log.isInfoEnabled()) { + log.info("Will import " + meta); + } + + ImportModel<TopiaEntity> model = service.buildForImport(meta); + + Import<TopiaEntity> importer = Import.newImport(model, reader); + + try { + TopiaDAO<TopiaEntity> dao = getDAO(meta.getSource()); + for (TopiaEntity entity : importer) { + + TopiaEntity entityToSave = dao.create(TopiaEntity.TOPIA_ID, + entity.getTopiaId()); + + meta.copy(entity, entityToSave); + + csvResult.incrementsNumberUpdated(); + } + } catch (Exception eee) { + throw new EchoBaseTechnicalException("Could not import entities of type " + meta.getSource(), eee); + } finally { + + importer.close(); + } + } - return entity; } } Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoader.java (rev 0) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,67 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.entities.references.GearMetadata; +import fr.ifremer.echobase.entities.references.OperationEvent; +import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.tools.FileType; + +import java.util.List; + +/** + * {@link GearMetadata} loader. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class GearMetadataLoader extends EntityLoader<GearMetadata> { + + public GearMetadataLoader() { + super(GearMetadata.class, FileType.NEW); + } + + @Override + protected EntityCsvModel<GearMetadata> createCsvImportModel(TableMeta meta) { + + List<OperationEvent> events = getEntities(EchoBaseEntityEnum.OperationEvent); + + EntityCsvModel<GearMetadata> model = EntityCsvModel.newModel( + getCsvSeparator(), + meta + ); + + /* + MetadataType;MetadataTypeMeaning;MetadataTypeGroup;OperationEvent + */ + model.newMandatoryColumn("MetadataType", GearMetadata.PROPERTY_TYPE); + model.newMandatoryColumn("MetadataTypeMeaning", GearMetadata.PROPERTY_MEANING); + model.newMandatoryColumn("MetadataTypeGroup", GearMetadata.PROPERTY_METADATA_GROUP); + model.addForeignKeyForImport("OperationEvent", GearMetadata.PROPERTY_OPERATION_EVENT, OperationEvent.class, events, EchoBaseFunctions.OPERATION_EVENT_NAME); + return model; + } +} \ No newline at end of file Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java (rev 0) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,53 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.entities.references.OperationEvent; +import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.tools.FileType; + +/** + * {@link OperationEvent} loader. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class OperationEventLoader extends EntityLoader<OperationEvent> { + + public OperationEventLoader() { + super(OperationEvent.class, FileType.NEW); + } + + @Override + protected EntityCsvModel<OperationEvent> createCsvImportModel(TableMeta meta) { + EntityCsvModel<OperationEvent> model = EntityCsvModel.newModel( + getCsvSeparator(), + meta + ); + + model.newMandatoryColumn(OperationEvent.PROPERTY_NAME); + return model; + } +} \ No newline at end of file Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java (rev 0) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,68 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.entities.references.GearMetadata; +import fr.ifremer.echobase.entities.references.OperationEvent; +import fr.ifremer.echobase.entities.references.OperationMetadata; +import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.tools.FileType; + +import java.util.List; + +/** + * {@link OperationMetadata} loader. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class OperationMetadataLoader extends EntityLoader<OperationMetadata> { + + public OperationMetadataLoader() { + super(OperationMetadata.class, FileType.NEW); + } + + @Override + protected EntityCsvModel<OperationMetadata> createCsvImportModel(TableMeta meta) { + + List<OperationEvent> events = getEntities(EchoBaseEntityEnum.OperationEvent); + + EntityCsvModel<OperationMetadata> model = EntityCsvModel.newModel( + getCsvSeparator(), + meta + ); + + /* + MetadataType;MetadataTypeMeaning;MetadataTypeGroup;OperationEvent + */ + model.newMandatoryColumn("MetadataType", OperationMetadata.PROPERTY_NAME); + model.newMandatoryColumn("MetadataTypeMeaning", OperationMetadata.PROPERTY_MEANING); + model.newMandatoryColumn("MetadataTypeGroup", OperationMetadata.PROPERTY_METADATA_GROUP); + model.addForeignKeyForImport("OperationEvent", GearMetadata.PROPERTY_OPERATION_EVENT, OperationEvent.class, events, EchoBaseFunctions.OPERATION_EVENT_NAME); + return model; + } +} \ No newline at end of file Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java (rev 0) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,61 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.entities.references.SampleDataType; +import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.tools.FileType; + +/** + * {@link SampleDataType} loader. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class SampleDataTypeLoader extends EntityLoader<SampleDataType> { + + public SampleDataTypeLoader() { + super(SampleDataType.class, FileType.NEW); + } + + @Override + protected EntityCsvModel<SampleDataType> createCsvImportModel(TableMeta meta) { + EntityCsvModel<SampleDataType> model = EntityCsvModel.newModel( + getCsvSeparator(), + meta + ); + + /* + raptriBiometryDataType;sampleDataTypeMeaningEng;sampleDataType;sampleDataTypeMeaningFr;Units;Precision + */ + model.addDefaultColumn(SampleDataType.PROPERTY_RAPTRI_BIOMETRY_DATA_TYPE,int.class); + model.newMandatoryColumn("sampleDataTypeMeaningEng",SampleDataType.PROPERTY_MEANING_EN); + model.newMandatoryColumn("sampleDataType", SampleDataType.PROPERTY_NAME); + model.newMandatoryColumn("sampleDataTypeMeaningFr",SampleDataType.PROPERTY_MEANING_FR); + model.newMandatoryColumn("Units",SampleDataType.PROPERTY_UNITS); + model.newMandatoryColumn("Precision",SampleDataType.PROPERTY_UNITS); + return model; + } +} \ No newline at end of file Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java (rev 0) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,58 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.entities.references.SampleDataType; +import fr.ifremer.echobase.entities.references.SampleType; +import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.tools.FileType; + +/** + * {@link SampleDataType} loader. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class SampleTypeLoader extends EntityLoader<SampleType> { + + public SampleTypeLoader() { + super(SampleType.class, FileType.NEW); + } + + @Override + protected EntityCsvModel<SampleType> createCsvImportModel(TableMeta meta) { + EntityCsvModel<SampleType> model = EntityCsvModel.newModel( + getCsvSeparator(), + meta + ); + + /* + name;meaning + */ + model.newMandatoryColumn(SampleType.PROPERTY_NAME); + model.newMandatoryColumn(SampleType.PROPERTY_MEANING); + return model; + } +} \ No newline at end of file Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java (rev 0) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,57 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.entities.references.SexCategory; +import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.tools.FileType; + +/** + * {@link SexCategory} loader. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class SexCategoryLoader extends EntityLoader<SexCategory> { + + public SexCategoryLoader() { + super(SexCategory.class, FileType.NEW); + } + + @Override + protected EntityCsvModel<SexCategory> createCsvImportModel(TableMeta meta) { + EntityCsvModel<SexCategory> model = EntityCsvModel.newModel( + getCsvSeparator(), + meta + ); + + /* + CategoryID;CategoryName + */ + model.newMandatoryColumn("CategoryID", SexCategory.PROPERTY_NAME); + model.newMandatoryColumn("CategoryName", SexCategory.PROPERTY_MEANING); + return model; + } +} \ No newline at end of file Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java (rev 0) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,58 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.entities.references.SexCategory; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.tools.FileType; + +/** + * {@link SexCategory} loader. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class SizeCategoryLoader extends EntityLoader<SizeCategory> { + + public SizeCategoryLoader() { + super(SizeCategory.class, FileType.NEW); + } + + @Override + protected EntityCsvModel<SizeCategory> createCsvImportModel(TableMeta meta) { + EntityCsvModel<SizeCategory> model = EntityCsvModel.newModel( + getCsvSeparator(), + meta + ); + + /* + CategoryID;CategoryName + */ + model.newMandatoryColumn("CategoryID", SizeCategory.PROPERTY_NAME); + model.newMandatoryColumn("CategoryName", SizeCategory.PROPERTY_MEANING); + return model; + } +} \ No newline at end of file Property changes on: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java 2011-12-15 20:46:14 UTC (rev 195) @@ -173,7 +173,7 @@ String idEchotype = (String) entity.get("ID_DESCRIPTION_DEVIATION"); String specieEchotype = (String) entity.get("GENRE_ESP"); Voyage voayge = getFK(voyages, campagneName); - Species species = getFK(speciess, specieEchotype,false, true); + Species species = getFK(speciess, specieEchotype); Echotype echotype = echotypeDAO.findByProperties( Echotype.PROPERTY_ID, Integer.valueOf(idEchotype), Echotype.PROPERTY_SPECIES, species Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderTest.java 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/AbstractLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -198,7 +198,7 @@ } protected void loadDependencies(EchoBaseEntityEnum dependency, - Set<MetaFilenameAware> dones) throws IOException, TopiaException { + Set<MetaFilenameAware> dones) throws IOException, TopiaException { DbMeta dbMeta = serviceContext.getDbMeta(); TableMeta meta = dbMeta.getTable(dependency); loadDependencies(meta, dones); @@ -354,6 +354,14 @@ entityLoaders.add(newService(EchotypeLoader.class)); entityLoaders.add(newService(VesselTypeLoader.class)); entityLoaders.add(newService(VesselLoader.class)); + entityLoaders.add(newService(OperationEventLoader.class)); + entityLoaders.add(newService(SampleDataTypeLoader.class)); + entityLoaders.add(newService(SampleTypeLoader.class)); + entityLoaders.add(newService(BiometryScaleLoader.class)); + entityLoaders.add(newService(SexCategoryLoader.class)); + entityLoaders.add(newService(SizeCategoryLoader.class)); + entityLoaders.add(newService(OperationMetadataLoader.class)); + entityLoaders.add(newService(GearMetadataLoader.class)); entityLoaders.add(newService(VoyageLoader.class)); entityLoaders.add(newService(TransitLoader.class)); Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoaderTest.java (rev 0) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,45 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.references.BiometryScale; +import org.junit.Test; + +/** + * To test the {@link BiometryScaleLoader}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class BiometryScaleLoaderTest extends AbstractLoaderTest<BiometryScale, BiometryScaleLoader> { + + public BiometryScaleLoaderTest() { + super(BiometryScaleLoader.class, 44, 0); + } + + @Test + public void testGenerateNewEntities() throws Exception { + generateNewEntities(); + } +} Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/BiometryScaleLoaderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderTest.java 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -73,33 +73,33 @@ public static List<Object[]> data() { return Arrays.asList(new Object[][]{ {"EIT_00_38", 0}, - {"EIT_01_38", 0}, - {"EIT_02_38", 0}, - {"EIT_03_38", 0}, - {"EIT_0310_38", 0}, - {"EIT_04_38", 0}, - {"EIT_05_38", 0}, - {"EIT_0510_38", 0}, // with no region - {"EIT_06_38", 0}, - {"EIT_07_38", 0}, - {"EIT_08_38", 0}, - {"EIT_09_38", 0}, - {"EIT_10_38", 0}, - {"EIT_83A_38", 0}, // with no region - {"EIT_83B_38", 0}, // with no region - {"EIT_84_38", 0}, // with no region - {"EIT_85_38", 0}, // with no region - {"EIT_86_38", 0}, // with no region - {"EIT_87_38", 0}, // with no region - {"EIT_89A_38", 0}, // with no region - {"EIT_89B_38", 0}, // with no region - {"EIT_90_38", 0}, // with no region - {"EIT_91_38", 0}, // with no region - {"EIT_92_38", 0}, // with no region - {"EIT_93_38", 0}, // with no region - {"EIT_94_38", 0}, // with no region - {"EIT_97_38", 0}, // with no region - {"EIT_98b_38", 0}, +// {"EIT_01_38", 0}, +// {"EIT_02_38", 0}, +// {"EIT_03_38", 0}, +// {"EIT_0310_38", 0}, +// {"EIT_04_38", 0}, +// {"EIT_05_38", 0}, +// {"EIT_0510_38", 0}, // with no region +// {"EIT_06_38", 0}, +// {"EIT_07_38", 0}, +// {"EIT_08_38", 0}, +// {"EIT_09_38", 0}, +// {"EIT_10_38", 0}, +// {"EIT_83A_38", 0}, // with no region +// {"EIT_83B_38", 0}, // with no region +// {"EIT_84_38", 0}, // with no region +// {"EIT_85_38", 0}, // with no region +// {"EIT_86_38", 0}, // with no region +// {"EIT_87_38", 0}, // with no region +// {"EIT_89A_38", 0}, // with no region +// {"EIT_89B_38", 0}, // with no region +// {"EIT_90_38", 0}, // with no region +// {"EIT_91_38", 0}, // with no region +// {"EIT_92_38", 0}, // with no region +// {"EIT_93_38", 0}, // with no region +// {"EIT_94_38", 0}, // with no region +// {"EIT_97_38", 0}, // with no region +// {"EIT_98b_38", 0}, }); } Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoaderTest.java (rev 0) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,45 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.references.GearMetadata; +import org.junit.Test; + +/** + * To test the {@link GearMetadataLoader}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class GearMetadataLoaderTest extends AbstractLoaderTest<GearMetadata, GearMetadataLoader> { + + public GearMetadataLoaderTest() { + super(GearMetadataLoader.class, 3, 0); + } + + @Test + public void testGenerateNewEntities() throws Exception { + generateNewEntities(); + } +} Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoaderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationEventLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationEventLoaderTest.java (rev 0) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationEventLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,45 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.references.OperationEvent; +import org.junit.Test; + +/** + * To test the {@link OperationEventLoader}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class OperationEventLoaderTest extends AbstractLoaderTest<OperationEvent, OperationEventLoader> { + + public OperationEventLoaderTest() { + super(OperationEventLoader.class, 7, 0); + } + + @Test + public void testGenerateNewEntities() throws Exception { + generateNewEntities(); + } +} Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationEventLoaderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoaderTest.java (rev 0) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,45 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.references.OperationMetadata; +import org.junit.Test; + +/** + * To test the {@link SexCategoryLoader}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class OperationMetadataLoaderTest extends AbstractLoaderTest<OperationMetadata, OperationMetadataLoader> { + + public OperationMetadataLoaderTest() { + super(OperationMetadataLoader.class, 4, 0); + } + + @Test + public void testGenerateNewEntities() throws Exception { + generateNewEntities(); + } +} Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoaderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoaderTest.java (rev 0) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,45 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.references.SampleDataType; +import org.junit.Test; + +/** + * To test the {@link SampleDataTypeLoader}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class SampleDataTypeLoaderTest extends AbstractLoaderTest<SampleDataType, SampleDataTypeLoader> { + + public SampleDataTypeLoaderTest() { + super(SampleDataTypeLoader.class, 134, 0); + } + + @Test + public void testGenerateNewEntities() throws Exception { + generateNewEntities(); + } +} Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoaderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoaderTest.java (rev 0) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,45 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.references.SampleType; +import org.junit.Test; + +/** + * To test the {@link SampleTypeLoader}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class SampleTypeLoaderTest extends AbstractLoaderTest<SampleType, SampleTypeLoader> { + + public SampleTypeLoaderTest() { + super(SampleTypeLoader.class, 5, 0); + } + + @Test + public void testGenerateNewEntities() throws Exception { + generateNewEntities(); + } +} Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoaderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoaderTest.java (rev 0) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,45 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.references.SexCategory; +import org.junit.Test; + +/** + * To test the {@link SexCategoryLoader}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class SexCategoryLoaderTest extends AbstractLoaderTest<SexCategory, SexCategoryLoader> { + + public SexCategoryLoaderTest() { + super(SexCategoryLoader.class, 4, 0); + } + + @Test + public void testGenerateNewEntities() throws Exception { + generateNewEntities(); + } +} Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoaderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoaderTest.java (rev 0) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoaderTest.java 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,45 @@ +/* + * #%L + * EchoBase :: Tools + * + * $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% + */ +package fr.ifremer.echobase.tools.loaders; + +import fr.ifremer.echobase.entities.references.SizeCategory; +import org.junit.Test; + +/** + * To test the {@link SizeCategoryLoader}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public class SizeCategoryLoaderTest extends AbstractLoaderTest<SizeCategory, SizeCategoryLoader> { + + public SizeCategoryLoaderTest() { + super(SizeCategoryLoader.class, 4, 0); + } + + @Test + public void testGenerateNewEntities() throws Exception { + generateNewEntities(); + } +} Property changes on: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoaderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/resources/csv/new/input-BiometryScale.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-BiometryScale.csv (rev 0) +++ trunk/echobase-tools/src/test/resources/csv/new/input-BiometryScale.csv 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,45 @@ +raptriBiometryDataType;ScaleCode;ScaleMeaningEng;ScaleMeaningFr +3;0;Undetermined;indeterminé +3;1;Male;male +3;2;Female;femelle +3;3;NA (IEO- Pelacus1007);Non renseigné (IEO- Pelacus1007) +4;1;Immature/virgin;Immature/virgin +4;2;Developing;Developing +4;3;Prespawning;Prespawning +4;4;Spawning;Spawning +4;5;Spent;Spent +4;6;Resting;Resting +7;0;Easily readable;facile à lire +7;1;Hardly readable;difficile à lire +7;2;Unreadable;illisible +7;3;Estimated (ex. juvenile otoliths);Estimée (ex. Otolimetrie juvenile) +8;-1;To be checked by PG;à faire préciser par PG +8;1;"opaque (""H"")";"opaque (""H"")" +8;2;"hyalin (""O"")";"hyalin (""O"")" +8;3;opaque/hyalin;opaque/hyalin +23;1;No fat;No fat +23;2;Low fat;Low fat +23;3;Fat;Fat +23;4;High fat;High fat +24;0;no anisakis;zéro anisakis +24;1;1-10 anisakis;1 à 10 anisakis +24;2;10-20 anisakis;10 à 20 anisakis +24;3;>20 anisakis;> 20 anisakis +25;0;; +25;1;IFREMER - NANTES (PG);IFREMER - NANTES (PG) +25;2;IFREMER - LORIENT (ED);IFREMER - LORIENT (ED) +25;3;AZTI + (PP);AZTI + (PP) +25;4;AZTI (lecture AGE) + IFREMER Nantes (PG) (mesure rayon);AZTI (lecture AGE) + IFREMER Nantes (PG) (mesure rayon) +25;5;EPHE - PERPIGNAN (PL);EPHE - PERPIGNAN (PL) +25;6;IFREMER - IEO (double lecture à bord : Patrick-Carla);IFREMER - IEO (double lecture à bord : Patrick-Carla) +25;7;biometrie et otolithe IFREMER-NANTES (PG) - génétique : EPHE;biometrie et otolithe IFREMER-NANTES (PG) - génétique : EPHE +26;0;clé Taille/Age : NON Valide;clé Taille/Age : NON Valide +26;1;clé Taille/Age : VALIDE;clé Taille/Age : VALIDE +45;0;NA;NA +45;1;Blanc ?;Blanc ? +45;2;?;? +45;3;Complète;Complète +45;4;partielle;partielle +49;0;NA;NA +49;1;DROIT;DROIT +49;2;GAUCHE;GAUCHE \ No newline at end of file Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-BiometryScale.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2011-12-15 20:46:14 UTC (rev 195) @@ -2,23 +2,23 @@ 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; +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; +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; +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; +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;; Added: trunk/echobase-tools/src/test/resources/csv/new/input-GearMetadata.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-GearMetadata.csv (rev 0) +++ trunk/echobase-tools/src/test/resources/csv/new/input-GearMetadata.csv 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,4 @@ +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 Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-GearMetadata.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/resources/csv/new/input-OperationEvent.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-OperationEvent.csv (rev 0) +++ trunk/echobase-tools/src/test/resources/csv/new/input-OperationEvent.csv 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,8 @@ +name +Global; +Average; +ShootingStart; +ShootingEnd; +HaulingStart; +HaulingEnd; +Fishing; Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-OperationEvent.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/resources/csv/new/input-OperationMetadata.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-OperationMetadata.csv (rev 0) +++ trunk/echobase-tools/src/test/resources/csv/new/input-OperationMetadata.csv 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,5 @@ +MetadataType;MetadataTypeMeaning;MetadataTypeGroup;OperationEvent +MeanWaterDepth;Mean water depth during operation;Depth;Average +DielPeriod;1 : day, 0 : night;Diel;Global +WaterDepth;Water depth at the beginning of the operation;Depth;ShootingStart +WaterDepth;Water depth at the end of the operation;Depth;HaulingEnd \ No newline at end of file Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-OperationMetadata.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/resources/csv/new/input-SampleDataType.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-SampleDataType.csv (rev 0) +++ trunk/echobase-tools/src/test/resources/csv/new/input-SampleDataType.csv 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,135 @@ +raptriBiometryDataType;sampleDataTypeMeaningEng;sampleDataType;sampleDataTypeMeaningFr;Units;Precision +1;Length (cm – precision unknown);Lcm;Longueur (cm);;NA +2;Weight (g – precision unknown);Weightg;Poids (g);;NA +3;Sex;Sex;Sexe;; +4;Maturity;Maturity;Maturité;; +5;Weight of the gonads (g – precision unknown);GonadicWeight;Poids des gonades (g);; +6;Age;Age;Age;; +7;Age reading fiability;Fiability;Fiabilité de la lecture d'age;; +8;Edge type (1:opaque , 2:Hyalin, 3:opaq/hyali);EdgeType;Nature du bord de l'otholite;; +9;Length at ring 1 (micron);L1;Longueur du rayon 1 (micron);micron; +10;Length at ring 2 (micron);L2;Longueur du rayon 2 (micron);micron; +11;Length at ring 3 (micron);L3;Longueur du rayon 3 (micron);micron; +12;Length at ring 4 (micron);L4;LONGUEUR A L'ANNEAU 4 en micron;micron; +13;Length at ring 5 (micron);L5;LONGUEUR A L'ANNEAU 5 en micron;micron; +14;Length at ring 6 (micron);L6;LONGUEUR A L'ANNEAU 6 en micron;micron; +15;Length at ring 7 (micron);L7;LONGUEUR A L'ANNEAU 7 en micron;micron; +16;Length at ring 8 (micron);L8;LONGUEUR A L'ANNEAU 8 en micron;micron; +17;Length at ring 9 (micron);L9;LONGUEUR A L'ANNEAU 9 en micron;micron; +18;Length at ring 10 (micron);L10;LONGUEUR A L'ANNEAU 10 en micron;micron; +19;Otolith total length (micron);LTOT;LONGUEUR TOTALE DE LA PIECE OSSEUSE (micron);micron; +20;;MF1;MF1;; +21;;#R1;ex #R1 (calcul de LTOT - L1) --> code DISPONIBLE);; +23;Fat content;Fat;ENGRAISSEMENT;; +24;Parasites;Parasites;PARASITES;; +25;Laboratory where processed;Laboratory;Laboratoire de traitement;; +26;Length-age key validation;TA;Validation Clé Taille/Age;; +27;Locus – Genetics - PGI-m;PGI-m;Locus - Génétique - PGI-m;; +28;Locus - Genetics – LDH1-m;LDH1-m;Locus - Génétique - LDH1-m;; +29;Locus - Genetics - LDH2-m;LDH2-m;Locus - Génétique - LDH2-m;; +30;Locus - Genetics - ME2-m;ME2-m;Locus - Génétique - ME2-m;; +31;Locus - Genetics - MDH1-m;MDH1-m;Locus - Génétique - MDH1-m;; +32;Locus - Genetics - PGM-m;PGM-m;Locus - Génétique - PGM-m;; +33;Locus - Genetics - aGPD-m;aGPD-m;Locus - Génétique - aGPD-m;; +34;Locus - Genetics - IDH-m;IDH-m;Locus - Génétique - IDH-m;; +35;Locus - Genetics - AAT-f;AAT-f;Locus - Génétique - AAT-f;; +36;Locus - Genetics - LGG-f;LGG-f;Locus - Génétique - LGG-f;; +37;Locus - Genetics - PP-f;PP-f;Locus - Génétique - PP-f;; +38;Locus - Genetics - LT-f;LT-f;Locus - Génétique - LT-f;; +39;Locus - Genetics - IDH-f;IDH-f;Locus - Génétique - IDH-f;; +40;Locus - Genetics - EST4m-m;EST4m-m;Locus - Génétique - EST4m-m;; +41;Locus - Genetics - EST-f (PEL01 seul);EST-f;Locus - Génétique - EST-f (PEL01 seul);; +42;Locus - Genetics - MDH2-m (PEL01 seul);MDH2-m;Locus - Génétique - MDH2-m (PEL01 seul);; +43;Locus - Genetics - GDA-f (PEL01 seul);GDA-f;Locus - Génétique - GDA-f (PEL01 seul);; +44;Standard length, without tail;SL;TAILLE STANDARD ( cm) - hors caudale;cm; +45;Pigmentation;PIGMENT;PIGMENTATION;; +46;Length of bony part radius;RTOT;LONGUEUR du RAYON de la pièce osseuse (en micron);micron; +47;Nucleus length at otolith edge;RJNB;LONGUEUR du NUCLEUS au bord de l'otolithe (micron);micron; +48;Trench length at otolith edge;LJG;LONGUEUR du SILLON au bord de l'otolithe (micron);micron; +49;Otolith: left or right?;OTO_GD;OTOLITHE Gauche-Droit;; +50;Number of growth rings of juvenile otolith, bloc 1;NJ01;OTOLITHE JUV Nb Accroissement bloc 1;; +51;Number of growth rings of juvenile otolith, bloc 2;NJ02;OTOLITHE JUV Nb Accroissement bloc 2;; +52;Number of growth rings of juvenile otolith, bloc 3;NJ03;OTOLITHE JUV Nb Accroissement bloc 3;; +53;Number of growth rings of juvenile otolith, bloc 4;NJ04;OTOLITHE JUV Nb Accroissement bloc 4;; +54;Number of growth rings of juvenile otolith, bloc 5;NJ05;OTOLITHE JUV Nb Accroissement bloc 5;; +55;Number of growth rings of juvenile otolith, bloc 6;NJ06;OTOLITHE JUV Nb Accroissement bloc 6;; +56;Number of growth rings of juvenile otolith, bloc 7;NJ07;OTOLITHE JUV Nb Accroissement bloc 7;; +57;Number of growth rings of juvenile otolith, bloc 8;NJ08;OTOLITHE JUV Nb Accroissement bloc 8;; +58;Number of growth rings of juvenile otolith, bloc 9;NJ09;OTOLITHE JUV Nb Accroissement bloc 9;; +59;Number of growth rings of juvenile otolith, bloc 10;NJ10;OTOLITHE JUV Nb Accroissement bloc 10;; +60;Number of growth rings of juvenile otolith, bloc 11;NJ11;OTOLITHE JUV Nb Accroissement bloc 11;; +61;Number of growth rings of juvenile otolith, bloc 12;NJ12;OTOLITHE JUV Nb Accroissement bloc 12;; +62;Number of growth rings of juvenile otolith, bloc 13;NJ13;OTOLITHE JUV Nb Accroissement bloc 13;; +63;Number of growth rings of juvenile otolith, bloc 14;NJ14;OTOLITHE JUV Nb Accroissement bloc 14;; +64;Number of growth rings of juvenile otolith, bloc 15;NJ15;OTOLITHE JUV Nb Accroissement bloc 15;; +65;Number of growth rings of juvenile otolith, bloc 16;NJ16;OTOLITHE JUV Nb Accroissement bloc 16;; +66;Number of growth rings of juvenile otolith, bloc 17;NJ17;OTOLITHE JUV Nb Accroissement bloc 17;; +67;Number of growth rings of juvenile otolith, bloc 18;NJ18;OTOLITHE JUV Nb Accroissement bloc 18;; +68;Number of growth rings of juvenile otolith, bloc 19;NJ19;OTOLITHE JUV Nb Accroissement bloc 19;; +69;Number of growth rings of juvenile otolith, bloc 20;NJ20;OTOLITHE JUV Nb Accroissement bloc 20;; +70;Number of growth rings of juvenile otolith, bloc 21;NJ21;OTOLITHE JUV Nb Accroissement bloc 21;; +71;Number of growth rings of juvenile otolith, bloc 22;NJ22;OTOLITHE JUV Nb Accroissement bloc 22;; +72;Number of growth rings of juvenile otolith, bloc 23;NJ23;OTOLITHE JUV Nb Accroissement bloc 23;; +73;Number of growth rings of juvenile otolith, bloc 24;NJ24;OTOLITHE JUV Nb Accroissement bloc 24;; +74;Number of growth rings of juvenile otolith, bloc 25;NJ25;OTOLITHE JUV Nb Accroissement bloc 25;; +75;Number of growth rings of juvenile otolith, bloc 26;NJ26;OTOLITHE JUV Nb Accroissement bloc 26;; +76;Number of growth rings of juvenile otolith, bloc 27;NJ27;OTOLITHE JUV Nb Accroissement bloc 27;; +77;Number of growth rings of juvenile otolith, bloc 28;NJ28;OTOLITHE JUV Nb Accroissement bloc 28;; +78;Number of growth rings of juvenile otolith, bloc 29;NJ29;OTOLITHE JUV Nb Accroissement bloc 29;; +79;Number of growth rings of juvenile otolith, bloc 30;NJ30;OTOLITHE JUV Nb Accroissement bloc 30;; +80;Growth of juvenile otolith ring, bloc 1;LJ01;OTOLITHE JUV Mesure(micron) Accroissement bloc 1;micron; +81;Growth of juvenile otolith ring, bloc2;LJ02;OTOLITHE JUV Mesure(micron) Accroissement bloc 2;micron; +82;Growth of juvenile otolith ring, bloc 3;LJ03;OTOLITHE JUV Mesure(micron) Accroissement bloc 3;micron; +83;Growth of juvenile otolith ring, bloc 4;LJ04;OTOLITHE JUV Mesure(micron) Accroissement bloc 4;micron; +84;Growth of juvenile otolith ring, bloc 5;LJ05;OTOLITHE JUV Mesure(micron) Accroissement bloc 5;micron; +85;Growth of juvenile otolith ring, bloc 6;LJ06;OTOLITHE JUV Mesure(micron) Accroissement bloc 6;micron; +86;Growth of juvenile otolith ring, bloc 7;LJ07;OTOLITHE JUV Mesure(micron) Accroissement bloc 7;micron; +87;Growth of juvenile otolith ring, bloc 8;LJ08;OTOLITHE JUV Mesure(micron) Accroissement bloc 8;micron; +88;Growth of juvenile otolith ring, bloc 9;LJ09;OTOLITHE JUV Mesure(micron) Accroissement bloc 9;micron; +89;Growth of juvenile otolith ring, bloc 10;LJ10;OTOLITHE JUV Mesure(micron) Accroissement bloc 10;micron; +90;Growth of juvenile otolith ring, bloc 11;LJ11;OTOLITHE JUV Mesure(micron) Accroissement bloc 11;micron; +91;Growth of juvenile otolith ring, bloc 12;LJ12;OTOLITHE JUV Mesure(micron) Accroissement bloc 12;micron; +92;Growth of juvenile otolith ring, bloc 13;LJ13;OTOLITHE JUV Mesure(micron) Accroissement bloc 13;micron; +93;Growth of juvenile otolith ring, bloc 14;LJ14;OTOLITHE JUV Mesure(micron) Accroissement bloc 14;micron; +94;Growth of juvenile otolith ring, bloc 15;LJ15;OTOLITHE JUV Mesure(micron) Accroissement bloc 15;micron; +95;Growth of juvenile otolith ring, bloc 16;LJ16;OTOLITHE JUV Mesure(micron) Accroissement bloc 16;micron; +96;Growth of juvenile otolith ring, bloc 17;LJ17;OTOLITHE JUV Mesure(micron) Accroissement bloc 17;micron; +97;Growth of juvenile otolith ring, bloc 18;LJ18;OTOLITHE JUV Mesure(micron) Accroissement bloc 18;micron; +98;Growth of juvenile otolith ring, bloc 19;LJ19;OTOLITHE JUV Mesure(micron) Accroissement bloc 19;micron; +99;Growth of juvenile otolith ring, bloc 20;LJ20;OTOLITHE JUV Mesure(micron) Accroissement bloc 20;micron; +100;Growth of juvenile otolith ring, bloc 21;LJ21;OTOLITHE JUV Mesure(micron) Accroissement bloc 21;micron; +101;Growth of juvenile otolith ring, bloc 22;LJ22;OTOLITHE JUV Mesure(micron) Accroissement bloc 22;micron; +102;Growth of juvenile otolith ring, bloc 23;LJ23;OTOLITHE JUV Mesure(micron) Accroissement bloc 23;micron; +103;Growth of juvenile otolith ring, bloc 24;LJ24;OTOLITHE JUV Mesure(micron) Accroissement bloc 24;micron; +104;Growth of juvenile otolith ring, bloc 25;LJ25;OTOLITHE JUV Mesure(micron) Accroissement bloc 25;micron; +105;Growth of juvenile otolith ring, bloc 26;LJ26;OTOLITHE JUV Mesure(micron) Accroissement bloc 26;micron; +106;Growth of juvenile otolith ring, bloc 27;LJ27;OTOLITHE JUV Mesure(micron) Accroissement bloc 27;micron; +107;Growth of juvenile otolith ring, bloc 28;LJ28;OTOLITHE JUV Mesure(micron) Accroissement bloc 28;micron; +108;Growth of juvenile otolith ring, bloc 29;LJ29;OTOLITHE JUV Mesure(micron) Accroissement bloc 29;micron; +109;Growth of juvenile otolith ring, bloc 30;LJ30;OTOLITHE JUV Mesure(micron) Accroissement bloc 30;micron; +110;Complementary information;INFO;INFO COMPLEMENTAIRE;; +111;Total number of days, juvenile otolith;NJ00;OTOLITHE JUV Nb jours total;; +112;Number at length;NumberAtLength;Nombre par classe de taille;; +113;Weight at length (kg – precision unknown);WeightAtLengthkg;Poids par classe de taille (kg);;NA +114;Mean length (cm);MeanLengthcm;Taille moyenne (cm);; +115;Mean weight (g – precision unknown);MeanWeightg;Poids moyen (g);;NA +116;Number of fish per kg;NoPerKg;Moule (Nombre d'individus par kg);; +117;Total Length (cm – precision 1);LTcm1;Longueur Totale (cm);cm;1 +118;Total Length (cm – precision 0.5);LTcm0.5;Longueur Totale (1/2 cm);cm;0.5 +119;Total Length (mm – precision 1);LTmm1;Longueur Totale (mm);mm;1 +120;Fork Length (cm – precision 1);LFcm1;Longueur maxillaire supérieur - Fourche caudale;cm;1 +121;Width (cm – precision 1);LAcm1;Largeur;cm;1 +122;;LPCcm1;Longueur Pré supra Caudale;cm;1 +123;;LPAcm0.5;Longueur Pré Anale;cm;0.5 +124;;LMFcm1;Longueur maxillaire inférieur - Fourche caudale;cm;1 +125;Cephalothorax length (mm – precision 1);LCmm1;Longueur Céphalothoracique;mm;1 +126;Cephalothorax width (mm – precision 1);LACmm1;LArgeur Céphalothoracique;mm;1 +127;Height (mm – precision 1);Hmm1;Hauteur (mm);mm;1 +128;Height (cm – precision 0.5);Hcm0.5;Hauteur (1/2 cm);cm;0.5 +129;Mantel length (cm – precision 1);LMcm1;Longueur du Manteau (cm);cm;1 +130;Mantel length (cm – precision 0.5);LMcm0.1;Longueur du Manteau (1/2 cm);cm;0.5 +131;Curve standard length (cm – precision 0.5);LCScm0.1;Longueur Courbe Standard;cm;0.1 +132;Carapace direct length (cm – precision 0.1);LDScm0.1;Longueur Directe Standard;cm;0.1 +133;Carapace curve width (cm – precision 0.1);LACCcm0.1;LArgeur Courbe Carapace;cm;0.1 +134;Carapace direct width (cm – precision 0.1);LADCcm0.1;LArgeur Directe Carapace;cm;0.1 +135;Circumference (cm – precision 1);Ccm1;Circonférence;cm;1 \ No newline at end of file Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-SampleDataType.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/resources/csv/new/input-SampleType.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-SampleType.csv (rev 0) +++ trunk/echobase-tools/src/test/resources/csv/new/input-SampleType.csv 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,6 @@ +name;meaning +Individual;Measurement of individual fish +Subsample;Measurement of a subsample of fish +Total;Extrapolation results or total sorted catch +Unsorted;Individual taken out before being sampled +Sorted;Sample sorted \ No newline at end of file Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-SampleType.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/resources/csv/new/input-SexCategory.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-SexCategory.csv (rev 0) +++ trunk/echobase-tools/src/test/resources/csv/new/input-SexCategory.csv 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,5 @@ +CategoryID;CategoryName +0;All +G;Large +P;Small +TP;Very small Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-SexCategory.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-tools/src/test/resources/csv/new/input-SizeCategory.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-SizeCategory.csv (rev 0) +++ trunk/echobase-tools/src/test/resources/csv/new/input-SizeCategory.csv 2011-12-15 20:46:14 UTC (rev 195) @@ -0,0 +1,5 @@ +CategoryID;CategoryName +N;Not determined +F;Female +G;Large +I;Immature \ No newline at end of file Property changes on: trunk/echobase-tools/src/test/resources/csv/new/input-SizeCategory.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/doc/reunions/reunion-2011-12-14.txt =================================================================== --- trunk/src/doc/reunions/reunion-2011-12-14.txt 2011-12-15 11:05:49 UTC (rev 194) +++ trunk/src/doc/reunions/reunion-2011-12-14.txt 2011-12-15 20:46:14 UTC (rev 195) @@ -34,6 +34,20 @@ - Le SampleData#dataValue peut-être nulle (Float et pas float). +Réalisation modèle pêche +------------------------ + +- Report des modifications du modèle +- Remplissage du référentiel OperationEvent +- Remplissage du référentiel SampleDataType +- Remplissage du référentiel SampleType +- Création entité BiometryScale +- Remplissage du référentiel BiometryScale +- Remplissage du référentiel SexCategory +- Remplissage du référentiel SizeCategory +- Remplissage du référentiel OperationMetadata +- Remplissage du référentiel GearMetadata + Action ------