Echobase-commits

Download

echobase-commits@list.forge.codelutin.com

March 2012

2 participants
129 discussions

r423 - in trunk/echobase-services/src: main/java/fr/ifremer/echobase/services/importdata main/java/fr/ifremer/echobase/services/importdata/csv test/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com March 28, 2012

March 28, 2012

Author: tchemit Date: 2012-03-28 12:15:53 +0200 (Wed, 28 Mar 2012) New Revision: 423 Url: http://forge.codelutin.com/repositories/revision/echobase/423 Log: fix region import Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportRow.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-28 10:15:25 UTC (rev 422) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-28 10:15:53 UTC (rev 423) @@ -117,27 +117,18 @@ InputFile inputFile, Voyage voyage) throws ImportException { + CellType cellSurfaceType = getEntityByProperty( + CellType.class, CellType.PROPERTY_ID, "RegionSURF"); + Preconditions.checkNotNull(cellSurfaceType); - CellType cellType = getEntityByProperty( - CellType.class, CellType.PROPERTY_ID, "Region"); - Preconditions.checkNotNull(cellType); + CellType cellBottomType = getEntityByProperty( + CellType.class, CellType.PROPERTY_ID, "RegionCLAS"); + Preconditions.checkNotNull(cellBottomType); DataMetadata dataXMeta = getEntityByProperty( - DataMetadata.class, DataMetadata.PROPERTY_NAME, "LongitudeEnd"); + DataMetadata.class, DataMetadata.PROPERTY_NAME, "Coordinate"); Preconditions.checkNotNull(dataXMeta); - DataMetadata dataYMeta = getEntityByProperty( - DataMetadata.class, DataMetadata.PROPERTY_NAME, "LatitudeEnd"); - Preconditions.checkNotNull(dataYMeta); - - DataMetadata dataDepthSurfaceMeta = getEntityByProperty( - DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefSurfaceEnd"); - Preconditions.checkNotNull(dataDepthSurfaceMeta); - - DataMetadata dataDepthBottomMeta = getEntityByProperty( - DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefBottomEnd"); - Preconditions.checkNotNull(dataDepthBottomMeta); - DataMetadata dataSurfaceMeta = getEntityByProperty( DataMetadata.class, DataMetadata.PROPERTY_NAME, "Surface"); Preconditions.checkNotNull(dataSurfaceMeta); @@ -152,7 +143,6 @@ RegionCellImportModel csvModel = new RegionCellImportModel( serviceContext.getConfiguration().getCsvSeparator(), - cellType, voyageMap, depthStratumMap ); @@ -174,61 +164,55 @@ EchoBaseImport.newImport(csvModel, reader); int rowNumber = 0; + Cell cell = null; + configuration.incrementsProgression(); for (RegionCellImportRow row : importer) { rowNumber++; configuration.incrementsProgression(); - Cell cell = create(dao, row.getCell()); + if (cell == null || !row.getName().equals(cell.getName())) { - voyage.addPostCell(cell); - importResult.incrementsNumberCreated(EchoBaseEntityEnum.Cell); + // new cell to create + String depthStratumId = row.getDepthStratum().getId(); + CellType cellType; + if ("SURF".equals(depthStratumId)) { - createCellData(dataDao, - cell, - dataXMeta, - String.valueOf(row.getDataX()), - importResult - ); + cellType = cellSurfaceType; + } else if ("CLAS".equals(depthStratumId)) { + cellType = cellBottomType; - createCellData(dataDao, - cell, - dataYMeta, - String.valueOf(row.getDataY()), - importResult - ); + } else { + throw new ImportException( + "[Line " + rowNumber + + "] Depth stratum should be 'SURF' or 'CLAS', " + + "but was " + depthStratumId); + } - String depthStratumId = row.getDepthStratum().getId(); + cell = create(dao); - DataMetadata depth = null; + cell.setName(row.getName()); + cell.setCellType(cellType); + voyage.addPostCell(cell); + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Cell); - if ("SURF".equals(depthStratumId)) { - - depth = dataDepthSurfaceMeta; - } else if ("CLAS".equals(depthStratumId)) { - depth = dataDepthBottomMeta; - - } else { - throw new ImportException( - "[Line " + rowNumber + - "] Depth stratum should be 'SURF' or 'CLAS', " + - "but was " + depthStratumId); + // add surface data + createCellData(dataDao, + cell, + dataSurfaceMeta, + String.valueOf(row.getDataSurface()), + importResult + ); } + // add coordinate data createCellData(dataDao, cell, - depth, - String.valueOf(row.getDataZ()), + dataXMeta, + row.getDataCoordinate(), importResult ); - - createCellData(dataDao, - cell, - dataSurfaceMeta, - String.valueOf(row.getDataSurface()), - importResult - ); } return importResult; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportModel.java 2012-03-28 10:15:25 UTC (rev 422) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportModel.java 2012-03-28 10:15:53 UTC (rev 423) @@ -26,7 +26,6 @@ import fr.ifremer.echobase.csv.AbstractImportModel; import fr.ifremer.echobase.csv.EchobaseCsvUtil; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.DepthStratum; import java.util.Map; @@ -39,14 +38,10 @@ */ public class RegionCellImportModel extends AbstractImportModel<RegionCellImportRow> { - protected final CellType cellType; - public RegionCellImportModel(char separator, - CellType cellType, Map<String, Voyage> voyageMap, Map<String, DepthStratum> depthStramMap) { super(separator); - this.cellType = cellType; newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); newForeignKeyColumn(RegionCellImportRow.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStramMap); @@ -61,7 +56,6 @@ @Override public RegionCellImportRow newEmptyInstance() { RegionCellImportRow row = new RegionCellImportRow(); - row.getCell().setCellType(cellType); return row; } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportRow.java 2012-03-28 10:15:25 UTC (rev 422) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportRow.java 2012-03-28 10:15:53 UTC (rev 423) @@ -23,8 +23,6 @@ */ package fr.ifremer.echobase.services.importdata.csv; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.CellImpl; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.DepthStratum; @@ -54,7 +52,7 @@ protected DepthStratum depthStratum; - protected final Cell cell; + protected String name; protected float dataX; @@ -65,13 +63,8 @@ protected float dataSurface; public RegionCellImportRow() { - this.cell = new CellImpl(); } - public Cell getCell() { - return cell; - } - public Voyage getVoyage() { return voyage; } @@ -80,24 +73,20 @@ return depthStratum; } - public float getDataX() { - return dataX; + public String getName() { + return name; } - public float getDataY() { - return dataY; + public String getDataCoordinate() { + return dataX + "," + dataY + "," + dataZ; } - public float getDataZ() { - return dataZ; - } - public float getDataSurface() { return dataSurface; } public void setName(String name) { - getCell().setName(name); + this.name = name; } public void setVoyage(Voyage voyage) { Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-28 10:15:25 UTC (rev 422) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-28 10:15:53 UTC (rev 423) @@ -24,9 +24,12 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.junit.Test; @@ -74,11 +77,16 @@ // prepareInputFile(conf.getRegionsFile(), // getImportPath("regionResults.csv.gz")); + //TODO Remove this when referentiel is ok + create(getDAO(EchoBaseEntityEnum.CellType), CellType.PROPERTY_NAME, "RegionSURF"); + create(getDAO(EchoBaseEntityEnum.CellType), CellType.PROPERTY_NAME, "RegionCLAS"); + create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "Coordinate"); + List<CsvFileImportResult> result; result = doImport(conf, ResultsRegionCellImportService.class, 1); - assertCsvImportResult(result, 0, Cell.class, 228); - assertCsvImportResult(result, 0, Data.class, 228 * 4); + assertCsvImportResult(result, 0, Cell.class, 10); + assertCsvImportResult(result, 0, Data.class, 238); //assertCsvImportResult(result,1, Result.class, 0); //assertCsvImportResult(result,2, Result.class, 0); }

1 0

r422 - trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com March 28, 2012

March 28, 2012

Author: tchemit Date: 2012-03-28 12:15:25 +0200 (Wed, 28 Mar 2012) New Revision: 422 Url: http://forge.codelutin.com/repositories/revision/echobase/422 Log: fix some esdu result import (remove bad data metas + add correct entities count) Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-28 10:15:25 UTC (rev 422) @@ -132,7 +132,6 @@ //TODO Remove this when referentiel is ok create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "SigmaSp"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "RegionID"); create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondBiomass"); create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondAbundance"); @@ -198,16 +197,13 @@ addMissingEsduCells(conf.getVoyageId(), inputFile); - //TODO Remove this when referentiel is ok - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "N"); - List<CsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); assertCsvImportResult(result, 0, Result.class, 10021); assertCsvImportResult(result, 0, AgeCategory.class, 10); assertCsvImportResult(result, 0, Category.class, 14); - assertCsvImportResult(result, 0, SpeciesCategory.class, 14); + assertCsvImportResult(result, 0, SpeciesCategory.class, 14, 0, 471); } protected void addMissingEsduCells(String voyageId,

1 0

r421 - in trunk/echobase-services/src: main/java/fr/ifremer/echobase/services main/java/fr/ifremer/echobase/services/importdata/csv test/java/fr/ifremer/echobase/services test/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com March 27, 2012

March 27, 2012

Author: tchemit Date: 2012-03-28 01:21:55 +0200 (Wed, 28 Mar 2012) New Revision: 421 Url: http://forge.codelutin.com/repositories/revision/echobase/421 Log: remove unused directories + clean imports Removed: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -42,38 +42,6 @@ */ public class AcousticDataImportModel extends AbstractImportModel<AcousticDataImportRow> { - - /* -ESDU Data - -Latitude MOVIES_EILayer\\cellset\\lat, OK -Longitude MOVIES_EILayer\\cellset\\long OK -depth MOVIES_EILayer\\shipnav\\depth OK -timeStart MOVIES_EILayer\\cellset\\datestart OK -timeEnd MOVIES_EILayer\\cellset\\dateend OK -NASC MOVIES_EILayer\\eilayer\\sa OK -Volume MOVIES_EILayer\\cellset\\volume OK -Surface MOVIES_EILayer\\cellset\\area OK -NumberOfSamplesRecorded MOVIES_EILayer\\cellset\\nt OK -NumberOfSamplesEchoIntegrated MOVIES_EILayer\\cellset\\ni"OK - - -Elementary Data - -Latitude MOVIES_EILayer\\cellset\\lat -Longitude MOVIES_EILayer\\cellset\\long -depthStart (surface ou bottom) MOVIES_EILayer\\cellset\\depthstart -depthEnd (surface ou bottom) MOVIES_EILayer\\cellset\\depthend -timeStart MOVIES_EILayer\\cellset\\datestart -timeEnd MOVIES_EILayer\\cellset\\dateend -NASC MOVIES_EILayer\\eilayer\\sa -Volume MOVIES_EILayer\\cellset\\volume -Surface MOVIES_EILayer\\cellset\\area -NumberOfSamplesRecorded MOVIES_EILayer\\cellset\\nt -NumberOfSamplesEchoIntegrated MOVIES_EILayer\\cellset\\ni -minEIthr MOVIES_EILayer\cellset\thresholdlow -maxEIthr MOVIES_EILayer\cellset\thresholdup - */ public AcousticDataImportModel(char separator, Map<String, AcousticInstrument> instrumentsById) { super(separator); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -46,15 +46,6 @@ Map<String, SampleDataType> sampleDataTypeMap) { super(separator); - /* - operationID - baracoudacode - numFish - dataLabel - dataValue - name - */ - newForeignKeyColumn("operationID", BiometrySampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); newForeignKeyColumn("baracoudacode", BiometrySampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -39,29 +39,12 @@ */ public class EchotypeImportModel extends AbstractImportModel<EchotypeImportRow> { - protected final Map<String, Voyage> voyageMap; - - protected final Map<String, DepthStratum> depthStratumMap; - - protected final Map<String, Species> speciesMap; - public EchotypeImportModel(char separator, Map<String, Voyage> voyageMap, Map<String, DepthStratum> depthStratumMap, Map<String, Species> speciesMap) { super(separator); - this.voyageMap = voyageMap; - this.depthStratumMap = depthStratumMap; - this.speciesMap = speciesMap; - /* - voyage - echotypeName - DepthStratumID - meaning - baracoudacode - */ - newMandatoryColumn("echotypeName", Echotype.PROPERTY_NAME); newMandatoryColumn("meaning", Echotype.PROPERTY_MEANING); newForeignKeyColumn(EchotypeImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -47,14 +47,6 @@ Map<String, Operation> operationMap) { super(separator); - /* - vesselName - id - gearID - metadataType - gearMetadataValue - */ - newForeignKeyColumn("vesselName", GearMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); newForeignKeyColumn("operationID", GearMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -40,20 +40,11 @@ */ public class LengthAgeKeyImportModel extends AbstractImportModel<LengthAgeKeyImportRow> { - protected final Map<String, Voyage> voyageMap; - - protected final Map<String, Strata> strataMap; - - protected final Map<String, Species> speciesMap; - public LengthAgeKeyImportModel(char separator, Map<String, Voyage> voyageMap, Map<String, Strata> strataMap, Map<String, Species> speciesMap) { super(separator); - this.voyageMap = voyageMap; - this.strataMap = strataMap; - this.speciesMap = speciesMap; newForeignKeyColumn(LengthAgeKeyImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -40,29 +40,11 @@ */ public class LengthWeightKeyImportModel extends AbstractImportModel<LengthWeightKeyImportRow> { - protected final Map<String, Voyage> voyageMap; - - protected final Map<String, SizeCategory> sizeCategoryMap; - - protected final Map<String, Species> speciesMap; - public LengthWeightKeyImportModel(char separator, Map<String, Voyage> voyageMap, Map<String, SizeCategory> sizeCategoryMap, Map<String, Species> speciesMap) { super(separator); - this.voyageMap = voyageMap; - this.sizeCategoryMap = sizeCategoryMap; - this.speciesMap = speciesMap; - - /* - voyage - sizeCategory - aParameter - bParameter - codeMemo - */ - newMandatoryColumn("aParameter", LengthWeightKey.PROPERTY_APARAMETER, EchobaseCsvUtil.PRIMITIVE_FLOAT); newMandatoryColumn("bParameter", LengthWeightKey.PROPERTY_BPARAMETER, EchobaseCsvUtil.PRIMITIVE_FLOAT); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -46,20 +46,6 @@ Map<String, DepthStratum> depthStratumMap) { super(separator); - /* - vesselName // - id // - depthStratumID // - gearShootingStartTime // - midHaulLatitude // - midHaulLongitude // - gearShootingStartLatitude // - gearShootingStartLongitude // - gearShootingEndTime // - gearShootingEndLatitude // - gearShootingEndLongitude // - gearName // - */ newForeignKeyColumn("vesselName", OperationImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); newForeignKeyColumn("gearCode", Operation.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -45,13 +45,6 @@ Map<String, Operation> operationMap) { super(separator); - /* - vesselName/ - id/ - metadataType/ - operationMetadataValue/ - */ - newForeignKeyColumn("vesselName", OperationMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); newForeignKeyColumn("operationID", OperationMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java 2012-03-27 23:21:55 UTC (rev 421) @@ -42,7 +42,6 @@ public RegionCellAssociationImportRow() { } - public Cell getEsduCell() { return esduCell; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -49,21 +49,6 @@ Map<String, SexCategory> sexCategoryMap) { super(separator); - /* - operationID - subHaul - baracoudacode - sizeCategory - sexCategory - sampleWeight - numberSampled - - numberAtLength - weightAtLength - units - round - */ - newIgnoredColumn("subHaul"); newIgnoredColumn("units"); newIgnoredColumn("round"); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java 2012-03-27 23:21:55 UTC (rev 421) @@ -38,7 +38,6 @@ */ public class SubSampleImportRow { - public static final String PROPERTY_OPERATION = "operation"; public static final String PROPERTY_SPECIES = "species"; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -46,18 +46,6 @@ Map<String, SizeCategory> sizeCategoryMap) { super(separator); - /* - operationID - baracoudacode - sizeCategory - sampleWeight - numberSampled - meanLength - meanWeight - noPerKg - sortedWeight - */ - newForeignKeyColumn("operationID", TotalSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); newForeignKeyColumn("baracoudacode", TotalSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(TotalSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java 2012-03-27 23:21:55 UTC (rev 421) @@ -38,8 +38,6 @@ */ public class TransitImportModel extends AbstractImportModel<TransitImportRow> { - public static final String TRANSIT_VoyageId = "voyageName"; - public TransitImportModel(char separator, Map<String, Voyage> voyageMap) { super(separator); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-03-27 23:21:55 UTC (rev 421) @@ -46,6 +46,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Arrays; +import java.util.List; import java.util.Set; import java.util.zip.GZIPInputStream; @@ -146,6 +147,19 @@ } + protected <E extends TopiaEntity> void assertCsvImportResult(List<CsvFileImportResult> actual, + int pos, + Class<E> entityType, + int numberCreated) throws TopiaException { + Assert.assertTrue(actual.size() >= pos); + assertCsvImportResult(actual.get(pos), + entityType, + numberCreated, + 0, + numberCreated); + + } + protected <E extends TopiaEntity> void assertCsvImportResult(CsvFileImportResult actual, Class<E> entityType, int numberCreated, @@ -160,6 +174,23 @@ assertNbEntities(entityType, nbCount); } + protected <E extends TopiaEntity> void assertCsvImportResult(List<CsvFileImportResult> results, + int pos, + Class<E> entityType, + int numberCreated, + int numberUpdated, + int nbCount) throws TopiaException { + Assert.assertTrue(results.size() >= pos); + CsvFileImportResult actual = results.get(pos); + Assert.assertNotNull(actual); + Set<EchoBaseEntityEnum> entityTypes = actual.getEntityTypes(); + EchoBaseEntityEnum expectedEntityType = EchoBaseEntityEnum.valueOf(entityType); + Assert.assertTrue(entityTypes.contains(expectedEntityType)); + Assert.assertEquals(numberCreated, actual.getNumberCreated(expectedEntityType)); + Assert.assertEquals(numberUpdated, actual.getNumberUpdated(expectedEntityType)); + assertNbEntities(entityType, nbCount); + } + protected <E extends TopiaEntity> void assertNbEntities(Class<E> entityType, int expectedNumber) throws TopiaException { long count = getDAO(entityType).count(); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -83,14 +83,13 @@ prepareInputFile(conf.getMoviesFile(), getImportPath("movies.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, AcousticDataImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, AcousticDataImportService.class, 1); - CsvFileImportResult importResult = result.get(0); - assertCsvImportResult(importResult, DataAcquisition.class, NB_DATA_ACQUISITION); - assertCsvImportResult(importResult, DataProcessing.class, NB_DATA_PROCESSING); - assertCsvImportResult(importResult, Cell.class, NB_CELL); - assertCsvImportResult(importResult, Data.class, NB_DATA); + assertCsvImportResult(result, 0, DataAcquisition.class, NB_DATA_ACQUISITION); + assertCsvImportResult(result, 0, DataProcessing.class, NB_DATA_PROCESSING); + assertCsvImportResult(result, 0, Cell.class, NB_CELL); + assertCsvImportResult(result, 0, Data.class, NB_DATA); assertImportAcousticDatas(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -30,7 +30,6 @@ import org.junit.Ignore; import org.junit.Test; -import java.util.Iterator; import java.util.List; /** @@ -68,22 +67,17 @@ prepareInputFile(conf.getBiometrySampleFile(), getImportPath("biometrysample.csv.gz")); + List<CsvFileImportResult> result; + result = doImport(conf, CatchesDataImportService.class, 3); - List<CsvFileImportResult> result = doImport( - conf, CatchesDataImportService.class, 3); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_TOTAL, 0, NB_SAMPLE); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_TOTAL, 0, NB_SAMPLE_DATA); - Iterator<CsvFileImportResult> iterator = result.iterator(); - CsvFileImportResult importResult; + assertCsvImportResult(result, 1, Sample.class, NB_SAMPLE_UNSORTED, 0, NB_SAMPLE); + assertCsvImportResult(result, 1, SampleData.class, NB_SAMPLE_DATA_UNSORTED, 0, NB_SAMPLE_DATA); - importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_TOTAL, 0, NB_SAMPLE); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_TOTAL, 0, NB_SAMPLE_DATA); - importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_UNSORTED, 0, NB_SAMPLE); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_UNSORTED, 0, NB_SAMPLE_DATA); - importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_BIOMETRY, 0, NB_SAMPLE); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_BIOMETRY, 0, NB_SAMPLE_DATA); + assertCsvImportResult(result, 2, Sample.class, NB_SAMPLE_BIOMETRY, 0, NB_SAMPLE); + assertCsvImportResult(result, 2, SampleData.class, NB_SAMPLE_DATA_BIOMETRY, 0, NB_SAMPLE_DATA); assertImportSampleDatas(); } @@ -104,12 +98,11 @@ prepareInputFile(conf.getTotalSampleFile(), getImportPath("totalsample.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, CatchesDataImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, CatchesDataImportService.class, 1); - CsvFileImportResult importResult = result.get(0); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_TOTAL); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_TOTAL); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_TOTAL); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_TOTAL); } @Ignore @@ -128,13 +121,11 @@ prepareInputFile(conf.getSubSampleFile(), getImportPath("subsample.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, CatchesDataImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, CatchesDataImportService.class, 1); - Iterator<CsvFileImportResult> iterator = result.iterator(); - CsvFileImportResult importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_UNSORTED); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_UNSORTED); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_UNSORTED); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_UNSORTED); } @Ignore @@ -153,13 +144,10 @@ prepareInputFile(conf.getBiometrySampleFile(), getImportPath("biometrysample.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, CatchesDataImportService.class, 1); - - Iterator<CsvFileImportResult> iterator = result.iterator(); - CsvFileImportResult importResult = iterator.next(); - assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_BIOMETRY); - assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_BIOMETRY); + List<CsvFileImportResult> result; + result = doImport(conf, CatchesDataImportService.class, 1); + assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_BIOMETRY); + assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_BIOMETRY); } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -29,7 +29,6 @@ import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.junit.Test; -import java.util.Iterator; import java.util.List; /** @@ -74,12 +73,10 @@ transit.clearTransect(); } - List<CsvFileImportResult> result = doImport( - conf, CommonDataImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, CommonDataImportService.class, 1); - Iterator<CsvFileImportResult> iterator = result.iterator(); - assertCsvImportResult(iterator.next(), Transect.class, - NB_TRANSECT); + assertCsvImportResult(result, 0, Transect.class, NB_TRANSECT); assertImportCommonData(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -30,7 +30,6 @@ import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.junit.Test; -import java.util.Iterator; import java.util.List; /** @@ -78,13 +77,12 @@ conf.setImportMode(CommonDataImportMode.ALL); - List<CsvFileImportResult> result = doImport( - conf, CommonDataImportService.class, 3); + List<CsvFileImportResult> result; + result = doImport(conf, CommonDataImportService.class, 3); - Iterator<CsvFileImportResult> iterator = result.iterator(); - assertCsvImportResult(iterator.next(), Voyage.class, NB_VOYAGE); - assertCsvImportResult(iterator.next(), Transit.class, NB_TRANSIT); - assertCsvImportResult(iterator.next(), Transect.class, NB_TRANSECT); + assertCsvImportResult(result, 0, Voyage.class, NB_VOYAGE); + assertCsvImportResult(result, 1, Transit.class, NB_TRANSIT); + assertCsvImportResult(result, 2, Transect.class, NB_TRANSECT); assertImportCommonData(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -30,7 +30,6 @@ import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.junit.Test; -import java.util.Iterator; import java.util.List; /** @@ -70,13 +69,12 @@ prepareInputFile(conf.getGearMetadataFile(), getImportPath("gearmetadatavalue.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, OperationImportService.class, 3); + List<CsvFileImportResult> result; + result = doImport(conf, OperationImportService.class, 3); - Iterator<CsvFileImportResult> iterator = result.iterator(); - assertCsvImportResult(iterator.next(), Operation.class, NB_OPERATION); - assertCsvImportResult(iterator.next(), OperationMetadataValue.class, NB_OPERATION_METADATAVALUE); - assertCsvImportResult(iterator.next(), GearMetadataValue.class, NB_GEAR_METADATAVALUE); + assertCsvImportResult(result, 0, Operation.class, NB_OPERATION); + assertCsvImportResult(result, 1, OperationMetadataValue.class, NB_OPERATION_METADATAVALUE); + assertCsvImportResult(result, 2, GearMetadataValue.class, NB_GEAR_METADATAVALUE); assertImportOperations(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -99,12 +99,12 @@ addMissingEsduCells(conf.getVoyageId(), inputFile); - List<CsvFileImportResult> result = doImport( - conf, ResultsEsduCellImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, 43533); - assertCsvImportResult(result.get(0), Category.class, 7); - assertCsvImportResult(result.get(0), SpeciesCategory.class, 1); + assertCsvImportResult(result, 0, Result.class, 43533); + assertCsvImportResult(result, 0, Category.class, 7); + assertCsvImportResult(result, 0, SpeciesCategory.class, 1); } @Test @@ -140,7 +140,7 @@ List<CsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, 396990); + assertCsvImportResult(result, 0, Result.class, 396990); } @Test @@ -169,10 +169,10 @@ List<CsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, 68108); - assertCsvImportResult(result.get(0), Category.class, 129); - assertCsvImportResult(result.get(0), SpeciesCategory.class, 129); - assertCsvImportResult(result.get(0), SizeCategory.class, 62); + assertCsvImportResult(result, 0, Result.class, 68108); + assertCsvImportResult(result, 0, Category.class, 129); + assertCsvImportResult(result, 0, SpeciesCategory.class, 129); + assertCsvImportResult(result, 0, SizeCategory.class, 62); } @Test @@ -204,11 +204,10 @@ List<CsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); - CsvFileImportResult actual = result.get(0); - assertCsvImportResult(actual, Result.class, 10021); - assertCsvImportResult(actual, AgeCategory.class, 10); - assertCsvImportResult(actual, Category.class, 14); - assertCsvImportResult(actual, SpeciesCategory.class, 14); + assertCsvImportResult(result, 0, Result.class, 10021); + assertCsvImportResult(result, 0, AgeCategory.class, 10); + assertCsvImportResult(result, 0, Category.class, 14); + assertCsvImportResult(result, 0, SpeciesCategory.class, 14); } protected void addMissingEsduCells(String voyageId, Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -74,12 +74,12 @@ //TODO Use this //prepareInputFile(conf.getMapResultFile(), getImportPath("mapResults.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, ResultsMapCellImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsMapCellImportService.class, 1); - assertCsvImportResult(result.get(0), Cell.class, 0); - assertCsvImportResult(result.get(0), Data.class, 0); - assertCsvImportResult(result.get(1), Result.class, 0); + assertCsvImportResult(result, 0, Cell.class, 0); + assertCsvImportResult(result, 0, Data.class, 0); +// assertCsvImportResult(result,1, Result.class, 0); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -77,10 +77,10 @@ List<CsvFileImportResult> result; result = doImport(conf, ResultsRegionCellImportService.class, 1); - assertCsvImportResult(result.get(0), Cell.class, 228); - assertCsvImportResult(result.get(0), Data.class, 228 * 4); - //assertCsvImportResult(result.get(1), Result.class, 0); - //assertCsvImportResult(result.get(2), Result.class, 0); + assertCsvImportResult(result, 0, Cell.class, 228); + assertCsvImportResult(result, 0, Data.class, 228 * 4); + //assertCsvImportResult(result,1, Result.class, 0); + //assertCsvImportResult(result,2, Result.class, 0); } } \ No newline at end of file Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 23:21:55 UTC (rev 421) @@ -72,16 +72,12 @@ getImportPath("lengthWeightKey.csv.gz")); prepareInputFile(conf.getEchotypeFile(), getImportPath("echotype.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, ResultsVoyageImportService.class, 3); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsVoyageImportService.class, 3); - assertCsvImportResult(result.get(0), LengthAgeKey.class, - NB_LENGTH_AGE_KEY); - assertCsvImportResult(result.get(1), LengthWeightKey.class, - NB_LENGTH_WEIGHT_KEY); - assertCsvImportResult(result.get(2), Echotype.class, - NB_ECHOTYPE); - + assertCsvImportResult(result, 0, LengthAgeKey.class, NB_LENGTH_AGE_KEY); + assertCsvImportResult(result, 1, LengthWeightKey.class, NB_LENGTH_WEIGHT_KEY); + assertCsvImportResult(result, 2, Echotype.class, NB_ECHOTYPE); } @Ignore @@ -103,11 +99,10 @@ prepareInputFile(conf.getLengthAgeKeyFile(), getImportPath("lengthAgeKey.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, ResultsVoyageImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsVoyageImportService.class, 1); - assertCsvImportResult(result.get(0), LengthAgeKey.class, - NB_LENGTH_AGE_KEY); + assertCsvImportResult(result, 0, LengthAgeKey.class, NB_LENGTH_AGE_KEY); } @Ignore @@ -129,12 +124,10 @@ prepareInputFile(conf.getLengthWeightKeyFile(), getImportPath("lengthWeightKey.csv.gz")); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsVoyageImportService.class, 1); - List<CsvFileImportResult> result = doImport( - conf, ResultsVoyageImportService.class, 1); - - assertCsvImportResult(result.get(0), LengthWeightKey.class, - NB_LENGTH_WEIGHT_KEY); + assertCsvImportResult(result, 0, LengthWeightKey.class, NB_LENGTH_WEIGHT_KEY); } @Ignore @@ -155,11 +148,10 @@ prepareInputFile(conf.getEchotypeFile(), getImportPath("echotype.csv.gz")); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsVoyageImportService.class, 1); - List<CsvFileImportResult> result = doImport( - conf, ResultsVoyageImportService.class, 1); - - assertCsvImportResult(result.get(0), Echotype.class, NB_ECHOTYPE); + assertCsvImportResult(result, 0, Echotype.class, NB_ECHOTYPE); } } \ No newline at end of file

1 0

r420 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase/csv echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/configurations echobase-services/src/main/java/fr/ifremer/echobase/services/csv echobase-services/src/main/java/fr/ifremer/echobase/services/importdata echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv echobase-services/src/main/resources/i18n echobase-services/src/test/j
by tchemit＠users.forge.codelutin.com March 27, 2012

March 27, 2012

Author: tchemit Date: 2012-03-28 01:02:51 +0200 (Wed, 28 Mar 2012) New Revision: 420 Url: http://forge.codelutin.com/repositories/revision/echobase/420 Log: Last big refactor :( - move all importData to his own place - remove configurations and csv package from services one - uniformize esdu result import name (remove the acoustic prefix) - make all result import works :) - reformat everything Voila. Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EntityCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressionModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CellPositionReference.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/VoyageImportModel.java trunk/echobase-services/src/test/resources/import-data/result/esdu/ trunk/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/map/ trunk/echobase-services/src/test/resources/import-data/result/region/ trunk/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz trunk/echobase-services/src/test/resources/import-data/result/voyage/ trunk/echobase-services/src/test/resources/import-data/result/voyage/echotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthAgeKey.csv.gz trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthWeightKey.csv.gz trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotype-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotypeAndSpeciesCategory-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndAgeCategory-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndSizeCategory-validation.xml Removed: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AcousticDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CellPositionReference.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/DefaultProgressionModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/OperationImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ProgressionModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModelRow.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/EntityAssociationExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModelRow.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/main/java/fr/ifremer/echobase/services/csv/MapImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/VoyageImportModel.java trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotypeAndSpeciesCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndAgeCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndSizeCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz trunk/echobase-services/src/test/resources/import-data/result/regions.csv.gz trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AcousticInstrumentLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AgeCategoryLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AreaOfOperationLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellMethodLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataQualityLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeCategoryLoader.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/EntityLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearLoader.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/MissionLoader.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/ReferenceDatumLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumTypeLoader.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/main/java/fr/ifremer/echobase/tools/loaders/SpeciesLoader.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/TSParametersLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperation.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperation.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResults.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl trunk/echobase-ui/src/main/resources/template/simple/myradiomap.ftl trunk/echobase-ui/src/main/resources/validators.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp Copied: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EntityCsvModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java) =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EntityCsvModel.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EntityCsvModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,254 @@ +/* + * #%L + * EchoBase :: Entities + * + * $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.csv; + +import com.google.common.base.Function; +import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.entities.meta.TableMeta; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.csv.ValueFormatter; +import org.nuiton.util.decorator.Decorator; + +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.Map; + +/** + * A model to import / export entities into csv files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EntityCsvModel<E extends TopiaEntity> extends AbstractImportExportModel<E> { + + protected final TableMeta tableMeta; + + public static <E extends TopiaEntity> EntityCsvModel<E> newModel( + char separator, + TableMeta tableMeta + ) { + return new EntityCsvModel<E>(separator, tableMeta); + } + + public static <E extends TopiaEntity> EntityCsvModel<E> newModel( + char separator, + TableMeta tableMeta, + String idHeader + ) { + return new EntityCsvModel<E>(separator, tableMeta, idHeader); + } + + @Override + public E newEmptyInstance() { + return (E) tableMeta.newEntity(); + } + + public void addForeignKeyForExport(String propertyName, + Class<TopiaEntity> entityType) { + + Map<String, TopiaEntity> universe = Collections.emptyMap(); + + newColumnForExport( + propertyName, + EchobaseCsvUtil.newForeignKeyValue(entityType, + propertyName, + universe) + ); + } + + public <T> void addDecoratedForeignKeyForExport(String headerName, String propertyName, Decorator<T> decorator) { + modelBuilder.newColumnForExport(headerName, propertyName, + new ForeignKeyDecoratedValue<T>(decorator)); + } + + public <E extends TopiaEntity> void addForeignKeyForImport(String headerName, + String propertyName, + Class<E> entityType, + Collection<E> entities, + Function<E, String> transform) { + + Map<String, E> universe = Maps.uniqueIndex(entities, transform); + + newMandatoryColumn( + headerName, + propertyName, + EchobaseCsvUtil.newForeignKeyValue(entityType, + propertyName, + universe) + ); + } + + public <E extends TopiaEntity> void addForeignKeyForAssociationForImport(String headerName, + String propertyName, + Class<E> entityType, + Collection<E> entities, + Function<E, String> transform) { + + Map<String, E> universe = Maps.uniqueIndex(entities, transform); + + newMandatoryColumn( + headerName, + propertyName, + EchobaseCsvUtil.newForeignKeyValueAssociation(entityType, + propertyName, + universe) + ); + } + + public <E extends TopiaEntity> void addForeignKeyForImport(String propertyName, + Class<E> entityType, + Collection<E> entities) { + + Map<String, E> universe = Maps.uniqueIndex( + entities, EchoBaseFunctions.TO_TOPIAID); + + newMandatoryColumn( + propertyName, + EchobaseCsvUtil.newForeignKeyValue(entityType, + propertyName, + universe) + ); + } + + public void addDefaultColumn(String propertyName, + Class<?> type) { + addDefaultColumn(propertyName, propertyName, type); + } + + public void addDefaultColumn(String headerName, + String propertyName, + Class<?> type) { + + if (Date.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.DAY_TIME_SECOND_WITH_TIMESTAMP + ); + } else if (double.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.DOUBLE_PRIMITIVE + ); + } else if (Double.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.DOUBLE + ); + } else if (long.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.PRIMITIVE_LONG + ); + } else if (Long.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.LONG + ); + } else if (float.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.PRIMITIVE_FLOAT + ); + } else if (Float.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.FLOAT + ); + } else if (int.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.PRIMITIVE_INTEGER + ); + } else if (Integer.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.INTEGER + ); + } else if (boolean.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.PRIMITIVE_BOOLEAN + ); + } else if (Boolean.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName, + EchobaseCsvUtil.BOOLEAN + ); + } else { + + // string + newColumnForImportExport( + headerName, + propertyName + ); + } + } + + public static class ForeignKeyDecoratedValue<E> implements ValueFormatter<E> { + + protected final Decorator<E> decorator; + + public ForeignKeyDecoratedValue(Decorator<E> decorator) { + this.decorator = decorator; + } + + @Override + public String format(E e) { + String value = ""; + if (e != null) { + value = decorator.toString(e); + } + return value; + } + } + + protected EntityCsvModel(char separator, + TableMeta tableMeta) { + super(separator); + this.tableMeta = tableMeta; + } + + protected EntityCsvModel(char separator, + TableMeta tableMeta, + String idHeader) { + this(separator, tableMeta); + newColumnForImportExport( + idHeader, + TopiaEntity.TOPIA_ID + ); + } +} \ No newline at end of file Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EntityCsvModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,197 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services; + +import org.nuiton.util.StringUtil; + +import java.io.IOException; +import java.io.Serializable; + +/** + * Abstract long action configuration. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public abstract class AbstractEchobaseActionConfiguration implements Serializable, ProgressionModel { + + private static final long serialVersionUID = 1L; + + private final ProgressionModel progressionModel; + + private Exception error; + + protected AbstractEchobaseActionConfiguration() { + progressionModel = new DefaultProgressionModel(); + } + + protected AbstractEchobaseActionConfiguration(ProgressionModel progressionModel) { + this.progressionModel = progressionModel; + } + + @Override + public final long getNbSteps() { + return progressionModel.getNbSteps(); + } + + @Override + public final float getProgression() { + return progressionModel.getProgression(); + } + + @Override + public final void setProgression(float progression) { + progressionModel.setProgression(progression); + } + + @Override + public final void incrementsProgression() { + progressionModel.incrementsProgression(); + } + + @Override + public final void setNbSteps(long nbSteps) { + progressionModel.setNbSteps(nbSteps); + } + + @Override + public final long getStartTime() { + return progressionModel.getStartTime(); + } + + @Override + public final void setStartTime(long startTime) { + progressionModel.setStartTime(startTime); + } + + @Override + public final long getEndTime() { + return progressionModel.getEndTime(); + } + + @Override + public final void setEndTime(long endTime) { + progressionModel.setEndTime(endTime); + } + + public Exception getError() { + return error; + } + + public void setError(Exception error) { + this.error = error; + } + + @Override + public String getActionTime() { + return progressionModel.getActionTime(); + } + + public void beginAction() { + setStartTime(System.nanoTime()); + } + + public void endAction() { + setEndTime(System.nanoTime()); + } + + public void destroy() throws IOException { + } + + /** + * Default progression model implementation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ + public static class DefaultProgressionModel implements ProgressionModel { + + private static final long serialVersionUID = 1L; + + private long nbSteps; + + private float stepIncrement; + + private float progression; + + private long startTime; + + private long endTime; + + @Override + public long getNbSteps() { + return nbSteps; + } + + @Override + public float getProgression() { + return progression; + } + + @Override + public void setProgression(float progression) { + this.progression = progression; + } + + @Override + public long getStartTime() { + return startTime; + } + + @Override + public void setStartTime(long startTime) { + this.startTime = startTime; + } + + @Override + public long getEndTime() { + return endTime; + } + + + @Override + public void setEndTime(long endTime) { + this.endTime = endTime; + } + + @Override + public final void incrementsProgression() { + setProgression(progression + stepIncrement); + } + + @Override + public final void setNbSteps(long nbSteps) { + + this.nbSteps = nbSteps; + stepIncrement = 100f / nbSteps; + } + + @Override + public String getActionTime() { + long sTime = getStartTime(); + long eTime = getEndTime(); + return StringUtil.convertTime(eTime - sTime); + } + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -27,13 +27,13 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EntityModificationLog; import fr.ifremer.echobase.entities.meta.ColumnMeta; import fr.ifremer.echobase.entities.meta.DbMeta; import fr.ifremer.echobase.entities.meta.TableMeta; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,103 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services; + +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; + +/** + * Configuration of a embedded application creation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EmbeddedApplicationConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + /** File name of the embedded application archive (without the zip extension). */ + private String fileName; + + /** Working directory where to generate the archive of embedded application. */ + private File workingDirectory; + + /** Embedded application archive file. */ + private File embeddedApplicationFile; + + /** Location of the war file to push in embedded application. */ + private File warLocation; + + /** Ids of voyages to push in embedded application (with all their datas). */ + private String[] voyageIds; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + public File getEmbeddedApplicationFile() { + return embeddedApplicationFile; + } + + public void setEmbeddedApplicationFile(File embeddedApplicationFile) { + this.embeddedApplicationFile = embeddedApplicationFile; + } + + public String[] getVoyageIds() { + return voyageIds; + } + + public void setVoyageIds(String[] voyageIds) { + this.voyageIds = Arrays.copyOf(voyageIds, voyageIds.length); + } + + public File getWarLocation() { + return warLocation; + } + + public void setWarLocation(File warLocation) { + this.warLocation = warLocation; + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -31,9 +31,6 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EntitiesUtil; import fr.ifremer.echobase.entities.ExportQuery; -import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; -import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; -import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; import fr.ifremer.echobase.services.exceptions.ExportQueryNameAlreadyExistException; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,96 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services; + +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; + +/** + * Configuration of a complete db export. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ExportDbConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + private String fileName; + + private File workingDirectory; + + private File exportFile; + + /** Ids of voyages to push in embedded application (with all their datas). */ + private String[] voyageIds; + + public ExportDbConfiguration() { + } + + public ExportDbConfiguration(ProgressionModel progressionModel) { + super(progressionModel); + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + public File getExportFile() { + return exportFile; + } + + public void setExportFile(File exportFile) { + this.exportFile = exportFile; + } + + public String[] getVoyageIds() { + return voyageIds; + } + + public void setVoyageIds(String... voyageIds) { + this.voyageIds = voyageIds; + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } + +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -31,7 +31,6 @@ 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.services.configurations.ExportDbConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -25,10 +25,11 @@ import com.google.common.base.Charsets; import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.csv.AbstractExportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; import fr.ifremer.echobase.entities.ExportQueryImpl; -import fr.ifremer.echobase.services.csv.ExportQueryCsvModel; import fr.ifremer.echobase.services.exceptions.ExportQueryNameAlreadyExistException; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -295,4 +296,24 @@ } } + + /** + * Csv model to export sql in {@link ExportQueryService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ + public static class ExportQueryCsvModel extends AbstractExportModel<Map<String, Object>> { + + public ExportQueryCsvModel(char separator, String[] columnHeaders) { + super(separator); + for (String columnHeader : columnHeaders) { + newColumnForExport( + columnHeader, + EchobaseCsvUtil.TO_STRING_FORMATTER + ); + } + } + + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -25,11 +25,12 @@ import com.google.common.base.Charsets; import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.csv.AbstractExportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.ColumnMeta; import fr.ifremer.echobase.entities.meta.TableMeta; -import fr.ifremer.echobase.services.csv.EntityAssociationExportModel; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; @@ -173,4 +174,37 @@ ExportModel<TopiaEntity> model = buildForExport(associationMeta); return Export.newExport(model, datas); } + + /** + * A model to export associations of entities into csv files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ + public static class EntityAssociationExportModel<E extends TopiaEntity> extends AbstractExportModel<E> { + + protected final AssociationMeta meta; + + public static <E extends TopiaEntity> ExportModel<E> newExportModel(char separator, + AssociationMeta meta + ) { + EntityAssociationExportModel<E> model = new EntityAssociationExportModel<E>( + separator, + meta); + + // topiaId <-> topiaId + model.newColumnForExport(TopiaEntity.TOPIA_ID); + + model.newColumnForExport( + meta.getName(), + EchobaseCsvUtil.newAssociationValueFormatter() + ); + return model; + } + + protected EntityAssociationExportModel(char separator, AssociationMeta meta) { + super(separator); + this.meta = meta; + } + } } Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,78 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services; + +import fr.ifremer.echobase.InputFile; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Configuration of a import db operation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ImportDbConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + protected File workingDirectory; + + protected final InputFile input; + + public ImportDbConfiguration(ProgressionModel progressionModel, + Locale locale) { + super(progressionModel); + input = InputFile.newFile(l_(locale, "echobase.common.importDbFile")); + } + + public ImportDbConfiguration(Locale locale) { + input = InputFile.newFile(l_(locale, "echobase.common.importDbFile")); + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public InputFile getInput() { + return input; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -33,7 +33,6 @@ 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.services.configurations.ImportDbConfiguration; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,14 +24,15 @@ package fr.ifremer.echobase.services; import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.csv.AbstractImportModel; import fr.ifremer.echobase.csv.CsvImportResult; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.ColumnMeta; import fr.ifremer.echobase.entities.meta.TableMeta; -import fr.ifremer.echobase.services.csv.EntityAssociationImportModel; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; @@ -145,4 +146,49 @@ } return result; } + + /** + * A model to import associations of entities into csv files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ + public static class EntityAssociationImportModel extends AbstractImportModel<Map<String, Object>> { + + protected final AssociationMeta meta; + + public static ImportModel<Map<String, Object>> newImportModel(char separator, + AssociationMeta meta + ) { + EntityAssociationImportModel model = new EntityAssociationImportModel( + separator, meta); + + // topiaId <-> topiaId + model.newMandatoryColumn( + TopiaEntity.TOPIA_ID, + EchobaseCsvUtil.<Map<String, Object>, String>newMapProperty(TopiaEntity.TOPIA_ID) + ); + + // add association -> target + model.newMandatoryColumn( + meta.getName(), + EchobaseCsvUtil.ASSOCIATION_VALUE_PARSER, + EchobaseCsvUtil.<Map<String, Object>, String[]>newMapProperty("target") + ); + + return model; + } + + @Override + public Map<String, Object> newEmptyInstance() { + return null; + } + + protected EntityAssociationImportModel(char separator, + AssociationMeta meta) { + super(separator); + this.meta = meta; + } + + } } Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressionModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ProgressionModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressionModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressionModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,55 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services; + +import java.io.Serializable; + +/** + * Cotnract for a progression model while long service actions. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public interface ProgressionModel extends Serializable { + + long getNbSteps(); + + float getProgression(); + + void setProgression(float progression); + + void incrementsProgression(); + + void setNbSteps(long nbSteps); + + long getStartTime(); + + void setStartTime(long startTime); + + long getEndTime(); + + void setEndTime(long endTime); + + String getActionTime(); +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressionModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,119 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import java.io.IOException; -import java.io.Serializable; - -/** - * Abstract long action configuration. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public abstract class AbstractEchobaseActionConfiguration implements Serializable, ProgressionModel { - - private static final long serialVersionUID = 1L; - - private final ProgressionModel progressionModel; - - private Exception error; - - protected AbstractEchobaseActionConfiguration() { - progressionModel = new DefaultProgressionModel(); - } - - protected AbstractEchobaseActionConfiguration(ProgressionModel progressionModel) { - this.progressionModel = progressionModel; - } - - @Override - public final long getNbSteps() { - return progressionModel.getNbSteps(); - } - - @Override - public final float getProgression() { - return progressionModel.getProgression(); - } - - @Override - public final void setProgression(float progression) { - progressionModel.setProgression(progression); - } - - @Override - public final void incrementsProgression() { - progressionModel.incrementsProgression(); - } - - @Override - public final void setNbSteps(long nbSteps) { - progressionModel.setNbSteps(nbSteps); - } - - @Override - public final long getStartTime() { - return progressionModel.getStartTime(); - } - - @Override - public final void setStartTime(long startTime) { - progressionModel.setStartTime(startTime); - } - - @Override - public final long getEndTime() { - return progressionModel.getEndTime(); - } - - @Override - public final void setEndTime(long endTime) { - progressionModel.setEndTime(endTime); - } - - public Exception getError() { - return error; - } - - public void setError(Exception error) { - this.error = error; - } - - @Override - public String getActionTime() { - return progressionModel.getActionTime(); - } - - public void beginAction() { - setStartTime(System.nanoTime()); - } - - public void endAction() { - setEndTime(System.nanoTime()); - } - - public void destroy() throws IOException { - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractImportConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,66 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.EchoBaseIOUtil; -import fr.ifremer.echobase.InputFile; - -import java.io.File; - -/** - * Common import data configuration. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public abstract class AbstractImportConfiguration extends AbstractEchobaseActionConfiguration { - - private static final long serialVersionUID = 1L; - - protected File workingDirectory; - - public File getWorkingDirectory() { - return workingDirectory; - } - - public void setWorkingDirectory(File workingDirectory) { - this.workingDirectory = workingDirectory; - } - - public abstract InputFile[] getInputFiles(); - - public long computeNbSteps() { - long result = 0; - for (InputFile inputFile : getInputFiles()) { - - if (inputFile.hasFile()) { - int currentLines = EchoBaseIOUtil.countLines( - inputFile.getFile()); - result += currentLines; - } - } - setNbSteps(result); - return result; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AcousticDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AcousticDataImportConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AcousticDataImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,267 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.InputFile; - -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Configuration of a "accoustic datas" import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticDataImportConfiguration extends AbstractImportConfiguration { - - private static final long serialVersionUID = 1L; - - /** Selected voyage id where to import datas. */ - protected String voyageId; - - /** Selected vessel id to find out transect where to import datas. */ - protected String vesselId; - - /** Flag to always add new dataAcquisition when a new instrument is found in movies file. */ - protected boolean addDataAcquisition = true; - - /** Manual transceiverAcquisitionAbsorptionDescription. */ - protected String transceiverAcquisitionAbsorptionDescription = "(i) Equation: Francois and garrison 1982,(ii) CTD, (iii) nominal value for entire data set"; - - /** Manual acquisitionSoftwareVersion (ER60 instrument). */ - protected String acquisitionSoftwareVersionER60; - - /** Manual acquisitionSoftwareVersion (ME70 instrument). */ - protected String acquisitionSoftwareVersionME70; - - /** Manual loggedDataFormat. */ - protected String loggedDataFormat = ".hac and .raw formats"; - - /** Manual loggedDataDatatype. */ - protected String loggedDataDatatype = "‘raw’ digitisation samples"; - - /** Manual pingDutyCycle. */ - protected String pingDutyCycle = "Ifremer's standard ping duty cycle"; - -// /** Manual echosounderSoundSpeed. */ -// protected String echosounderSoundSpeed = "Variable"; - - /** Manual soundSpeedCalculations (ER60 instrument). */ - protected String soundSpeedCalculationsER60 = "(i) Equation: Mackenzie (1980), (ii) CTD, (iii) nominal value for entire data set"; - - /** Manual soundSpeedCalculations (ME70 instrument). */ - protected String soundSpeedCalculationsME70 = "(i) Equation: Mackenzie (1980), (ii) Hull-mounted thermosalinometer, (iii) surface absorption value recomputed every 30s and applied to the entire data set"; - - /** Manual sounderConstant. */ - protected String sounderConstant = "NA"; - - /** Manual processingTemplate. */ - protected String processingTemplate; - - /** Manual processingDescription. */ - protected String processingDescription; - - /** Manual digitThreshold. */ - protected float digitThreshold = -100f; - - /** Manual acousticDensityUnit. */ - protected String acousticDensityUnit = "sA"; - - /** Manual notes. */ - protected String notes; - - /** Cell position reference for esdu cell datas. */ - protected CellPositionReference cellPositionReference; - - /** Movies file to import. */ - protected final InputFile moviesFile; - - - public AcousticDataImportConfiguration(Locale locale) { - moviesFile = InputFile.newFile(l_(locale, "echobase.common.moviesFile")); - } - - public String getVoyageId() { - return voyageId; - } - - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; - } - - public String getVesselId() { - return vesselId; - } - - public void setVesselId(String vesselId) { - this.vesselId = vesselId; - } - - public boolean isAddDataAcquisition() { - return addDataAcquisition; - } - - public void setAddDataAcquisition(boolean addDataAcquisition) { - this.addDataAcquisition = addDataAcquisition; - } - - public String getTransceiverAcquisitionAbsorptionDescription() { - return transceiverAcquisitionAbsorptionDescription; - } - - public void setTransceiverAcquisitionAbsorptionDescription(String transceiverAcquisitionAbsorptionDescription) { - this.transceiverAcquisitionAbsorptionDescription = transceiverAcquisitionAbsorptionDescription; - } - - public String getAcquisitionSoftwareVersionER60() { - return acquisitionSoftwareVersionER60; - } - - public void setAcquisitionSoftwareVersionER60(String acquisitionSoftwareVersionER60) { - this.acquisitionSoftwareVersionER60 = acquisitionSoftwareVersionER60; - } - - public String getAcquisitionSoftwareVersionME70() { - return acquisitionSoftwareVersionME70; - } - - public void setAcquisitionSoftwareVersionME70(String acquisitionSoftwareVersionME70) { - this.acquisitionSoftwareVersionME70 = acquisitionSoftwareVersionME70; - } - - public String getLoggedDataFormat() { - return loggedDataFormat; - } - - public void setLoggedDataFormat(String loggedDataFormat) { - this.loggedDataFormat = loggedDataFormat; - } - - public String getLoggedDataDatatype() { - return loggedDataDatatype; - } - - public void setLoggedDataDatatype(String loggedDataDatatype) { - this.loggedDataDatatype = loggedDataDatatype; - } - - public String getPingDutyCycle() { - return pingDutyCycle; - } - - public void setPingDutyCycle(String pingDutyCycle) { - this.pingDutyCycle = pingDutyCycle; - } - -// public String getEchosounderSoundSpeed() { -// return echosounderSoundSpeed; -// } -// -// public void setEchosounderSoundSpeed(String echosounderSoundSpeed) { -// this.echosounderSoundSpeed = echosounderSoundSpeed; -// } - - public String getSoundSpeedCalculationsER60() { - return soundSpeedCalculationsER60; - } - - public void setSoundSpeedCalculationsER60(String soundSpeedCalculationsER60) { - this.soundSpeedCalculationsER60 = soundSpeedCalculationsER60; - } - - public String getSoundSpeedCalculationsME70() { - return soundSpeedCalculationsME70; - } - - public void setSoundSpeedCalculationsME70(String soundSpeedCalculationsME70) { - this.soundSpeedCalculationsME70 = soundSpeedCalculationsME70; - } - - public String getSounderConstant() { - return sounderConstant; - } - - public void setSounderConstant(String sounderConstant) { - this.sounderConstant = sounderConstant; - } - - public float getDigitThreshold() { - return digitThreshold; - } - - public void setDigitThreshold(float digitThreshold) { - this.digitThreshold = digitThreshold; - } - - public String getAcousticDensityUnit() { - return acousticDensityUnit; - } - - public void setAcousticDensityUnit(String acousticDensityUnit) { - this.acousticDensityUnit = acousticDensityUnit; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public InputFile getMoviesFile() { - return moviesFile; - } - - public String getProcessingTemplate() { - return processingTemplate; - } - - public void setProcessingTemplate(String processingTemplate) { - this.processingTemplate = processingTemplate; - } - - public String getProcessingDescription() { - return processingDescription; - } - - public void setProcessingDescription(String processingDescription) { - this.processingDescription = processingDescription; - } - - public CellPositionReference getCellPositionReference() { - return cellPositionReference; - } - - public void setCellPositionReference(CellPositionReference cellPositionReference) { - this.cellPositionReference = cellPositionReference; - } - - @Override - public InputFile[] getInputFiles() { - return new InputFile[]{moviesFile}; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,87 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.InputFile; - -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Configuration of a "catches data import". - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class CatchesDataImportConfiguration extends AbstractImportConfiguration { - - private static final long serialVersionUID = 1L; - - /** Selected voyage id where to import datas. */ - protected String voyageId; - - /** Sample file to import. */ - protected final InputFile totalSampleFile; - - /** Sub sample file to import. */ - protected final InputFile subSampleFile; - - /** Biometry sample file to import. */ - protected final InputFile biometrySampleFile; - - public CatchesDataImportConfiguration(Locale locale) { - totalSampleFile = InputFile.newFile( - l_(locale, "echobase.common.totalSampleFile")); - subSampleFile = InputFile.newFile( - l_(locale, "echobase.common.subSampleFile")); - biometrySampleFile = InputFile.newFile( - l_(locale, "echobase.common.biometrySampleFile")); - } - - public String getVoyageId() { - return voyageId; - } - - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; - } - - public InputFile getTotalSampleFile() { - return totalSampleFile; - } - - public InputFile getSubSampleFile() { - return subSampleFile; - } - - public InputFile getBiometrySampleFile() { - return biometrySampleFile; - } - - @Override - public InputFile[] getInputFiles() { - return new InputFile[]{totalSampleFile, subSampleFile, biometrySampleFile}; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CellPositionReference.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CellPositionReference.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CellPositionReference.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,74 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.I18nAble; - -import static org.nuiton.i18n.I18n.n_; - -/** - * To define cell position reference in acoustic import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public enum CellPositionReference implements I18nAble { - - /** Begin. */ - START(n_("echobase.common.cellPositionReference.start")) { - @Override - public String getMetadataNameSuffix() { - return "Start"; - } - }, - - /** Mid. */ - MID(n_("echobase.common.cellPositionReference.mid")) { - @Override - public String getMetadataNameSuffix() { - return "Bary"; - } - }, - - /** End. */ - END(n_("echobase.common.cellPositionReference.end")) { - @Override - public String getMetadataNameSuffix() { - return "End"; - } - }; - - private final String i18nKey; - - CellPositionReference(String i18nKey) { - this.i18nKey = i18nKey; - } - - @Override - public String getI18nKey() { - return i18nKey; - } - - public abstract String getMetadataNameSuffix(); -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,186 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.InputFile; - -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Configuration of a "common data complete" import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class CommonDataImportConfiguration extends AbstractImportConfiguration { - - private static final long serialVersionUID = 1L; - - /** Selected import mode. */ - protected CommonDataImportMode importMode; - - /** Selected mission id to use in voyage. */ - protected String missionId; - - /** Selected voyage id to use (in mode 2). */ - protected String voyageId; - - /** Selected area of operation to use for voyage. */ - protected String areaOfOperationId; - - /** Manual description of voyage. */ - protected String voyageDescription; - - /** transit related activity. */ - protected String transitRelatedActivity; - - /** transect license. */ - protected String transectLicence; - - /** transect geospatialVerticalPositive. */ - protected String transectGeospatialVerticalPositive = "down"; - - /** transect binUnitsPingAxis. */ - protected String transectBinUnitsPingAxis = "1 nautical mile"; - - /** Manual datum to use in voyage. */ - protected String datum = "WGS84"; - - /** Voyage file to import. */ - protected final InputFile voyageFile; - - /** Transit file to import. */ - protected final InputFile transitFile; - - /** Transect file to import. */ - protected final InputFile transectFile; - - public CommonDataImportConfiguration(Locale locale) { - voyageFile = InputFile.newFile( - l_(locale, "echobase.common.voyageFile")); - transitFile = InputFile.newFile( - l_(locale, "echobase.common.transitFile")); - transectFile = InputFile.newFile( - l_(locale, "echobase.common.transectFile")); - } - - public CommonDataImportMode getImportMode() { - return importMode; - } - - public void setImportMode(CommonDataImportMode importMode) { - this.importMode = importMode; - } - - public String getMissionId() { - return missionId; - } - - public void setMissionId(String missionId) { - this.missionId = missionId; - } - - public String getAreaOfOperationId() { - return areaOfOperationId; - } - - public void setAreaOfOperationId(String areaOfOperationId) { - this.areaOfOperationId = areaOfOperationId; - } - - public String getVoyageId() { - return voyageId; - } - - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; - } - - public String getVoyageDescription() { - return voyageDescription; - } - - public void setVoyageDescription(String voyageDescription) { - this.voyageDescription = voyageDescription; - } - - public String getDatum() { - return datum; - } - - public void setDatum(String datum) { - this.datum = datum; - } - - public String getTransitRelatedActivity() { - return transitRelatedActivity; - } - - public void setTransitRelatedActivity(String transitRelatedActivity) { - this.transitRelatedActivity = transitRelatedActivity; - } - - public String getTransectLicence() { - return transectLicence; - } - - public void setTransectLicence(String transectLicence) { - this.transectLicence = transectLicence; - } - - public String getTransectGeospatialVerticalPositive() { - return transectGeospatialVerticalPositive; - } - - public void setTransectGeospatialVerticalPositive(String transectGeospatialVerticalPositive) { - this.transectGeospatialVerticalPositive = transectGeospatialVerticalPositive; - } - - public String getTransectBinUnitsPingAxis() { - return transectBinUnitsPingAxis; - } - - public void setTransectBinUnitsPingAxis(String transectBinUnitsPingAxis) { - this.transectBinUnitsPingAxis = transectBinUnitsPingAxis; - } - - public InputFile getVoyageFile() { - return voyageFile; - } - - public InputFile getTransitFile() { - return transitFile; - } - - public InputFile getTransectFile() { - return transectFile; - } - - @Override - public InputFile[] getInputFiles() { - return new InputFile[]{voyageFile, transitFile, transectFile}; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportMode.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportMode.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,54 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.I18nAble; - -import static org.nuiton.i18n.I18n.n_; - -/** - * To define common data import mode. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public enum CommonDataImportMode implements I18nAble { - - /** Import Voyage / Transit / Transect. */ - ALL(n_("echobase.common.commonDataImportMode.all")), - - /** Import all common data from Transect to Operation. */ - TRANSECT(n_("echobase.common.commonDataImportMode.transect")); - - private final String i18nKey; - - CommonDataImportMode(String i18nKey) { - this.i18nKey = i18nKey; - } - - @Override - public String getI18nKey() { - return i18nKey; - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/DefaultProgressionModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/DefaultProgressionModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/DefaultProgressionModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,102 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import org.nuiton.util.StringUtil; - -/** - * Default progression model implementation. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class DefaultProgressionModel implements ProgressionModel { - - private static final long serialVersionUID = 1L; - - private long nbSteps; - - private float stepIncrement; - - private float progression; - - private long startTime; - - private long endTime; - - @Override - public long getNbSteps() { - return nbSteps; - } - - @Override - public float getProgression() { - return progression; - } - - @Override - public void setProgression(float progression) { - this.progression = progression; - } - - @Override - public long getStartTime() { - return startTime; - } - - @Override - public void setStartTime(long startTime) { - this.startTime = startTime; - } - - @Override - public long getEndTime() { - return endTime; - } - - - @Override - public void setEndTime(long endTime) { - this.endTime = endTime; - } - - @Override - public final void incrementsProgression() { - setProgression(progression + stepIncrement); - } - - @Override - public final void setNbSteps(long nbSteps) { - - this.nbSteps = nbSteps; - stepIncrement = 100f / nbSteps; - } - - @Override - public String getActionTime() { - long sTime = getStartTime(); - long eTime = getEndTime(); - return StringUtil.convertTime(eTime - sTime); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,103 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; -import java.util.Arrays; - -/** - * Configuration of a embedded application creation. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EmbeddedApplicationConfiguration extends AbstractEchobaseActionConfiguration { - - private static final long serialVersionUID = 1L; - - /** File name of the embedded application archive (without the zip extension). */ - private String fileName; - - /** Working directory where to generate the archive of embedded application. */ - private File workingDirectory; - - /** Embedded application archive file. */ - private File embeddedApplicationFile; - - /** Location of the war file to push in embedded application. */ - private File warLocation; - - /** Ids of voyages to push in embedded application (with all their datas). */ - private String[] voyageIds; - - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public File getWorkingDirectory() { - return workingDirectory; - } - - public void setWorkingDirectory(File workingDirectory) { - this.workingDirectory = workingDirectory; - } - - public File getEmbeddedApplicationFile() { - return embeddedApplicationFile; - } - - public void setEmbeddedApplicationFile(File embeddedApplicationFile) { - this.embeddedApplicationFile = embeddedApplicationFile; - } - - public String[] getVoyageIds() { - return voyageIds; - } - - public void setVoyageIds(String[] voyageIds) { - this.voyageIds = Arrays.copyOf(voyageIds, voyageIds.length); - } - - public File getWarLocation() { - return warLocation; - } - - public void setWarLocation(File warLocation) { - this.warLocation = warLocation; - } - - @Override - public void destroy() throws IOException { - if (workingDirectory != null) { - FileUtils.deleteDirectory(workingDirectory); - } - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,96 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; - -/** - * Configuration of a complete db export. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ExportDbConfiguration extends AbstractEchobaseActionConfiguration { - - private static final long serialVersionUID = 1L; - - private String fileName; - - private File workingDirectory; - - private File exportFile; - - /** Ids of voyages to push in embedded application (with all their datas). */ - private String[] voyageIds; - - public ExportDbConfiguration() { - } - - public ExportDbConfiguration(ProgressionModel progressionModel) { - super(progressionModel); - } - - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public File getWorkingDirectory() { - return workingDirectory; - } - - public void setWorkingDirectory(File workingDirectory) { - this.workingDirectory = workingDirectory; - } - - public File getExportFile() { - return exportFile; - } - - public void setExportFile(File exportFile) { - this.exportFile = exportFile; - } - - public String[] getVoyageIds() { - return voyageIds; - } - - public void setVoyageIds(String... voyageIds) { - this.voyageIds = voyageIds; - } - - @Override - public void destroy() throws IOException { - if (workingDirectory != null) { - FileUtils.deleteDirectory(workingDirectory); - } - } - -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,78 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.InputFile; -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Configuration of a import db operation. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ImportDbConfiguration extends AbstractEchobaseActionConfiguration { - - private static final long serialVersionUID = 1L; - - protected File workingDirectory; - - protected final InputFile input; - - public ImportDbConfiguration(ProgressionModel progressionModel, - Locale locale) { - super(progressionModel); - input = InputFile.newFile(l_(locale, "echobase.common.importDbFile")); - } - - public ImportDbConfiguration(Locale locale) { - input = InputFile.newFile(l_(locale, "echobase.common.importDbFile")); - } - - public File getWorkingDirectory() { - return workingDirectory; - } - - public InputFile getInput() { - return input; - } - - public void setWorkingDirectory(File workingDirectory) { - this.workingDirectory = workingDirectory; - } - - @Override - public void destroy() throws IOException { - if (workingDirectory != null) { - FileUtils.deleteDirectory(workingDirectory); - } - } - -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/OperationImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/OperationImportConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/OperationImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,89 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.InputFile; - -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Configuration of a "operation" import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class OperationImportConfiguration extends AbstractImportConfiguration { - - private static final long serialVersionUID = 1L; - - /** Selected voyage id where to import datas. */ - protected String voyageId; - - /** operation file to import. */ - protected final InputFile operationFile; - - /** operation metadatas file to import. */ - protected final InputFile operationMetadataFile; - - /** gear metadatas file to import. */ - protected final InputFile gearMetadataFile; - - public OperationImportConfiguration(Locale locale) { - operationFile = InputFile.newFile( - l_(locale, "echobase.common.operationFile")); - operationMetadataFile = InputFile.newFile( - l_(locale, "echobase.common.operationMetadataFile")); - gearMetadataFile = InputFile.newFile( - l_(locale, "echobase.common.gearMetadataFile")); - } - - public String getVoyageId() { - return voyageId; - } - - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; - } - - public InputFile getOperationFile() { - return operationFile; - } - - public InputFile getOperationMetadataFile() { - return operationMetadataFile; - } - - public InputFile getGearMetadataFile() { - return gearMetadataFile; - } - - @Override - public InputFile[] getInputFiles() { - return new InputFile[]{operationFile, - operationMetadataFile, - gearMetadataFile}; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ProgressionModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ProgressionModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ProgressionModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,55 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import java.io.Serializable; - -/** - * Cotnract for a progression model while long service actions. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public interface ProgressionModel extends Serializable { - - long getNbSteps(); - - float getProgression(); - - void setProgression(float progression); - - void incrementsProgression(); - - void setNbSteps(long nbSteps); - - long getStartTime(); - - void setStartTime(long startTime); - - long getEndTime(); - - void setEndTime(long endTime); - - String getActionTime(); -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportConfiguration.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,207 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.InputFile; - -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Configuration of a "results" import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ResultsImportConfiguration extends AbstractImportConfiguration { - - private static final long serialVersionUID = 1L; - - /** Selected voyage id where to import datas. */ - protected String voyageId; - - /** Selected vessel id to find out transect where to import datas. */ - protected String vesselId; - - /** resultLabel to store while importing acoustic result. */ - protected String resultLabel; - - /** Type of import. */ - protected ResultsImportMode importMode; - - /** Acoustic result by echotype import. */ - protected final InputFile acousticByEchotypeFile; - - /** Acoustic result by echotype and species category import. */ - protected final InputFile acousticByEchotypeAndSpeciesCategoryFile; - - /** Acoustic result by species and size category import. */ - protected final InputFile acousticBySpeciesAndSizeCategoryFile; - - /** Acoustic result by species and age category import. */ - protected final InputFile acousticBySpeciesAndAgeCategoryFile; - - /** Region file to import. */ - protected final InputFile regionsFile; - - /** Region cell associations file to import. */ - protected final InputFile regionAssociationFile; - - /** Region cell results file to import. */ - protected final InputFile regionResultFile; - - /** Map cells file to import. */ - protected final InputFile mapsFile; - - /** Map cell results file to import. */ - protected final InputFile mapResultFile; - - /** Echotype file to import. */ - protected final InputFile echotypeFile; - - /** LengthAgeKey file to import. */ - protected final InputFile lengthAgeKeyFile; - - /** LengthWeightKey file to import. */ - protected final InputFile lengthWeightKeyFile; - - public ResultsImportConfiguration(Locale locale) { - regionsFile = InputFile.newFile( - l_(locale, "echobase.common.cellRegionsFile")); - regionAssociationFile = InputFile.newFile( - l_(locale, "echobase.common.cellRegionAssociationFile")); - regionResultFile = InputFile.newFile( - l_(locale, "echobase.common.cellRegionResultFile")); - mapsFile = InputFile.newFile( - l_(locale, "echobase.common.cellMapsFile")); - mapResultFile = InputFile.newFile( - l_(locale, "echobase.common.cellMapResultFile")); - echotypeFile = InputFile.newFile( - l_(locale, "echobase.common.echotypeFile")); - lengthAgeKeyFile = InputFile.newFile( - l_(locale, "echobase.common.lengthAgeKeyFile")); - lengthWeightKeyFile = InputFile.newFile( - l_(locale, "echobase.common.lengthWeightKeyFile")); - acousticByEchotypeFile = InputFile.newFile( - l_(locale, "echobase.common.acousticByEchotypeFile")); - acousticByEchotypeAndSpeciesCategoryFile = InputFile.newFile( - l_(locale, "echobase.common.acousticByEchotypeAndSpeciesCategoryFile")); - acousticBySpeciesAndSizeCategoryFile = InputFile.newFile( - l_(locale, "echobase.common.acousticBySpeciesAndSizeCategoryFile")); - acousticBySpeciesAndAgeCategoryFile = InputFile.newFile( - l_(locale, "echobase.common.acousticBySpeciesAndAgeCategoryFile")); - } - - public String getVoyageId() { - return voyageId; - } - - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; - } - - public String getVesselId() { - return vesselId; - } - - public void setVesselId(String vesselId) { - this.vesselId = vesselId; - } - - public ResultsImportMode getImportMode() { - return importMode; - } - - public void setImportMode(ResultsImportMode importMode) { - this.importMode = importMode; - } - - public String getResultLabel() { - return resultLabel; - } - - public void setResultLabel(String resultLabel) { - this.resultLabel = resultLabel; - } - - public InputFile getRegionsFile() { - return regionsFile; - } - - public InputFile getRegionAssociationFile() { - return regionAssociationFile; - } - - public InputFile getRegionResultFile() { - return regionResultFile; - } - - public InputFile getMapsFile() { - return mapsFile; - } - - public InputFile getMapResultFile() { - return mapResultFile; - } - - public InputFile getEchotypeFile() { - return echotypeFile; - } - - public InputFile getLengthAgeKeyFile() { - return lengthAgeKeyFile; - } - - public InputFile getLengthWeightKeyFile() { - return lengthWeightKeyFile; - } - - public InputFile getAcousticByEchotypeFile() { - return acousticByEchotypeFile; - } - - public InputFile getAcousticByEchotypeAndSpeciesCategoryFile() { - return acousticByEchotypeAndSpeciesCategoryFile; - } - - public InputFile getAcousticBySpeciesAndSizeCategoryFile() { - return acousticBySpeciesAndSizeCategoryFile; - } - - public InputFile getAcousticBySpeciesAndAgeCategoryFile() { - return acousticBySpeciesAndAgeCategoryFile; - } - - @Override - public InputFile[] getInputFiles() { - return new InputFile[]{regionsFile, regionAssociationFile, regionResultFile, - mapsFile, mapResultFile, echotypeFile, - lengthAgeKeyFile, lengthWeightKeyFile, - acousticByEchotypeFile, - acousticByEchotypeAndSpeciesCategoryFile, - acousticBySpeciesAndSizeCategoryFile, - acousticBySpeciesAndAgeCategoryFile}; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportMode.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportMode.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,69 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.configurations; - -import fr.ifremer.echobase.I18nAble; - -import static org.nuiton.i18n.I18n.n_; - -/** - * To define results import mode. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public enum ResultsImportMode implements I18nAble { - - /** Import results at voyage level. */ - VOYAGE(n_("echobase.common.resultsImportMode.voyage")), - - /** Import cells Region. */ - REGION(n_("echobase.common.resultsImportMode.region")), - - /** Import cells Map. */ - MAP(n_("echobase.common.resultsImportMode.map")), - - /** Import acoustic results by echotype. */ - ACOUSTIC_BY_ECHOTYPE(n_("echobase.common.resultsImportMode.acoustic.byEchotype")), - - /** Import acoustic results by echotype and species category. */ - ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY(n_("echobase.common.resultsImportMode.acoustic.byEchotypeAndSpeciesCategory")), - - /** Import acoustic results by species and size category. */ - ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY(n_("echobase.common.resultsImportMode.acoustic.bySpeciesAndSizeCategory")), - - /** Import acoustic results by species and age category. */ - ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY(n_("echobase.common.resultsImportMode.acoustic.bySpeciesAndAgeCategory")); - - private final String i18nKey; - - ResultsImportMode(String i18nKey) { - this.i18nKey = i18nKey; - } - - @Override - public String getI18nKey() { - return i18nKey; - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,164 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Cell; -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.references.AcousticInstrument; - -import java.util.Map; - -/** - * To import acoustic datas (says {@link DataAcquisition}, - * {@link DataProcessing}, {@link Cell} and {@link Data}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticDataImportModel extends AbstractImportModel<AcousticDataImportModelRow> { - - - /* -ESDU Data - -Latitude MOVIES_EILayer\\cellset\\lat, OK -Longitude MOVIES_EILayer\\cellset\\long OK -depth MOVIES_EILayer\\shipnav\\depth OK -timeStart MOVIES_EILayer\\cellset\\datestart OK -timeEnd MOVIES_EILayer\\cellset\\dateend OK -NASC MOVIES_EILayer\\eilayer\\sa OK -Volume MOVIES_EILayer\\cellset\\volume OK -Surface MOVIES_EILayer\\cellset\\area OK -NumberOfSamplesRecorded MOVIES_EILayer\\cellset\\nt OK -NumberOfSamplesEchoIntegrated MOVIES_EILayer\\cellset\\ni"OK - - -Elementary Data - -Latitude MOVIES_EILayer\\cellset\\lat -Longitude MOVIES_EILayer\\cellset\\long -depthStart (surface ou bottom) MOVIES_EILayer\\cellset\\depthstart -depthEnd (surface ou bottom) MOVIES_EILayer\\cellset\\depthend -timeStart MOVIES_EILayer\\cellset\\datestart -timeEnd MOVIES_EILayer\\cellset\\dateend -NASC MOVIES_EILayer\\eilayer\\sa -Volume MOVIES_EILayer\\cellset\\volume -Surface MOVIES_EILayer\\cellset\\area -NumberOfSamplesRecorded MOVIES_EILayer\\cellset\\nt -NumberOfSamplesEchoIntegrated MOVIES_EILayer\\cellset\\ni -minEIthr MOVIES_EILayer\cellset\thresholdlow -maxEIthr MOVIES_EILayer\cellset\thresholdup - */ - public AcousticDataImportModel(char separator, - Map<String, AcousticInstrument> instrumentsById) { - super(separator); - - newMandatoryColumn("MOVIES_EILayer", AcousticDataImportModelRow.PROPERTY_EI_LAYER);//A - newIgnoredColumn("MOVIES_EILayer\\sndset");//B - newIgnoredColumn("MOVIES_EILayer\\sndset\\sndname");//C - newIgnoredColumn("MOVIES_EILayer\\sndset\\sndident");//D - newForeignKeyColumn("MOVIES_EILayer\\sndset\\softChannelId", AcousticDataImportModelRow.PROPERTY_ACOUSTIC_INSTRUMENT, AcousticInstrument.class, AcousticInstrument.PROPERTY_ID, instrumentsById); //E - newIgnoredColumn("MOVIES_EILayer\\sndset\\channelName");//F - newIgnoredColumn("MOVIES_EILayer\\sndset\\dataType");//G - newIgnoredColumn("MOVIES_EILayer\\sndset\\beamType");//H - newIgnoredColumn("MOVIES_EILayer\\sndset\\acousticFrequency");//I - newIgnoredColumn("MOVIES_EILayer\\sndset\\startSample");//J - newIgnoredColumn("MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle");//K - newIgnoredColumn("MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle");//L - newMandatoryColumn("MOVIES_EILayer\\sndset\\absorptionCoef", AcousticDataImportModelRow.PROPERTY_TRANSCEIVER_ACQUISITION_ABSORPTION, EchobaseCsvUtil.FLOAT);//M - newMandatoryColumn("MOVIES_EILayer\\sndset\\transmissionPower", AcousticDataImportModelRow.PROPERTY_TRANSCEIVER_ACQUISITION_POWER, EchobaseCsvUtil.INTEGER);//N - newMandatoryColumn("MOVIES_EILayer\\sndset\\beamAlongAngleSensitivity", AcousticDataImportModelRow.PROPERTY_TRANSDUCER_ACQUISITION_BEAM_ANGLE_ALONGSHIP, EchobaseCsvUtil.FLOAT);//O - newMandatoryColumn("MOVIES_EILayer\\sndset\\beamAthwartAngleSensitivity", AcousticDataImportModelRow.PROPERTY_TRANSDUCER_ACQUISITION_BEAM_ANGLE_ATHWARTSHIP, EchobaseCsvUtil.FLOAT);//P - newIgnoredColumn("MOVIES_EILayer\\sndset\\beam3dBWidthAlong");//Q - newIgnoredColumn("MOVIES_EILayer\\sndset\\beam3dBWidthAthwart");//R - newMandatoryColumn("MOVIES_EILayer\\sndset\\beamEquTwoWayAngle", AcousticDataImportModelRow.PROPERTY_TRANSDUCER_ACQUISITION_PSI, EchobaseCsvUtil.FLOAT);//S - newMandatoryColumn("MOVIES_EILayer\\sndset\\beamGain", AcousticDataImportModelRow.PROPERTY_TRANSCEIVER_ACQUISITION_GAIN, EchobaseCsvUtil.FLOAT);//T - newMandatoryColumn("MOVIES_EILayer\\sndset\\beamSACorrection", AcousticDataImportModelRow.PROPERTY_TRANSCEIVER_ACQUISITION_SACORRECTION, EchobaseCsvUtil.FLOAT);//U - newIgnoredColumn("MOVIES_EILayer\\sndset\\bottomDetectionMinDepth");//V - newIgnoredColumn("MOVIES_EILayer\\sndset\\bottomDetectionMaxDepth");//W - newIgnoredColumn("MOVIES_EILayer\\sndset\\bottomDetectionMinLevel");//X - newIgnoredColumn("MOVIES_EILayer\\sndset\\AlongTXRXWeightId");//Y - newIgnoredColumn("MOVIES_EILayer\\sndset\\AthwartTXRXWeightId");//Z - newIgnoredColumn("MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId");//AA - newIgnoredColumn("MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId");//AB - newIgnoredColumn("MOVIES_EILayer\\sndset\\bandWidth");//AC - newIgnoredColumn("MOVIES_EILayer\\sndset\\tvgminrange");//AD - newIgnoredColumn("MOVIES_EILayer\\sndset\\tvgmaxrange");//AE - newMandatoryColumn("MOVIES_EILayer\\sndset\\pulseduration", AcousticDataImportModelRow.PROPERTY_TRANSCEIVER_ACQUISITION_PULSE_LENGTH, EchobaseCsvUtil.FLOAT);//AF - newIgnoredColumn("MOVIES_EILayer\\shipnav");//AG - newIgnoredColumn("MOVIES_EILayer\\shipnav\\lat");//AH - newIgnoredColumn("MOVIES_EILayer\\shipnav\\long");//AI - newIgnoredColumn("MOVIES_EILayer\\shipnav\\alt");//AJ - newIgnoredColumn("MOVIES_EILayer\\shipnav\\gndspeed");//AK - newIgnoredColumn("MOVIES_EILayer\\shipnav\\gndcourse");//AL - newIgnoredColumn("MOVIES_EILayer\\shipnav\\surfspeed");//AM - newIgnoredColumn("MOVIES_EILayer\\shipnav\\surfcourse");//AN - newIgnoredColumn("MOVIES_EILayer\\shipnav\\driftspeed");//AO - newIgnoredColumn("MOVIES_EILayer\\shipnav\\driftcourse");//AP - newIgnoredColumn("MOVIES_EILayer\\shipnav\\heading");//AQ - newIgnoredColumn("MOVIES_EILayer\\shipnav\\roll");//AR - newIgnoredColumn("MOVIES_EILayer\\shipnav\\pitch");//AS - newIgnoredColumn("MOVIES_EILayer\\shipnav\\heave");//AT - newMandatoryColumn("MOVIES_EILayer\\shipnav\\depth", AcousticDataImportModelRow.PROPERTY_ESDU_CELL_DATA_DEPTH);//AU - newIgnoredColumn("MOVIES_EILayer\\shipnav\\draught");//AV - - // Cell elementary Datas - newIgnoredColumn("MOVIES_EILayer\\cellset");//AW - newMandatoryColumn("MOVIES_EILayer\\cellset\\cellnum", AcousticDataImportModelRow.PROPERTY_CELL_NUM, EchobaseCsvUtil.PRIMITIVE_INTEGER);//AX - newMandatoryColumn("MOVIES_EILayer\\cellset\\celltype", AcousticDataImportModelRow.PROPERTY_CELL_TYPE, EchobaseCsvUtil.PRIMITIVE_INTEGER);//AY - newMandatoryColumn("MOVIES_EILayer\\cellset\\depthstart", AcousticDataImportModelRow.PROPERTY_CELL_DEPTH_START, EchobaseCsvUtil.PRIMITIVE_FLOAT);//AZ - newMandatoryColumn("MOVIES_EILayer\\cellset\\depthend", AcousticDataImportModelRow.PROPERTY_CELL_DEPTH_END, EchobaseCsvUtil.PRIMITIVE_FLOAT);//BA - newIgnoredColumn("MOVIES_EILayer\\cellset\\indexstart");//BB - newIgnoredColumn("MOVIES_EILayer\\cellset\\indexend");//BC - newMandatoryColumn("MOVIES_EILayer\\cellset\\datestart", AcousticDataImportModelRow.PROPERTY_CELL_DATE_START, EchobaseCsvUtil.IMPORT_DAY_TIME3);//BD - newMandatoryColumn("MOVIES_EILayer\\cellset\\dateend", AcousticDataImportModelRow.PROPERTY_CELL_DATE_END, EchobaseCsvUtil.IMPORT_DAY_TIME3);//BE - - newMandatoryColumn("MOVIES_EILayer\\cellset\\lat", AcousticDataImportModelRow.PROPERTY_CELL_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);//BF - newMandatoryColumn("MOVIES_EILayer\\cellset\\long", AcousticDataImportModelRow.PROPERTY_CELL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);//BG - newMandatoryColumn("MOVIES_EILayer\\cellset\\volume", AcousticDataImportModelRow.PROPERTY_CELL_VOLUME, EchobaseCsvUtil.NA_TO_INTEGER_PARSER);//BH - newMandatoryColumn("MOVIES_EILayer\\cellset\\area", AcousticDataImportModelRow.PROPERTY_CELL_SURFACE, EchobaseCsvUtil.PRIMITIVE_INTEGER);//BI - newIgnoredColumn("MOVIES_EILayer\\cellset\\diststart");//BJ - newIgnoredColumn("MOVIES_EILayer\\cellset\\distend");//BK - newMandatoryColumn("MOVIES_EILayer\\cellset\\thresholdup", AcousticDataImportModelRow.PROPERTY_E_ITHRESHOLD_HIGH, EchobaseCsvUtil.PRIMITIVE_INTEGER);//BL - newMandatoryColumn("MOVIES_EILayer\\cellset\\thresholdlow", AcousticDataImportModelRow.PROPERTY_E_ITHRESHOLD_LOW, EchobaseCsvUtil.PRIMITIVE_INTEGER);//BM - newIgnoredColumn("MOVIES_EILayer\\eilayer");//BN - newMandatoryColumn("MOVIES_EILayer\\eilayer\\sa", AcousticDataImportModelRow.PROPERTY_CELL_NASC, EchobaseCsvUtil.NA_TO_FLOAT_PARSER);//BO - newIgnoredColumn("MOVIES_EILayer\\eilayer\\sv");//BP - newMandatoryColumn("MOVIES_EILayer\\eilayer\\ni", AcousticDataImportModelRow.PROPERTY_CELL_NUMBER_OF_SAMPLES_ECHO_INTEGRATED, EchobaseCsvUtil.NA_TO_INTEGER_PARSER);//BQ - newMandatoryColumn("MOVIES_EILayer\\eilayer\\nt", AcousticDataImportModelRow.PROPERTY_CELL_NUMBER_OF_SAMPLES_RECORDED, EchobaseCsvUtil.NA_TO_INTEGER_PARSER);//BR - newIgnoredColumn("MOVIES_EILayer\\boterr");//BR - newIgnoredColumn("MOVIES_EILayer\\boterr\\sa");//BT - newIgnoredColumn("MOVIES_EILayer\\boterr\\ni");//BU - newMandatoryColumn("MOVIES_EILayer\\sndset\\soundcelerity", AcousticDataImportModelRow.PROPERTY_SOUND_CELERITY);//BV - } - - @Override - public AcousticDataImportModelRow newEmptyInstance() { - return new AcousticDataImportModelRow(); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,365 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.references.AcousticInstrument; - -import java.util.Date; - -/** - * Bean of a row for {@link AcousticDataImportModel} import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticDataImportModelRow { - - public static final String PROPERTY_ACOUSTIC_INSTRUMENT = "acousticInstrument"; - - public static final String PROPERTY_EI_LAYER = "eiLayer"; - - public static final String PROPERTY_CELL_TYPE = "cellType"; - - public static final String PROPERTY_CELL_NUM = "cellNum"; - - public static final String PROPERTY_ESDU_CELL_DATA_DEPTH = "esduCellDataDepth"; - - public static final String PROPERTY_CELL_DATE_START = "cellDateStart"; - - public static final String PROPERTY_CELL_DATE_END = "cellDateEnd"; - - public static final String PROPERTY_CELL_DEPTH_START = "cellDepthStart"; - - public static final String PROPERTY_CELL_DEPTH_END = "cellDepthEnd"; - - public static final String PROPERTY_CELL_NASC = "cellNasc"; - - public static final String PROPERTY_TRANSCEIVER_ACQUISITION_PULSE_LENGTH = "transceiverAcquisitionPulseLength"; - - public static final String PROPERTY_TRANSCEIVER_ACQUISITION_GAIN = "transceiverAcquisitionGain"; - - public static final String PROPERTY_TRANSCEIVER_ACQUISITION_ABSORPTION = "transceiverAcquisitionAbsorption"; - - public static final String PROPERTY_TRANSDUCER_ACQUISITION_BEAM_ANGLE_ATHWARTSHIP = "transducerAcquisitionBeamAngleAthwartship"; - - public static final String PROPERTY_TRANSDUCER_ACQUISITION_BEAM_ANGLE_ALONGSHIP = "transducerAcquisitionBeamAngleAlongship"; - - public static final String PROPERTY_TRANSDUCER_ACQUISITION_PSI = "transducerAcquisitionPsi"; - - public static final String PROPERTY_TRANSCEIVER_ACQUISITION_POWER = "transceiverAcquisitionPower"; - - public static final String PROPERTY_TRANSCEIVER_ACQUISITION_SACORRECTION = "transceiverAcquisitionSacorrection"; - - public static final String PROPERTY_E_ITHRESHOLD_LOW = "eIThresholdLow"; - - public static final String PROPERTY_E_ITHRESHOLD_HIGH = "eIThresholdHigh"; - - public static final String PROPERTY_CELL_VOLUME = "cellVolume"; - - public static final String PROPERTY_CELL_SURFACE = "cellSurface"; - - public static final String PROPERTY_CELL_NUMBER_OF_SAMPLES_RECORDED = "cellNumberOfSamplesRecorded"; - - public static final String PROPERTY_CELL_NUMBER_OF_SAMPLES_ECHO_INTEGRATED = "cellNumberOfSamplesEchoIntegrated"; - - public static final String PROPERTY_SOUND_CELERITY = "soundCelerity"; - - public static final String PROPERTY_CELL_LATITUDE = "cellLatitude"; - - public static final String PROPERTY_CELL_LONGITUDE = "cellLongitude"; - - protected String eiLayer; - - protected String esduCellDataDepth; - - protected Date cellDateStart; - - protected Date cellDateEnd; - - protected float cellLatitude; - - protected float cellLongitude; - - protected Float cellVolume; - - protected int cellSurface; - - protected Integer cellNumberOfSamplesRecorded; - - protected Integer cellNumberOfSamplesEchoIntegrated; - - protected int cellType; - - protected int cellNum; - - protected float cellDepthStart; - - protected float cellDepthEnd; - - protected Float cellNasc; - - protected float transceiverAcquisitionPulseLength; - - protected float transceiverAcquisitionGain; - - protected float transceiverAcquisitionAbsorption; - - protected float transceiverAcquisitionPower; - - protected float transceiverAcquisitionSacorrection; - - protected float transducerAcquisitionBeamAngleAthwartship; - - protected float transducerAcquisitionBeamAngleAlongship; - - protected float transducerAcquisitionPsi; - - protected int eIThresholdLow; - - protected int eIThresholdHigh; - - protected String soundCelerity; - - protected AcousticInstrument acousticInstrument; - - public boolean isCellToAdd() { - return cellNasc != null; - } - - public String getEiLayer() { - return eiLayer; - } - - public void setEiLayer(String eiLayer) { - this.eiLayer = eiLayer; - } - - public AcousticInstrument getAcousticInstrument() { - return acousticInstrument; - } - - public void setAcousticInstrument(AcousticInstrument acousticInstrument) { - this.acousticInstrument = acousticInstrument; - } - - public Date getCellDateStart() { - return cellDateStart; - } - - public void setCellDateStart(Date cellDateStart) { - this.cellDateStart = cellDateStart; - } - - public int getCellType() { - return cellType; - } - - public void setCellType(int cellType) { - this.cellType = cellType; - } - - public int getCellNum() { - return cellNum; - } - - public void setCellNum(int cellNum) { - this.cellNum = cellNum; - } - - public String getEsduCellDataDepth() { - return esduCellDataDepth; - } - - public void setEsduCellDataDepth(String esduCellDataDepth) { - this.esduCellDataDepth = esduCellDataDepth; - } - - public float getCellDepthStart() { - return cellDepthStart; - } - - public void setCellDepthStart(float cellDepthStart) { - this.cellDepthStart = cellDepthStart; - } - - public float getCellDepthEnd() { - return cellDepthEnd; - } - - public void setCellDepthEnd(float cellDepthEnd) { - this.cellDepthEnd = cellDepthEnd; - } - - public Float getCellNasc() { - return cellNasc; - } - - public void setCellNasc(Float cellNasc) { - this.cellNasc = cellNasc; - } - - public float getTransceiverAcquisitionPulseLength() { - return transceiverAcquisitionPulseLength; - } - - public void setTransceiverAcquisitionPulseLength(float transceiverAcquisitionPulseLength) { - this.transceiverAcquisitionPulseLength = transceiverAcquisitionPulseLength; - } - - public float getTransceiverAcquisitionGain() { - return transceiverAcquisitionGain; - } - - public void setTransceiverAcquisitionGain(float transceiverAcquisitionGain) { - this.transceiverAcquisitionGain = transceiverAcquisitionGain; - } - - public float getTransceiverAcquisitionAbsorption() { - return transceiverAcquisitionAbsorption; - } - - public void setTransceiverAcquisitionAbsorption(float transceiverAcquisitionAbsorption) { - this.transceiverAcquisitionAbsorption = transceiverAcquisitionAbsorption; - } - - public float getTransceiverAcquisitionPower() { - return transceiverAcquisitionPower; - } - - public void setTransceiverAcquisitionPower(float transceiverAcquisitionPower) { - this.transceiverAcquisitionPower = transceiverAcquisitionPower; - } - - public float getTransceiverAcquisitionSacorrection() { - return transceiverAcquisitionSacorrection; - } - - public void setTransceiverAcquisitionSacorrection(float transceiverAcquisitionSacorrection) { - this.transceiverAcquisitionSacorrection = transceiverAcquisitionSacorrection; - } - - public float getTransducerAcquisitionBeamAngleAthwartship() { - return transducerAcquisitionBeamAngleAthwartship; - } - - public void setTransducerAcquisitionBeamAngleAthwartship(float transducerAcquisitionBeamAngleAthwartship) { - this.transducerAcquisitionBeamAngleAthwartship = transducerAcquisitionBeamAngleAthwartship; - } - - public float getTransducerAcquisitionBeamAngleAlongship() { - return transducerAcquisitionBeamAngleAlongship; - } - - public void setTransducerAcquisitionBeamAngleAlongship(float transducerAcquisitionBeamAngleAlongship) { - this.transducerAcquisitionBeamAngleAlongship = transducerAcquisitionBeamAngleAlongship; - } - - public float getTransducerAcquisitionPsi() { - return transducerAcquisitionPsi; - } - - public void setTransducerAcquisitionPsi(float transducerAcquisitionPsi) { - this.transducerAcquisitionPsi = transducerAcquisitionPsi; - } - - public float getCellLatitude() { - return cellLatitude; - } - - public void setCellLatitude(float cellLatitude) { - this.cellLatitude = cellLatitude; - } - - public float getCellLongitude() { - return cellLongitude; - } - - public void setCellLongitude(float cellLongitude) { - this.cellLongitude = cellLongitude; - } - - public int geteIThresholdLow() { - return eIThresholdLow; - } - - public void seteIThresholdLow(int eIThresholdLow) { - this.eIThresholdLow = eIThresholdLow; - } - - public int geteIThresholdHigh() { - return eIThresholdHigh; - } - - public void seteIThresholdHigh(int eIThresholdHigh) { - this.eIThresholdHigh = eIThresholdHigh; - } - - public Date getCellDateEnd() { - return cellDateEnd; - } - - public void setCellDateEnd(Date cellDateEnd) { - this.cellDateEnd = cellDateEnd; - } - - public Float getCellVolume() { - return cellVolume; - } - - public void setCellVolume(Float cellVolume) { - this.cellVolume = cellVolume; - } - - public int getCellSurface() { - return cellSurface; - } - - public void setCellSurface(int cellSurface) { - this.cellSurface = cellSurface; - } - - public Integer getCellNumberOfSamplesRecorded() { - return cellNumberOfSamplesRecorded; - } - - public void setCellNumberOfSamplesRecorded(Integer cellNumberOfSamplesRecorded) { - this.cellNumberOfSamplesRecorded = cellNumberOfSamplesRecorded; - } - - public Integer getCellNumberOfSamplesEchoIntegrated() { - return cellNumberOfSamplesEchoIntegrated; - } - - public void setCellNumberOfSamplesEchoIntegrated(Integer cellNumberOfSamplesEchoIntegrated) { - this.cellNumberOfSamplesEchoIntegrated = cellNumberOfSamplesEchoIntegrated; - } - - public String getSoundCelerity() { - return soundCelerity; - } - - public void setSoundCelerity(String soundCelerity) { - this.soundCelerity = soundCelerity; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,83 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.CellDAO; -import fr.ifremer.echobase.entities.data.Echotype; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DataMetadata; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.List; -import java.util.Map; - -/** - * Model to import {@link Result} for esdu cell and echotypes. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticResultByEchotypeAndSpeciesCategoryImportModel extends AbstractImportModel<AcousticResultByEchotypeAndSpeciesCategoryImportModelRow> { - - public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - "name", - "baracoudaCode", - "sizeCategory", - AcousticResultByEchotypeImportModelRow.PROPERTY_ECHOTYPE - }; - - public AcousticResultByEchotypeAndSpeciesCategoryImportModel( - char separator, - Map<String, Echotype> echotypeMap, - Map<String, Species> speciesMap, - Map<String, SizeCategory> sizeCategoryMap, - Voyage voyage, - CellDAO cellDAO, - List<DataMetadata> dataMetadatas) { - super(separator); - - newForeignKeyColumn(AcousticResultByEchotypeAndSpeciesCategoryImportModelRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, echotypeMap); - newForeignKeyColumn("baracoudaCode", AcousticResultByEchotypeAndSpeciesCategoryImportModelRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); - newForeignKeyColumn(AcousticResultByEchotypeAndSpeciesCategoryImportModelRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); - newMandatoryColumn("name", AcousticResultByEchotypeAndSpeciesCategoryImportModelRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); - - for (DataMetadata metadata : dataMetadatas) { - String name = metadata.getName(); - newMandatoryColumn( - name, - EchobaseCsvUtil.newResultValueParser(metadata), - EchobaseCsvUtil.<AcousticResultByEchotypeAndSpeciesCategoryImportModelRow>newResultValueSetter()); - } - } - - @Override - public AcousticResultByEchotypeAndSpeciesCategoryImportModelRow newEmptyInstance() { - return new AcousticResultByEchotypeAndSpeciesCategoryImportModelRow(); - } - -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,104 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import com.google.common.collect.Lists; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.Echotype; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.List; - -/** - * Bean used as a row for import of - * {@link AcousticResultByEchotypeAndSpeciesCategoryImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticResultByEchotypeAndSpeciesCategoryImportModelRow implements EchobaseCsvUtil.ResultAble { - - public static final String PROPERTY_ECHOTYPE = "echotype"; - - public static final String PROPERTY_CELL = "cell"; - - public static final String PROPERTY_SPECIES = "species"; - - public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; - - protected Echotype echotype; - - protected Cell cell; - - protected List<Result> result = Lists.newArrayList(); - - protected Species species; - - private SizeCategory sizeCategory; - - public Echotype getEchotype() { - return echotype; - } - - public void setEchotype(Echotype echotype) { - this.echotype = echotype; - } - - public Cell getCell() { - return cell; - } - - public void setCell(Cell cell) { - this.cell = cell; - } - - public List<Result> getResult() { - return result; - } - - @Override - public void addResult(Result result) { - this.result.add(result); - } - - public Species getSpecies() { - return species; - } - - public void setSpecies(Species species) { - this.species = species; - } - - public SizeCategory getSizeCategory() { - return sizeCategory; - } - - public void setSizeCategory(SizeCategory sizeCategory) { - this.sizeCategory = sizeCategory; - } - -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,82 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import com.google.common.collect.Lists; -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.CellDAO; -import fr.ifremer.echobase.entities.data.Echotype; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DataMetadata; -import org.nuiton.util.csv.ImportRuntimeException; - -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Model to import {@link Result} for esdu cell and echotypes. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticResultByEchotypeImportModel extends AbstractImportModel<AcousticResultByEchotypeImportModelRow> { - - public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - "name", - AcousticResultByEchotypeImportModelRow.PROPERTY_ECHOTYPE - }; - - public AcousticResultByEchotypeImportModel( - char separator, - Map<String, Echotype> echotypeMap, - Voyage voyage, - CellDAO cellDAO, - List<DataMetadata> dataMetadatas) { - super(separator); - - newForeignKeyColumn(AcousticResultByEchotypeImportModelRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, echotypeMap); - newMandatoryColumn("name", AcousticResultByEchotypeImportModelRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); - - for (DataMetadata metadata : dataMetadatas) { - String name = metadata.getName(); - newMandatoryColumn( - name, - EchobaseCsvUtil.newResultValueParser(metadata), - EchobaseCsvUtil.<AcousticResultByEchotypeImportModelRow>newResultValueSetter()); - } - } - - @Override - public AcousticResultByEchotypeImportModelRow newEmptyInstance() { - return new AcousticResultByEchotypeImportModelRow(); - } - -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,76 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import com.google.common.collect.Lists; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.Echotype; -import fr.ifremer.echobase.entities.data.Result; - -import java.util.List; - -/** - * Bean used as a row for import of {@link AcousticResultByEchotypeImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticResultByEchotypeImportModelRow implements EchobaseCsvUtil.ResultAble { - - public static final String PROPERTY_ECHOTYPE = "echotype"; - - public static final String PROPERTY_CELL = "cell"; - - protected Echotype echotype; - - protected Cell cell; - - protected List<Result> result = Lists.newArrayList(); - - public Echotype getEchotype() { - return echotype; - } - - public void setEchotype(Echotype echotype) { - this.echotype = echotype; - } - - public Cell getCell() { - return cell; - } - - public void setCell(Cell cell) { - this.cell = cell; - } - - public List<Result> getResult() { - return result; - } - - @Override - public void addResult(Result result) { - this.result.add(result); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,79 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.CellDAO; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DataMetadata; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.List; -import java.util.Map; - -/** - * Model to import {@link Result} for esdu cell and species and size category. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticResultBySpeciesAndAgeCategoryImportModel extends AbstractImportModel<AcousticResultBySpeciesAndAgeCategoryImportModelRow> { - - public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - "name", - "baracoudaCode", - AcousticResultBySpeciesAndAgeCategoryImportModelRow.PROPERTY_AGE_CATEGORY, - AcousticResultBySpeciesAndAgeCategoryImportModelRow.PROPERTY_AGE_CATEGORY_MEANING, - }; - - public AcousticResultBySpeciesAndAgeCategoryImportModel( - char separator, - Map<String, Species> speciesMap, - Voyage voyage, - CellDAO cellDAO, - List<DataMetadata> dataMetadatas) { - super(separator); - - newMandatoryColumn("name", AcousticResultBySpeciesAndAgeCategoryImportModelRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); - newMandatoryColumn(AcousticResultBySpeciesAndAgeCategoryImportModelRow.PROPERTY_AGE_CATEGORY); - newMandatoryColumn(AcousticResultBySpeciesAndAgeCategoryImportModelRow.PROPERTY_AGE_CATEGORY_MEANING); - newForeignKeyColumn("baracoudaCode", AcousticResultBySpeciesAndAgeCategoryImportModelRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); - - for (DataMetadata metadata : dataMetadatas) { - String name = metadata.getName(); - newMandatoryColumn( - name, - EchobaseCsvUtil.newResultValueParser(metadata), - EchobaseCsvUtil.<AcousticResultBySpeciesAndAgeCategoryImportModelRow>newResultValueSetter()); - } - } - - @Override - public AcousticResultBySpeciesAndAgeCategoryImportModelRow newEmptyInstance() { - return new AcousticResultBySpeciesAndAgeCategoryImportModelRow(); - } - -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,101 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import com.google.common.collect.Lists; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.List; - -/** - * Bean used as a row for import of - * {@link AcousticResultBySpeciesAndAgeCategoryImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticResultBySpeciesAndAgeCategoryImportModelRow implements EchobaseCsvUtil.ResultAble { - - public static final String PROPERTY_CELL = "cell"; - - public static final String PROPERTY_SPECIES = "species"; - - public static final String PROPERTY_AGE_CATEGORY = "ageCategory"; - - public static final String PROPERTY_AGE_CATEGORY_MEANING = "ageCategoryMeaning"; - - protected Cell cell; - - protected List<Result> result = Lists.newArrayList(); - - protected Species species; - - private String ageCategory; - - private String ageCategoryMeaning; - - public Species getSpecies() { - return species; - } - - public void setSpecies(Species species) { - this.species = species; - } - - public Cell getCell() { - return cell; - } - - public void setCell(Cell cell) { - this.cell = cell; - } - - public String getAgeCategory() { - return ageCategory; - } - - public void setAgeCategory(String ageCategory) { - this.ageCategory = ageCategory; - } - - public String getAgeCategoryMeaning() { - return ageCategoryMeaning; - } - - public void setAgeCategoryMeaning(String ageCategoryMeaning) { - this.ageCategoryMeaning = ageCategoryMeaning; - } - - public List<Result> getResult() { - return result; - } - - @Override - public void addResult(Result result) { - this.result.add(result); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,79 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.CellDAO; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DataMetadata; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.List; -import java.util.Map; - -/** - * Model to import {@link Result} for esdu cell and species and size category. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticResultBySpeciesAndSizeCategoryImportModel extends AbstractImportModel<AcousticResultBySpeciesAndSizeCategoryImportModelRow> { - - public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - "name", - "baracoudaCode", - AcousticResultBySpeciesAndSizeCategoryImportModelRow.PROPERTY_SIZE_CATEGORY, - AcousticResultBySpeciesAndSizeCategoryImportModelRow.PROPERTY_SIZE_CATEGORY_MEANING - }; - - public AcousticResultBySpeciesAndSizeCategoryImportModel( - char separator, - Map<String, Species> speciesMap, - Voyage voyage, - CellDAO cellDAO, - List<DataMetadata> dataMetadatas) { - super(separator); - - newMandatoryColumn("name", AcousticResultBySpeciesAndSizeCategoryImportModelRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); - newMandatoryColumn(AcousticResultBySpeciesAndSizeCategoryImportModelRow.PROPERTY_SIZE_CATEGORY); - newMandatoryColumn(AcousticResultBySpeciesAndSizeCategoryImportModelRow.PROPERTY_SIZE_CATEGORY_MEANING); - newForeignKeyColumn("baracoudaCode", AcousticResultBySpeciesAndSizeCategoryImportModelRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); - - for (DataMetadata metadata : dataMetadatas) { - String name = metadata.getName(); - newMandatoryColumn( - name, - EchobaseCsvUtil.newResultValueParser(metadata), - EchobaseCsvUtil.<AcousticResultBySpeciesAndSizeCategoryImportModelRow>newResultValueSetter()); - } - } - - @Override - public AcousticResultBySpeciesAndSizeCategoryImportModelRow newEmptyInstance() { - return new AcousticResultBySpeciesAndSizeCategoryImportModelRow(); - } - -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,101 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import com.google.common.collect.Lists; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.List; - -/** - * Bean used as a row for import of - * {@link AcousticResultBySpeciesAndSizeCategoryImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class AcousticResultBySpeciesAndSizeCategoryImportModelRow implements EchobaseCsvUtil.ResultAble { - - public static final String PROPERTY_CELL = "cell"; - - public static final String PROPERTY_SPECIES = "species"; - - public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; - - public static final String PROPERTY_SIZE_CATEGORY_MEANING = "sizeCategoryMeaning"; - - protected Cell cell; - - protected List<Result> result = Lists.newArrayList(); - - protected Species species; - - private String sizeCategory; - - private String sizeCategoryMeaning; - - public Species getSpecies() { - return species; - } - - public void setSpecies(Species species) { - this.species = species; - } - - public Cell getCell() { - return cell; - } - - public void setCell(Cell cell) { - this.cell = cell; - } - - public String getSizeCategory() { - return sizeCategory; - } - - public void setSizeCategory(String sizeCategory) { - this.sizeCategory = sizeCategory; - } - - public String getSizeCategoryMeaning() { - return sizeCategoryMeaning; - } - - public void setSizeCategoryMeaning(String sizeCategoryMeaning) { - this.sizeCategoryMeaning = sizeCategoryMeaning; - } - - public List<Result> getResult() { - return result; - } - - @Override - public void addResult(Result result) { - this.result.add(result); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,72 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.Sample; -import fr.ifremer.echobase.entities.data.SampleData; -import fr.ifremer.echobase.entities.references.SampleDataType; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.Map; - -/** - * Model to import {@link Sample} of total biometry. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class BiometrySampleImportModel extends AbstractImportModel<BiometrySampleImportModelRow> { - - public BiometrySampleImportModel(char separator, Map<String, Operation> operationMap, - Map<String, Species> speciesMap, - Map<String, SampleDataType> sampleDataTypeMap) { - super(separator); - - /* - operationID - baracoudacode - numFish - dataLabel - dataValue - name - */ - - newForeignKeyColumn("operationID", BiometrySampleImportModelRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); - newForeignKeyColumn("baracoudacode", BiometrySampleImportModelRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); - - newMandatoryColumn(BiometrySampleImportModelRow.PROPERTY_NUM_FISH, EchobaseCsvUtil.PRIMITIVE_INTEGER); - - newForeignKeyColumn("name", SampleData.PROPERTY_SAMPLE_DATA_TYPE, SampleDataType.class, SampleDataType.PROPERTY_NAME, sampleDataTypeMap); - newMandatoryColumn(SampleData.PROPERTY_DATA_LABEL); - newMandatoryColumn(SampleData.PROPERTY_DATA_VALUE, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); - } - - @Override - public BiometrySampleImportModelRow newEmptyInstance() { - return new BiometrySampleImportModelRow(); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,97 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.SampleData; -import fr.ifremer.echobase.entities.data.SampleDataImpl; -import fr.ifremer.echobase.entities.references.SampleDataType; -import fr.ifremer.echobase.entities.references.Species; - -/** - * Bean used as a row for import of {@link BiometrySampleImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class BiometrySampleImportModelRow { - - public static final String PROPERTY_NUM_FISH = "numFish"; - - public static final String PROPERTY_OPERATION = "operation"; - - public static final String PROPERTY_SPECIES = "species"; - - protected final SampleData sampleData; - - protected Operation operation; - - protected Species species; - - protected int numFish; - - public BiometrySampleImportModelRow() { - sampleData = new SampleDataImpl(); - } - - public Operation getOperation() { - return operation; - } - - public void setOperation(Operation operation) { - this.operation = operation; - } - - public Species getSpecies() { - return species; - } - - public void setSpecies(Species species) { - this.species = species; - } - - public int getNumFish() { - return numFish; - } - - public void setNumFish(int numfish) { - this.numFish = numfish; - } - - public void setDataValue(Float dataValue) { - sampleData.setDataValue(dataValue); - } - - public void setSampleDataType(SampleDataType sampleDataType) { - sampleData.setSampleDataType(sampleDataType); - } - - public void setDataLabel(String dataLabel) { - sampleData.setDataLabel(dataLabel); - } - - public SampleData getSampleData() { - return sampleData; - } -} Deleted: 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,77 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.entities.data.Echotype; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.Map; - -/** - * Model to import echotypes. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class EchotypeImportModel extends AbstractImportModel<EchotypeImportModelRow> { - - protected final Map<String, Voyage> voyageMap; - - protected final Map<String, DepthStratum> depthStratumMap; - - protected final Map<String, Species> speciesMap; - - public EchotypeImportModel(char separator, - Map<String, Voyage> voyageMap, - Map<String, DepthStratum> depthStratumMap, - Map<String, Species> speciesMap) { - super(separator); - this.voyageMap = voyageMap; - this.depthStratumMap = depthStratumMap; - this.speciesMap = speciesMap; - - /* - voyage - echotypeName - DepthStratumID - meaning - baracoudacode - */ - - newMandatoryColumn("echotypeName", Echotype.PROPERTY_NAME); - newMandatoryColumn("meaning", Echotype.PROPERTY_MEANING); - newForeignKeyColumn(EchotypeImportModelRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - newForeignKeyColumn("DepthStratumID", Echotype.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStratumMap); - newForeignKeyColumn("baracoudacode", Echotype.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); - - } - - @Override - public EchotypeImportModelRow newEmptyInstance() { - return new EchotypeImportModelRow(); - } -} \ No newline at end of file Deleted: 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,81 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Echotype; -import fr.ifremer.echobase.entities.data.EchotypeImpl; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.Species; - -import java.io.Serializable; - -/** - * Bean used as a row for import of {@link EchotypeImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class EchotypeImportModelRow implements Serializable { - - private static final long serialVersionUID = 1L; - - public static final String PROPERTY_VOYAGE = "voyage"; - - protected Voyage voyage; - - protected final Echotype echotype; - - public EchotypeImportModelRow() { - echotype = new EchotypeImpl(); - } - - public Voyage getVoyage() { - return voyage; - } - - public void setVoyage(Voyage voyage) { - this.voyage = voyage; - } - - public Echotype getEchotype() { - return echotype; - } - - public void setName(String name) { - echotype.setName(name); - } - - public void setMeaning(String meaning) { - echotype.setMeaning(meaning); - } - - public void setDepthStratum(DepthStratum depthStratum) { - echotype.setDepthStratum(depthStratum); - } - - public void setSpecies(Species species) { - echotype.addSpecies(species); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,65 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractExportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.meta.AssociationMeta; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.csv.ExportModel; - -/** - * A model to export associations of entities into csv files. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EntityAssociationExportModel<E extends TopiaEntity> extends AbstractExportModel<E> { - - protected final AssociationMeta meta; - - public static <E extends TopiaEntity> ExportModel<E> newExportModel(char separator, - AssociationMeta meta - ) { - EntityAssociationExportModel<E> model = new EntityAssociationExportModel<E>( - separator, - meta); - - // topiaId <-> topiaId - model.newColumnForExport(TopiaEntity.TOPIA_ID); - - model.newColumnForExport( - meta.getName(), - EchobaseCsvUtil.newAssociationValueFormatter() - ); - return model; - } - - protected EntityAssociationExportModel(char separator, AssociationMeta meta) { - super(separator); - this.meta = meta; - } - - -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,78 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.meta.AssociationMeta; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.csv.ImportModel; - -import java.util.Map; - -/** - * A model to import associations of entities into csv files. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EntityAssociationImportModel extends AbstractImportModel<Map<String, Object>> { - - protected final AssociationMeta meta; - - public static ImportModel<Map<String, Object>> newImportModel(char separator, - AssociationMeta meta - ) { - EntityAssociationImportModel model = new EntityAssociationImportModel( - separator, meta); - - // topiaId <-> topiaId - model.newMandatoryColumn( - TopiaEntity.TOPIA_ID, - EchobaseCsvUtil.<Map<String, Object>, String>newMapProperty(TopiaEntity.TOPIA_ID) - ); - - // add association -> target - model.newMandatoryColumn( - meta.getName(), - EchobaseCsvUtil.ASSOCIATION_VALUE_PARSER, - EchobaseCsvUtil.<Map<String, Object>, String[]>newMapProperty("target") - ); - - return model; - } - - @Override - public Map<String, Object> newEmptyInstance() { - return null; - } - - protected EntityAssociationImportModel(char separator, - AssociationMeta meta) { - super(separator); - this.meta = meta; - } - - -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,256 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import com.google.common.base.Function; -import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; -import fr.ifremer.echobase.csv.AbstractImportExportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.meta.TableMeta; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.csv.ValueFormatter; -import org.nuiton.util.decorator.Decorator; - -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.Map; - -/** - * A model to import / export entities into csv files. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EntityCsvModel<E extends TopiaEntity> extends AbstractImportExportModel<E> { - - protected final TableMeta tableMeta; - - public static <E extends TopiaEntity> EntityCsvModel<E> newModel( - char separator, - TableMeta tableMeta - ) { - return new EntityCsvModel<E>(separator, tableMeta); - } - - public static <E extends TopiaEntity> EntityCsvModel<E> newModel( - char separator, - TableMeta tableMeta, - String idHeader - ) { - return new EntityCsvModel<E>(separator, tableMeta, idHeader); - } - - @Override - public E newEmptyInstance() { - return (E) tableMeta.newEntity(); - } - - public void addForeignKeyForExport(String propertyName, - Class<TopiaEntity> entityType) { - - Map<String, TopiaEntity> universe = Collections.emptyMap(); - - newColumnForExport( - propertyName, - EchobaseCsvUtil.newForeignKeyValue(entityType, - propertyName, - universe) - ); - } - - public <T> void addDecoratedForeignKeyForExport(String headerName, String propertyName, Decorator<T> decorator) { - modelBuilder.newColumnForExport(headerName, propertyName, - new ForeignKeyDecoratedValue<T>(decorator)); - } - - public <E extends TopiaEntity> void addForeignKeyForImport(String headerName, - String propertyName, - Class<E> entityType, - Collection<E> entities, - Function<E, String> transform) { - - Map<String, E> universe = Maps.uniqueIndex(entities, transform); - - newMandatoryColumn( - headerName, - propertyName, - EchobaseCsvUtil.newForeignKeyValue(entityType, - propertyName, - universe) - ); - } - - public <E extends TopiaEntity> void addForeignKeyForAssociationForImport(String headerName, - String propertyName, - Class<E> entityType, - Collection<E> entities, - Function<E, String> transform) { - - Map<String, E> universe = Maps.uniqueIndex(entities, transform); - - newMandatoryColumn( - headerName, - propertyName, - EchobaseCsvUtil.newForeignKeyValueAssociation(entityType, - propertyName, - universe) - ); - } - - public <E extends TopiaEntity> void addForeignKeyForImport(String propertyName, - Class<E> entityType, - Collection<E> entities) { - - Map<String, E> universe = Maps.uniqueIndex( - entities, EchoBaseFunctions.TO_TOPIAID); - - newMandatoryColumn( - propertyName, - EchobaseCsvUtil.newForeignKeyValue(entityType, - propertyName, - universe) - ); - } - - public void addDefaultColumn(String propertyName, - Class<?> type) { - addDefaultColumn(propertyName, propertyName, type); - } - - public void addDefaultColumn(String headerName, - String propertyName, - Class<?> type) { - - if (Date.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.DAY_TIME_SECOND_WITH_TIMESTAMP - ); - } else if (double.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.DOUBLE_PRIMITIVE - ); - } else if (Double.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.DOUBLE - ); - } else if (long.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.PRIMITIVE_LONG - ); - } else if (Long.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.LONG - ); - } else if (float.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.PRIMITIVE_FLOAT - ); - } else if (Float.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.FLOAT - ); - } else if (int.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.PRIMITIVE_INTEGER - ); - } else if (Integer.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.INTEGER - ); - } else if (boolean.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.PRIMITIVE_BOOLEAN - ); - } else if (Boolean.class.equals(type)) { - newColumnForImportExport( - headerName, - propertyName, - EchobaseCsvUtil.BOOLEAN - ); - } else { - - // string - newColumnForImportExport( - headerName, - propertyName - ); - } - } - - public static class ForeignKeyDecoratedValue<E> implements ValueFormatter<E> { - - protected final Decorator<E> decorator; - - public ForeignKeyDecoratedValue(Decorator<E> decorator) { - this.decorator = decorator; - } - - @Override - public String format(E e) { - String value = ""; - if (e != null) { - value = decorator.toString(e); - } - return value; - } - } - - protected EntityCsvModel(char separator, - TableMeta tableMeta) { - super(separator); - this.tableMeta = tableMeta; - } - - protected EntityCsvModel(char separator, - TableMeta tableMeta, - String idHeader) { - this(separator, tableMeta); - newColumnForImportExport( - idHeader, - TopiaEntity.TOPIA_ID - ); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,50 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractExportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.services.ExportQueryService; - -import java.util.Map; - -/** - * Csv model to export sql in {@link ExportQueryService}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ExportQueryCsvModel extends AbstractExportModel<Map<String, Object>> { - - public ExportQueryCsvModel(char separator, String[] columnHeaders) { - super(separator); - for (String columnHeader : columnHeaders) { - newColumnForExport( - columnHeader, - EchobaseCsvUtil.TO_STRING_FORMATTER - ); - } - } - -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,71 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.entities.data.GearMetadataValue; -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.references.Gear; -import fr.ifremer.echobase.entities.references.GearMetadata; -import fr.ifremer.echobase.entities.references.Vessel; - -import java.util.Map; - -/** - * Model to import {@link GearMetadataValue}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class GearMetadataValueImportModel extends AbstractImportModel<GearMetadataValueImportModelRow> { - - public GearMetadataValueImportModel(char separator, - Map<String, Vessel> vesselMap, - Map<String, GearMetadata> gearMetadataMap, - Map<String, Gear> gearMap, - Map<String, Operation> operationMap) { - super(separator); - - /* - vesselName - id - gearID - metadataType - gearMetadataValue - */ - - newForeignKeyColumn("vesselName", GearMetadataValueImportModelRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); - newForeignKeyColumn("operationID", GearMetadataValueImportModelRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); - - newForeignKeyColumn("metadataType", GearMetadataValue.PROPERTY_GEAR_METADATA, GearMetadata.class, GearMetadata.PROPERTY_NAME, gearMetadataMap); - newForeignKeyColumn("gearCode", GearMetadataValue.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); - newMandatoryColumn("gearMetadataValue", GearMetadataValue.PROPERTY_DATA_VALUE); - - } - - @Override - public GearMetadataValueImportModelRow newEmptyInstance() { - return new GearMetadataValueImportModelRow(); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,87 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.GearMetadataValue; -import fr.ifremer.echobase.entities.data.GearMetadataValueImpl; -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.references.Gear; -import fr.ifremer.echobase.entities.references.GearMetadata; -import fr.ifremer.echobase.entities.references.Vessel; - -/** - * Bean used as a row for import of {@link GearMetadataValueImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class GearMetadataValueImportModelRow { - - public static final String PROPERTY_VESSEL = Transect.PROPERTY_VESSEL; - - public static final String PROPERTY_OPERATION = Transect.PROPERTY_OPERATION; - - protected Vessel vessel; - - protected Operation operation; - - protected final GearMetadataValue gearMetadataValue; - - public GearMetadataValueImportModelRow() { - gearMetadataValue = new GearMetadataValueImpl(); - } - - public GearMetadataValue getGearMetadataValue() { - return gearMetadataValue; - } - - public void setGearMetadata(GearMetadata gearMetadata) { - gearMetadataValue.setGearMetadata(gearMetadata); - } - - public void setDataValue(String dataValue) { - gearMetadataValue.setDataValue(dataValue); - } - - public void setGear(Gear gear) { - gearMetadataValue.setGear(gear); - } - - public Operation getOperation() { - return operation; - } - - public void setOperation(Operation operation) { - this.operation = operation; - } - - public Vessel getVessel() { - return vessel; - } - - public void setVessel(Vessel vessel) { - this.vessel = vessel; - } -} Deleted: 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,72 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.LengthAgeKey; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Species; -import fr.ifremer.echobase.entities.references.Strata; - -import java.util.Map; - -/** - * Model to import {@link LengthAgeKey}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LengthAgeKeyImportModel extends AbstractImportModel<LengthAgeKeyImportModelRow> { - - protected final Map<String, Voyage> voyageMap; - - protected final Map<String, Strata> strataMap; - - protected final Map<String, Species> speciesMap; - - public LengthAgeKeyImportModel(char separator, - Map<String, Voyage> voyageMap, - Map<String, Strata> strataMap, - Map<String, Species> speciesMap) { - super(separator); - this.voyageMap = voyageMap; - this.strataMap = strataMap; - this.speciesMap = speciesMap; - - newForeignKeyColumn(LengthAgeKeyImportModelRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - - newMandatoryColumn(LengthAgeKey.PROPERTY_AGE, EchobaseCsvUtil.PRIMITIVE_INTEGER); - newMandatoryColumn(LengthAgeKey.PROPERTY_PERCENT_AT_AGE, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(LengthAgeKey.PROPERTY_LENGTH, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(LengthAgeKey.PROPERTY_METADATA); - newForeignKeyColumn(LengthAgeKey.PROPERTY_STRATA, Strata.class, Strata.PROPERTY_NAME, strataMap); - newForeignKeyColumn("baracoudacode", LengthAgeKey.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); - } - - @Override - public LengthAgeKeyImportModelRow newEmptyInstance() { - return new LengthAgeKeyImportModelRow(); - } -} \ No newline at end of file Deleted: 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,89 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.LengthAgeKey; -import fr.ifremer.echobase.entities.data.LengthAgeKeyImpl; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Species; -import fr.ifremer.echobase.entities.references.Strata; - -import java.io.Serializable; - -/** - * Bean used as a row for import of {@link LengthAgeKeyImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LengthAgeKeyImportModelRow implements Serializable { - - private static final long serialVersionUID = 1L; - - public static final String PROPERTY_VOYAGE = "voyage"; - - protected Voyage voyage; - - protected final LengthAgeKey lengthAgeKey; - - public LengthAgeKeyImportModelRow() { - lengthAgeKey = new LengthAgeKeyImpl(); - } - - public LengthAgeKey getLengthAgeKey() { - return lengthAgeKey; - } - - public Voyage getVoyage() { - return voyage; - } - - public void setVoyage(Voyage voyage) { - this.voyage = voyage; - } - - public void setAge(int age) { - lengthAgeKey.setAge(age); - } - - public void setLength(float length) { - lengthAgeKey.setLength(length); - } - - public void setPercentAtAge(float percentAtAge) { - lengthAgeKey.setPercentAtAge(percentAtAge); - } - - public void setMetadata(String metadata) { - lengthAgeKey.setMetadata(metadata); - } - - public void setStrata(Strata strata) { - lengthAgeKey.setStrata(strata); - } - - public void setSpecies(Species species) { - lengthAgeKey.setSpecies(species); - } -} \ No newline at end of file Deleted: 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,78 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.LengthWeightKey; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.Map; - -/** - * Model to import {@link LengthWeightKey}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LengthWeightKeyImportModel extends AbstractImportModel<LengthWeightKeyImportModelRow> { - - protected final Map<String, Voyage> voyageMap; - - protected final Map<String, SizeCategory> sizeCategoryMap; - - protected final Map<String, Species> speciesMap; - - public LengthWeightKeyImportModel(char separator, - Map<String, Voyage> voyageMap, - Map<String, SizeCategory> sizeCategoryMap, - Map<String, Species> speciesMap) { - super(separator); - this.voyageMap = voyageMap; - this.sizeCategoryMap = sizeCategoryMap; - this.speciesMap = speciesMap; - - /* - voyage - sizeCategory - aParameter - bParameter - codeMemo - */ - - newMandatoryColumn("aParameter", LengthWeightKey.PROPERTY_APARAMETER, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn("bParameter", LengthWeightKey.PROPERTY_BPARAMETER, EchobaseCsvUtil.PRIMITIVE_FLOAT); - - newForeignKeyColumn(LengthWeightKeyImportModelRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - newForeignKeyColumn(LengthWeightKeyImportModelRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); - newForeignKeyColumn("baracoudacode", LengthWeightKeyImportModelRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); - } - - @Override - public LengthWeightKeyImportModelRow newEmptyInstance() { - return new LengthWeightKeyImportModelRow(); - } -} \ No newline at end of file Deleted: 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,97 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.LengthWeightKey; -import fr.ifremer.echobase.entities.data.LengthWeightKeyImpl; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.Species; - -import java.io.Serializable; - -/** - * Bean used as a row for import of {@link LengthWeightKeyImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class LengthWeightKeyImportModelRow implements Serializable { - - private static final long serialVersionUID = 1L; - - public static final String PROPERTY_VOYAGE = "voyage"; - - public static final String PROPERTY_SPECIES = "species"; - - public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; - - protected Species species; - - protected SizeCategory sizeCategory; - - protected Voyage voyage; - - protected final LengthWeightKey lengthWeightKey; - - public LengthWeightKeyImportModelRow() { - lengthWeightKey = new LengthWeightKeyImpl(); - } - - public LengthWeightKey getLengthWeightKey() { - return lengthWeightKey; - } - - public Species getSpecies() { - return species; - } - - public void setSpecies(Species species) { - this.species = species; - } - - public SizeCategory getSizeCategory() { - return sizeCategory; - } - - public void setSizeCategory(SizeCategory sizeCategory) { - this.sizeCategory = sizeCategory; - } - - public Voyage getVoyage() { - return voyage; - } - - public void setVoyage(Voyage voyage) { - this.voyage = voyage; - } - - public void setBParameter(float BParameter) { - lengthWeightKey.setBParameter(BParameter); - } - - public void setAParameter(float AParameter) { - lengthWeightKey.setAParameter(AParameter); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,44 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; - -/** - * TODO - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class MapImportModel extends AbstractImportModel<MapImportModelRow> { - - public MapImportModel(char separator) { - super(separator); - } - - @Override - public MapImportModelRow newEmptyInstance() { - return new MapImportModelRow(); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,33 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -/** - * TODO - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class MapImportModelRow { -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,44 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; - -/** - * TODO - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class MapResultImportModel extends AbstractImportModel<MapResultImportModelRow> { - - public MapResultImportModel(char separator) { - super(separator); - } - - @Override - public MapResultImportModelRow newEmptyInstance() { - return new MapResultImportModelRow(); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,33 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -/** - * TODO - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class MapResultImportModelRow { -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,82 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.Gear; -import fr.ifremer.echobase.entities.references.Vessel; - -import java.util.Map; - -/** - * Model to import {@link Operation}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class OperationImportModel extends AbstractImportModel<OperationImportModelRow> { - - public OperationImportModel(char separator, - Map<String, Vessel> vesselMap, - Map<String, Gear> gearMap, - Map<String, DepthStratum> depthStratumMap) { - super(separator); - - /* - vesselName // - id // - depthStratumID // - gearShootingStartTime // - midHaulLatitude // - midHaulLongitude // - gearShootingStartLatitude // - gearShootingStartLongitude // - gearShootingEndTime // - gearShootingEndLatitude // - gearShootingEndLongitude // - gearName // - */ - newForeignKeyColumn("vesselName", OperationImportModelRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); - - newForeignKeyColumn("gearCode", Operation.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); - newForeignKeyColumn("depthStratumID", Operation.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStratumMap); - newMandatoryColumn("operationID", Operation.PROPERTY_ID); - newMandatoryColumn(Operation.PROPERTY_MID_HAUL_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Operation.PROPERTY_MID_HAUL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_TIME, EchobaseCsvUtil.DAY_TIME_SECOND); - newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_END_TIME, EchobaseCsvUtil.DAY_TIME_SECOND); - newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_END_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_END_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); - } - - @Override - public OperationImportModelRow newEmptyInstance() { - return new OperationImportModelRow(); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,108 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.OperationImpl; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.Gear; -import fr.ifremer.echobase.entities.references.Vessel; - -import java.util.Date; - -/** - * Bean used as a row for import of {@link OperationImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class OperationImportModelRow { - - public static final String PROPERTY_VESSEL = Transect.PROPERTY_VESSEL; - - protected Vessel vessel; - - protected final Operation operation; - - public OperationImportModelRow() { - operation = new OperationImpl(); - } - - public Operation getOperation() { - return operation; - } - - public Vessel getVessel() { - return vessel; - } - - public void setVessel(Vessel vessel) { - this.vessel = vessel; - } - - public void setId(String id) { - operation.setId(id); - } - - public void setGearShootingStartTime(Date gearShootingStartTime) { - operation.setGearShootingStartTime(gearShootingStartTime); - } - - public void setGearShootingEndTime(Date gearShootingEndTime) { - operation.setGearShootingEndTime(gearShootingEndTime); - } - - public void setGearShootingStartLatitude(Float gearShootingStartLatitude) { - operation.setGearShootingStartLatitude(gearShootingStartLatitude); - } - - public void setGearShootingEndLatitude(Float gearShootingEndLatitude) { - operation.setGearShootingEndLatitude(gearShootingEndLatitude); - } - - public void setGearShootingStartLongitude(Float gearShootingStartLongitude) { - operation.setGearShootingStartLongitude(gearShootingStartLongitude); - } - - public void setGearShootingEndLongitude(Float gearShootingEndLongitude) { - operation.setGearShootingEndLongitude(gearShootingEndLongitude); - } - - public void setMidHaulLatitude(float midHauleLatitude) { - operation.setMidHaulLatitude(midHauleLatitude); - } - - public void setMidHaulLongitude(float midHauleLongitude) { - operation.setMidHaulLongitude(midHauleLongitude); - } - - public void setDepthStratum(DepthStratum depthStratum) { - operation.setDepthStratum(depthStratum); - } - - public void setGear(Gear gear) { - operation.setGear(gear); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,66 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.OperationMetadataValue; -import fr.ifremer.echobase.entities.references.OperationMetadata; -import fr.ifremer.echobase.entities.references.Vessel; - -import java.util.Map; - -/** - * Model to import {@link OperationMetadataValue}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class OperationMetadataValueImportModel extends AbstractImportModel<OperationMetadataValueImportModelRow> { - - public OperationMetadataValueImportModel(char separator, - Map<String, Vessel> vesselMap, - Map<String, OperationMetadata> operationMetadataMap, - Map<String, Operation> operationMap) { - super(separator); - - /* - vesselName/ - id/ - metadataType/ - operationMetadataValue/ - */ - - newForeignKeyColumn("vesselName", OperationMetadataValueImportModelRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); - newForeignKeyColumn("operationID", OperationMetadataValueImportModelRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); - - newForeignKeyColumn("metadataType", OperationMetadataValue.PROPERTY_OPERATION_METADATA, OperationMetadata.class, OperationMetadata.PROPERTY_NAME, operationMetadataMap); - newMandatoryColumn("operationMetadataValue", OperationMetadataValue.PROPERTY_DATA_VALUE); - } - - @Override - public OperationMetadataValueImportModelRow newEmptyInstance() { - return new OperationMetadataValueImportModelRow(); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,82 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.OperationMetadataValue; -import fr.ifremer.echobase.entities.data.OperationMetadataValueImpl; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.references.OperationMetadata; -import fr.ifremer.echobase.entities.references.Vessel; - -/** - * Bean used as a row for import of {@link OperationMetadataValueImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class OperationMetadataValueImportModelRow { - - public static final String PROPERTY_VESSEL = Transect.PROPERTY_VESSEL; - - public static final String PROPERTY_OPERATION = Transect.PROPERTY_OPERATION; - - protected Operation operation; - - protected Vessel vessel; - - protected final OperationMetadataValue operationMetadataValue; - - public OperationMetadataValueImportModelRow() { - operationMetadataValue = new OperationMetadataValueImpl(); - } - - public OperationMetadataValue getOperationMetadataValue() { - return operationMetadataValue; - } - - public void setOperationMetadata(OperationMetadata operationMetadata) { - operationMetadataValue.setOperationMetadata(operationMetadata); - } - - public void setDataValue(String dataValue) { - operationMetadataValue.setDataValue(dataValue); - } - - public Operation getOperation() { - return operation; - } - - public void setOperation(Operation operation) { - this.operation = operation; - } - - public Vessel getVessel() { - return vessel; - } - - public void setVessel(Vessel vessel) { - this.vessel = vessel; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,44 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; - -/** - * Model to import cells associations from region cells and esdu cells. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class RegionCellAssociationImportModel extends AbstractImportModel<RegionCellAssociationImportModelRow> { - - public RegionCellAssociationImportModel(char separator) { - super(separator); - } - - @Override - public RegionCellAssociationImportModelRow newEmptyInstance() { - return new RegionCellAssociationImportModelRow(); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,69 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Cell; - -/** - * Bean used as a row for import of {@link RegionCellAssociationImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class RegionCellAssociationImportModelRow { - - protected Cell esduCell; - - protected Cell regionSurfaceCell; - - protected Cell regionBottomCell; - - public RegionCellAssociationImportModelRow() { - } - - - public Cell getEsduCell() { - return esduCell; - } - - public void setEsduCell(Cell esduCell) { - this.esduCell = esduCell; - } - - public Cell getRegionSurfaceCell() { - return regionSurfaceCell; - } - - public void setRegionSurfaceCell(Cell regionSurfaceCell) { - this.regionSurfaceCell = regionSurfaceCell; - } - - public Cell getRegionBottomCell() { - return regionBottomCell; - } - - public void setRegionBottomCell(Cell regionBottomCell) { - this.regionBottomCell = regionBottomCell; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,67 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.CellType; -import fr.ifremer.echobase.entities.references.DepthStratum; - -import java.util.Map; - -/** - * Model to import cells (with type "region"). - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class RegionCellImportModel extends AbstractImportModel<RegionCellImportModelRow> { - - protected final CellType cellType; - - public RegionCellImportModel(char separator, - CellType cellType, - Map<String, Voyage> voyageMap, - Map<String, DepthStratum> depthStramMap) { - super(separator); - this.cellType = cellType; - - newForeignKeyColumn(RegionCellImportModelRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - newForeignKeyColumn(RegionCellImportModelRow.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStramMap); - - newMandatoryColumn(RegionCellImportModelRow.PROPERTY_NAME); - newMandatoryColumn("x", RegionCellImportModelRow.PROPERTY_DATA_X, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn("y", RegionCellImportModelRow.PROPERTY_DATA_Y, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn("z", RegionCellImportModelRow.PROPERTY_DATA_Z, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn("surface", RegionCellImportModelRow.PROPERTY_DATA_SURFACE, EchobaseCsvUtil.PRIMITIVE_FLOAT); - } - - @Override - public RegionCellImportModelRow newEmptyInstance() { - RegionCellImportModelRow row = new RegionCellImportModelRow(); - row.getCell().setCellType(cellType); - return row; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,126 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.CellImpl; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DepthStratum; - -/** - * A row when import region cells using model {@link RegionCellImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class RegionCellImportModelRow { - - public static final String PROPERTY_NAME = "name"; - - public static final String PROPERTY_VOYAGE = "voyage"; - - public static final String PROPERTY_DEPTH_STRATUM = "depthStratum"; - - public static final String PROPERTY_DATA_X = "dataX"; - - public static final String PROPERTY_DATA_Y = "dataY"; - - public static final String PROPERTY_DATA_Z = "dataZ"; - - public static final String PROPERTY_DATA_SURFACE = "dataSurface"; - - protected Voyage voyage; - - protected DepthStratum depthStratum; - - protected final Cell cell; - - protected float dataX; - - protected float dataY; - - protected float dataZ; - - protected float dataSurface; - - public RegionCellImportModelRow() { - this.cell = new CellImpl(); - } - - public Cell getCell() { - return cell; - } - - public Voyage getVoyage() { - return voyage; - } - - public DepthStratum getDepthStratum() { - return depthStratum; - } - - public float getDataX() { - return dataX; - } - - public float getDataY() { - return dataY; - } - - public float getDataZ() { - return dataZ; - } - - public float getDataSurface() { - return dataSurface; - } - - public void setName(String name) { - getCell().setName(name); - } - - public void setVoyage(Voyage voyage) { - this.voyage = voyage; - } - - public void setDepthStratum(DepthStratum depthStratum) { - this.depthStratum = depthStratum; - } - - public void setDataX(float dataX) { - this.dataX = dataX; - } - - public void setDataY(float dataY) { - this.dataY = dataY; - } - - public void setDataZ(float dataZ) { - this.dataZ = dataZ; - } - - public void setDataSurface(float dataSurface) { - this.dataSurface = dataSurface; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,44 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; - -/** - * TODO - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class RegionResultImportModel extends AbstractImportModel<RegionResultImportModelRow> { - - public RegionResultImportModel(char separator) { - super(separator); - } - - @Override - public RegionResultImportModelRow newEmptyInstance() { - return new RegionResultImportModelRow(); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,33 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -/** - * TODO - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class RegionResultImportModelRow { -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,88 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.Sample; -import fr.ifremer.echobase.entities.data.SampleData; -import fr.ifremer.echobase.entities.references.SexCategory; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.Map; - -/** - * Model to import {@link SampleData}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class SubSampleImportModel extends AbstractImportModel<SubSampleImportModelRow> { - - public SubSampleImportModel(char separator, - Map<String, Operation> operationMap, - Map<String, Species> speciesMap, - Map<String, SizeCategory> sizeCategoryMap, - Map<String, SexCategory> sexCategoryMap) { - super(separator); - - /* - operationID - subHaul - baracoudacode - sizeCategory - sexCategory - sampleWeight - numberSampled - - numberAtLength - weightAtLength - units - round - */ - - newIgnoredColumn("subHaul"); - newIgnoredColumn("units"); - newIgnoredColumn("round"); - - newForeignKeyColumn("operationID", SubSampleImportModelRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); - newForeignKeyColumn("baracoudacode", SubSampleImportModelRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); - newForeignKeyColumn(SubSampleImportModelRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); - newForeignKeyColumn(SubSampleImportModelRow.PROPERTY_SEX_CATEGORY, SexCategory.class, SexCategory.PROPERTY_NAME, sexCategoryMap); - - newMandatoryColumn(Sample.PROPERTY_SAMPLE_WEIGHT, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Sample.PROPERTY_NUMBER_SAMPLED, EchobaseCsvUtil.PRIMITIVE_INTEGER); - - newMandatoryColumn(SubSampleImportModelRow.PROPERTY_NUMBER_AT_LENGTH, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(SubSampleImportModelRow.PROPERTY_WEIGHT_AT_LENGTH, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); - newMandatoryColumn(SubSampleImportModelRow.PROPERTY_LENGTH_CLASS); - } - - @Override - public SubSampleImportModelRow newEmptyInstance() { - return new SubSampleImportModelRow(); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,145 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.Sample; -import fr.ifremer.echobase.entities.data.SampleImpl; -import fr.ifremer.echobase.entities.references.SexCategory; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.Species; - -/** - * Bean used as a row for import of {@link SubSampleImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class SubSampleImportModelRow { - - - public static final String PROPERTY_OPERATION = "operation"; - - public static final String PROPERTY_SPECIES = "species"; - - public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; - - public static final String PROPERTY_SEX_CATEGORY = "sexCategory"; - - public static final String PROPERTY_SAMPLE = "sample"; - - public static final String PROPERTY_NUMBER_AT_LENGTH = "numberAtLength"; - - public static final String PROPERTY_WEIGHT_AT_LENGTH = "weightAtLength"; - - public static final String PROPERTY_LENGTH_CLASS = "lengthClass"; - - protected Operation operation; - - protected Species species; - - protected SizeCategory sizeCategory; - - protected SexCategory sexCategory; - - protected final Sample sample; - - protected float numberAtLength; - - protected Float weightAtLength; - - protected String lengthClass; - - public SubSampleImportModelRow() { - sample = new SampleImpl(); - } - - public Sample getSample() { - return sample; - } - - public Operation getOperation() { - return operation; - } - - public void setOperation(Operation operation) { - this.operation = operation; - } - - public Species getSpecies() { - return species; - } - - public void setSpecies(Species species) { - this.species = species; - } - - public SizeCategory getSizeCategory() { - return sizeCategory; - } - - public void setSizeCategory(SizeCategory sizeCategory) { - this.sizeCategory = sizeCategory; - } - - public void setNumberSampled(Integer numberSampled) { - sample.setNumberSampled(numberSampled); - } - - public void setSampleWeight(Float sampleWeight) { - sample.setSampleWeight(sampleWeight); - } - - public SexCategory getSexCategory() { - return sexCategory; - } - - public void setSexCategory(SexCategory sexCategory) { - this.sexCategory = sexCategory; - } - - public float getNumberAtLength() { - return numberAtLength; - } - - public void setNumberAtLength(float numberAtLength) { - this.numberAtLength = numberAtLength; - } - - public Float getWeightAtLength() { - return weightAtLength; - } - - public void setWeightAtLength(Float weightAtLength) { - this.weightAtLength = weightAtLength; - } - - public String getLengthClass() { - return lengthClass; - } - - public void setLengthClass(String lengthClass) { - this.lengthClass = lengthClass; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,78 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.Sample; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.Species; - -import java.util.Map; - -/** - * Model to import {@link Sample} of total type. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class TotalSampleImportModel extends AbstractImportModel<TotalSampleImportModelRow> { - - public TotalSampleImportModel(char separator, - Map<String, Operation> operationMap, - Map<String, Species> speciesMap, - Map<String, SizeCategory> sizeCategoryMap) { - super(separator); - - /* - operationID - baracoudacode - sizeCategory - sampleWeight - numberSampled - meanLength - meanWeight - noPerKg - sortedWeight - */ - - newForeignKeyColumn("operationID", TotalSampleImportModelRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); - newForeignKeyColumn("baracoudacode", TotalSampleImportModelRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); - newForeignKeyColumn(TotalSampleImportModelRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); - - newMandatoryColumn(Sample.PROPERTY_SAMPLE_WEIGHT, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Sample.PROPERTY_NUMBER_SAMPLED, EchobaseCsvUtil.NA_TO_INTEGER_PARSER); - - newMandatoryColumn(TotalSampleImportModelRow.PROPERTY_MEAN_LENGTH, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); - newMandatoryColumn(TotalSampleImportModelRow.PROPERTY_MEAN_WEIGHT, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); - newMandatoryColumn(TotalSampleImportModelRow.PROPERTY_NO_PER_KG, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); - newMandatoryColumn(TotalSampleImportModelRow.PROPERTY_SORTED_WEIGHT, EchobaseCsvUtil.PRIMITIVE_FLOAT); - } - - @Override - public TotalSampleImportModelRow newEmptyInstance() { - return new TotalSampleImportModelRow(); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,143 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Operation; -import fr.ifremer.echobase.entities.data.Sample; -import fr.ifremer.echobase.entities.data.SampleImpl; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.Species; - -/** - * Bean used as a row for import of {@link TotalSampleImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class TotalSampleImportModelRow { - - public static final String PROPERTY_OPERATION = "operation"; - - public static final String PROPERTY_SPECIES = "species"; - - public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; - - public static final String PROPERTY_SAMPLE = "sample"; - - public static final String PROPERTY_MEAN_LENGTH = "meanLength"; - - public static final String PROPERTY_MEAN_WEIGHT = "meanWeight"; - - public static final String PROPERTY_NO_PER_KG = "noPerKg"; - - public static final String PROPERTY_SORTED_WEIGHT = "sortedWeight"; - - protected Float meanLength; - - protected Float meanWeight; - - protected Float noPerKg; - - protected float sortedWeight; - - protected Operation operation; - - protected Species species; - - protected SizeCategory sizeCategory; - - protected final Sample sample; - - public TotalSampleImportModelRow() { - sample = new SampleImpl(); - } - - public Sample getSample() { - return sample; - } - - public Operation getOperation() { - return operation; - } - - public void setOperation(Operation operation) { - this.operation = operation; - } - - public Species getSpecies() { - return species; - } - - public void setSpecies(Species species) { - this.species = species; - } - - public SizeCategory getSizeCategory() { - return sizeCategory; - } - - public void setSizeCategory(SizeCategory sizeCategory) { - this.sizeCategory = sizeCategory; - } - - public void setNumberSampled(Integer numberSampled) { - sample.setNumberSampled(numberSampled); - } - - public void setSampleWeight(Float sampleWeight) { - sample.setSampleWeight(sampleWeight); - } - - public Float getMeanLength() { - return meanLength; - } - - public void setMeanLength(Float meanLength) { - this.meanLength = meanLength; - } - - public Float getMeanWeight() { - return meanWeight; - } - - public void setMeanWeight(Float meanWeight) { - this.meanWeight = meanWeight; - } - - public Float getNoPerKg() { - return noPerKg; - } - - public void setNoPerKg(Float noPerKg) { - this.noPerKg = noPerKg; - } - - public float getSortedWeight() { - return sortedWeight; - } - - public void setSortedWeight(float sortedWeight) { - this.sortedWeight = sortedWeight; - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,77 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Vessel; - -import java.util.Map; - -/** - * Model to import transects. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class TransectImportModel extends AbstractImportModel<TransectImportModelRow> { - - public TransectImportModel(char separator, - Map<String, Voyage> voyageMap, - Map<String, Vessel> vesselMap) { - super(separator); - newForeignKeyColumn( - "voyageName", TransectImportModelRow.PROPERTY_VOYAGE, - Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - - newForeignKeyColumn( - "vesselName", Transect.PROPERTY_VESSEL, - Vessel.class, Vessel.PROPERTY_NAME, vesselMap); - - newMandatoryColumn(Transect.PROPERTY_TITLE); - newMandatoryColumn(Transect.PROPERTY_TRANSECT_ABSTRACT); - newMandatoryColumn(Transect.PROPERTY_STRATUM); - newMandatoryColumn(Transect.PROPERTY_COMMENT); - - newMandatoryColumn(Transect.PROPERTY_DATE_CREATED, EchobaseCsvUtil.IMPORT_DAY_TIME2); - newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_START, EchobaseCsvUtil.IMPORT_DAY_TIME2); - newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_END, EchobaseCsvUtil.IMPORT_DAY_TIME2); - - newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LON_MIN, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LAT_MIN, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LON_MAX, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LAT_MAX, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn(Transect.PROPERTY_LINESTRING); - } - - @Override - public TransectImportModelRow newEmptyInstance() { - return new TransectImportModelRow(); - } - -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,125 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.data.TransectImpl; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Vessel; - -import java.io.Serializable; -import java.util.Date; - -/** - * Bean used as a row for import of {@link TransectImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class TransectImportModelRow implements Serializable { - - private static final long serialVersionUID = 1L; - - public static final String PROPERTY_VOYAGE = "voyage"; - - protected Voyage voyage; - - protected Transect transect; - - public TransectImportModelRow() { - transect = new TransectImpl(); - } - - public Transect getTransect() { - return transect; - } - - public Voyage getVoyage() { - return voyage; - } - - public void setVoyage(Voyage voyage) { - this.voyage = voyage; - } - - public void setTitle(String title) { - transect.setTitle(title); - } - - public void setTransectAbstract(String transectAbstract) { - transect.setTransectAbstract(transectAbstract); - } - - public void setComment(String comment) { - transect.setComment(comment); - } - - public void setDateCreated(Date dateCreated) { - transect.setDateCreated(dateCreated); - } - - public void setGeospatialLonMin(float geospatialLonMin) { - transect.setGeospatialLonMin(geospatialLonMin); - } - - public void setGeospatialLonMax(float geospatialLonMax) { - transect.setGeospatialLonMax(geospatialLonMax); - } - - public void setGeospatialLatMin(float geospatialLatMin) { - transect.setGeospatialLatMin(geospatialLatMin); - } - - public void setGeospatialLatMax(float geospatialLatMax) { - transect.setGeospatialLatMax(geospatialLatMax); - } - - public void setLinestring(String linestring) { - transect.setLinestring(linestring); - } - - public void setGeospatialVerticalMin(float geospatialVerticalMin) { - transect.setGeospatialVerticalMin(geospatialVerticalMin); - } - - public void setGeospatialVerticalMax(float geospatialVerticalMax) { - transect.setGeospatialVerticalMax(geospatialVerticalMax); - } - - public void setTimeCoverageStart(Date timeCoverageStart) { - transect.setTimeCoverageStart(timeCoverageStart); - } - - public void setTimeCoverageEnd(Date timeCoverageEnd) { - transect.setTimeCoverageEnd(timeCoverageEnd); - } - - public void setStratum(String stratum) { - transect.setStratum(stratum); - } - - public void setVessel(Vessel vessel) { - transect.setVessel(vessel); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,58 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Transit; -import fr.ifremer.echobase.entities.data.Voyage; - -import java.util.Map; - -/** - * Model to import Transits. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class TransitImportModel extends AbstractImportModel<TransitImportModelRow> { - - public static final String TRANSIT_VoyageId = "voyageName"; - - public TransitImportModel(char separator, - Map<String, Voyage> voyageMap) { - super(separator); - newForeignKeyColumn("voyageName", TransitImportModelRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - newMandatoryColumn(Transit.PROPERTY_DESCRIPTION); - newMandatoryColumn(Transit.PROPERTY_START_TIME, EchobaseCsvUtil.DAY_TIME); - newMandatoryColumn(Transit.PROPERTY_END_TIME, EchobaseCsvUtil.DAY_TIME); - newMandatoryColumn(Transit.PROPERTY_START_LOCALITY); - newMandatoryColumn(Transit.PROPERTY_END_LOCALITY); - } - - @Override - public TransitImportModelRow newEmptyInstance() { - return new TransitImportModelRow(); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModelRow.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModelRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,93 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.entities.data.Transit; -import fr.ifremer.echobase.entities.data.TransitImpl; -import fr.ifremer.echobase.entities.data.Voyage; - -import java.util.Date; - -/** - * Bean used as a row for import of {@link TransitImportModel}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class TransitImportModelRow { - - public static final String PROPERTY_VOYAGE = "voyage"; - - protected Voyage voyage; - - protected final Transit transit; - - protected String description; - - protected String relatedActivity; - - protected Date startTime; - - protected Date endTime; - - protected String startLocality; - - protected String endLocality; - - public TransitImportModelRow() { - transit = new TransitImpl(); - } - - public Transit getTransit() { - return transit; - } - - public Voyage getVoyage() { - return voyage; - } - - public void setVoyage(Voyage voyage) { - this.voyage = voyage; - } - - public void setDescription(String description) { - transit.setDescription(description); - } - - public void setStartTime(Date startTime) { - transit.setStartTime(startTime); - } - - public void setEndTime(Date endTime) { - transit.setEndTime(endTime); - } - - public void setStartLocality(String startLocality) { - transit.setStartLocality(startLocality); - } - - public void setEndLocality(String endLocality) { - transit.setEndLocality(endLocality); - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/VoyageImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/VoyageImportModel.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/VoyageImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,52 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.csv; - -import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.csv.EchobaseCsvUtil; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.data.VoyageImpl; - -/** - * Model to import Voyages. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class VoyageImportModel extends AbstractImportModel<Voyage> { - - public VoyageImportModel(char separator) { - super(separator); - newMandatoryColumn(Voyage.PROPERTY_NAME); - newMandatoryColumn(Voyage.PROPERTY_START_DATE, EchobaseCsvUtil.DAY); - newMandatoryColumn(Voyage.PROPERTY_END_DATE, EchobaseCsvUtil.DAY); - newMandatoryColumn(Voyage.PROPERTY_START_PORT); - newMandatoryColumn(Voyage.PROPERTY_END_PORT); - } - - @Override - public Voyage newEmptyInstance() { - return new VoyageImpl(); - } -} Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractImportConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,67 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import fr.ifremer.echobase.EchoBaseIOUtil; +import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; + +import java.io.File; + +/** + * Common import data configuration. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public abstract class AbstractImportConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + protected File workingDirectory; + + public File getWorkingDirectory() { + return workingDirectory; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + public abstract InputFile[] getInputFiles(); + + public long computeNbSteps() { + long result = 0; + for (InputFile inputFile : getInputFiles()) { + + if (inputFile.hasFile()) { + int currentLines = EchoBaseIOUtil.countLines( + inputFile.getFile()); + result += currentLines; + } + } + setNbSteps(result); + return result; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -43,7 +43,6 @@ import fr.ifremer.echobase.entities.references.SpeciesCategoryDAO; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AcousticDataImportConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,267 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import fr.ifremer.echobase.InputFile; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Configuration of a "accoustic datas" import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class AcousticDataImportConfiguration extends AbstractImportConfiguration { + + private static final long serialVersionUID = 1L; + + /** Selected voyage id where to import datas. */ + protected String voyageId; + + /** Selected vessel id to find out transect where to import datas. */ + protected String vesselId; + + /** Flag to always add new dataAcquisition when a new instrument is found in movies file. */ + protected boolean addDataAcquisition = true; + + /** Manual transceiverAcquisitionAbsorptionDescription. */ + protected String transceiverAcquisitionAbsorptionDescription = "(i) Equation: Francois and garrison 1982,(ii) CTD, (iii) nominal value for entire data set"; + + /** Manual acquisitionSoftwareVersion (ER60 instrument). */ + protected String acquisitionSoftwareVersionER60; + + /** Manual acquisitionSoftwareVersion (ME70 instrument). */ + protected String acquisitionSoftwareVersionME70; + + /** Manual loggedDataFormat. */ + protected String loggedDataFormat = ".hac and .raw formats"; + + /** Manual loggedDataDatatype. */ + protected String loggedDataDatatype = "‘raw’ digitisation samples"; + + /** Manual pingDutyCycle. */ + protected String pingDutyCycle = "Ifremer's standard ping duty cycle"; + +// /** Manual echosounderSoundSpeed. */ +// protected String echosounderSoundSpeed = "Variable"; + + /** Manual soundSpeedCalculations (ER60 instrument). */ + protected String soundSpeedCalculationsER60 = "(i) Equation: Mackenzie (1980), (ii) CTD, (iii) nominal value for entire data set"; + + /** Manual soundSpeedCalculations (ME70 instrument). */ + protected String soundSpeedCalculationsME70 = "(i) Equation: Mackenzie (1980), (ii) Hull-mounted thermosalinometer, (iii) surface absorption value recomputed every 30s and applied to the entire data set"; + + /** Manual sounderConstant. */ + protected String sounderConstant = "NA"; + + /** Manual processingTemplate. */ + protected String processingTemplate; + + /** Manual processingDescription. */ + protected String processingDescription; + + /** Manual digitThreshold. */ + protected float digitThreshold = -100f; + + /** Manual acousticDensityUnit. */ + protected String acousticDensityUnit = "sA"; + + /** Manual notes. */ + protected String notes; + + /** Cell position reference for esdu cell datas. */ + protected CellPositionReference cellPositionReference; + + /** Movies file to import. */ + protected final InputFile moviesFile; + + + public AcousticDataImportConfiguration(Locale locale) { + moviesFile = InputFile.newFile(l_(locale, "echobase.common.moviesFile")); + } + + public String getVoyageId() { + return voyageId; + } + + public void setVoyageId(String voyageId) { + this.voyageId = voyageId; + } + + public String getVesselId() { + return vesselId; + } + + public void setVesselId(String vesselId) { + this.vesselId = vesselId; + } + + public boolean isAddDataAcquisition() { + return addDataAcquisition; + } + + public void setAddDataAcquisition(boolean addDataAcquisition) { + this.addDataAcquisition = addDataAcquisition; + } + + public String getTransceiverAcquisitionAbsorptionDescription() { + return transceiverAcquisitionAbsorptionDescription; + } + + public void setTransceiverAcquisitionAbsorptionDescription(String transceiverAcquisitionAbsorptionDescription) { + this.transceiverAcquisitionAbsorptionDescription = transceiverAcquisitionAbsorptionDescription; + } + + public String getAcquisitionSoftwareVersionER60() { + return acquisitionSoftwareVersionER60; + } + + public void setAcquisitionSoftwareVersionER60(String acquisitionSoftwareVersionER60) { + this.acquisitionSoftwareVersionER60 = acquisitionSoftwareVersionER60; + } + + public String getAcquisitionSoftwareVersionME70() { + return acquisitionSoftwareVersionME70; + } + + public void setAcquisitionSoftwareVersionME70(String acquisitionSoftwareVersionME70) { + this.acquisitionSoftwareVersionME70 = acquisitionSoftwareVersionME70; + } + + public String getLoggedDataFormat() { + return loggedDataFormat; + } + + public void setLoggedDataFormat(String loggedDataFormat) { + this.loggedDataFormat = loggedDataFormat; + } + + public String getLoggedDataDatatype() { + return loggedDataDatatype; + } + + public void setLoggedDataDatatype(String loggedDataDatatype) { + this.loggedDataDatatype = loggedDataDatatype; + } + + public String getPingDutyCycle() { + return pingDutyCycle; + } + + public void setPingDutyCycle(String pingDutyCycle) { + this.pingDutyCycle = pingDutyCycle; + } + +// public String getEchosounderSoundSpeed() { +// return echosounderSoundSpeed; +// } +// +// public void setEchosounderSoundSpeed(String echosounderSoundSpeed) { +// this.echosounderSoundSpeed = echosounderSoundSpeed; +// } + + public String getSoundSpeedCalculationsER60() { + return soundSpeedCalculationsER60; + } + + public void setSoundSpeedCalculationsER60(String soundSpeedCalculationsER60) { + this.soundSpeedCalculationsER60 = soundSpeedCalculationsER60; + } + + public String getSoundSpeedCalculationsME70() { + return soundSpeedCalculationsME70; + } + + public void setSoundSpeedCalculationsME70(String soundSpeedCalculationsME70) { + this.soundSpeedCalculationsME70 = soundSpeedCalculationsME70; + } + + public String getSounderConstant() { + return sounderConstant; + } + + public void setSounderConstant(String sounderConstant) { + this.sounderConstant = sounderConstant; + } + + public float getDigitThreshold() { + return digitThreshold; + } + + public void setDigitThreshold(float digitThreshold) { + this.digitThreshold = digitThreshold; + } + + public String getAcousticDensityUnit() { + return acousticDensityUnit; + } + + public void setAcousticDensityUnit(String acousticDensityUnit) { + this.acousticDensityUnit = acousticDensityUnit; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public InputFile getMoviesFile() { + return moviesFile; + } + + public String getProcessingTemplate() { + return processingTemplate; + } + + public void setProcessingTemplate(String processingTemplate) { + this.processingTemplate = processingTemplate; + } + + public String getProcessingDescription() { + return processingDescription; + } + + public void setProcessingDescription(String processingDescription) { + this.processingDescription = processingDescription; + } + + public CellPositionReference getCellPositionReference() { + return cellPositionReference; + } + + public void setCellPositionReference(CellPositionReference cellPositionReference) { + this.cellPositionReference = cellPositionReference; + } + + @Override + public InputFile[] getInputFiles() { + return new InputFile[]{moviesFile}; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -49,9 +49,8 @@ import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.AcousticDataImportConfiguration; -import fr.ifremer.echobase.services.csv.AcousticDataImportModel; -import fr.ifremer.echobase.services.csv.AcousticDataImportModelRow; +import fr.ifremer.echobase.services.importdata.csv.AcousticDataImportModel; +import fr.ifremer.echobase.services.importdata.csv.AcousticDataImportRow; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -188,7 +187,7 @@ Locale locale = getLocale(); String dataProcessingId = null; try { - Import<AcousticDataImportModelRow> importer = + Import<AcousticDataImportRow> importer = EchoBaseImport.newImport(csvModel, reader); DataAcquisition dataAcquisition = null; DataProcessing dataProcessing = null; @@ -197,7 +196,7 @@ int rowNumber = 0; configuration.incrementsProgression(); - for (AcousticDataImportModelRow row : importer) { + for (AcousticDataImportRow row : importer) { configuration.incrementsProgression(); rowNumber++; @@ -421,7 +420,7 @@ protected void createEsduCellData(String suffix, Cell cell, Map<String, DataMetadata> dataMetadatas, - AcousticDataImportModelRow row, + AcousticDataImportRow row, DataDAO dao, CsvFileImportResult importResult) { @@ -488,7 +487,7 @@ Cell cell, Map<String, DataMetadata> dataMetadatas, boolean surface, - AcousticDataImportModelRow row, + AcousticDataImportRow row, DataDAO dao, CsvFileImportResult importResult) { @@ -574,7 +573,7 @@ AcousticInstrument instrument, String softwareVersion, String soundSpeedCalculations, - AcousticDataImportModelRow row, + AcousticDataImportRow row, DataAcquisitionDAO dataAcquisitionDAO) { String transceiverAcquisitionAbsorptionDescription = @@ -629,7 +628,7 @@ String id, String softwareVersion, String soundSpeedCalculations, - AcousticDataImportModelRow row, + AcousticDataImportRow row, DataProcessingDAO dataProcessingDAO) { String transceiverAcquisitionAbsorptionDescription = Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,87 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import fr.ifremer.echobase.InputFile; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Configuration of a "catches data import". + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class CatchesDataImportConfiguration extends AbstractImportConfiguration { + + private static final long serialVersionUID = 1L; + + /** Selected voyage id where to import datas. */ + protected String voyageId; + + /** Sample file to import. */ + protected final InputFile totalSampleFile; + + /** Sub sample file to import. */ + protected final InputFile subSampleFile; + + /** Biometry sample file to import. */ + protected final InputFile biometrySampleFile; + + public CatchesDataImportConfiguration(Locale locale) { + totalSampleFile = InputFile.newFile( + l_(locale, "echobase.common.totalSampleFile")); + subSampleFile = InputFile.newFile( + l_(locale, "echobase.common.subSampleFile")); + biometrySampleFile = InputFile.newFile( + l_(locale, "echobase.common.biometrySampleFile")); + } + + public String getVoyageId() { + return voyageId; + } + + public void setVoyageId(String voyageId) { + this.voyageId = voyageId; + } + + public InputFile getTotalSampleFile() { + return totalSampleFile; + } + + public InputFile getSubSampleFile() { + return subSampleFile; + } + + public InputFile getBiometrySampleFile() { + return biometrySampleFile; + } + + @Override + public InputFile[] getInputFiles() { + return new InputFile[]{totalSampleFile, subSampleFile, biometrySampleFile}; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -49,13 +49,12 @@ import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.entities.references.SpeciesCategoryDAO; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; -import fr.ifremer.echobase.services.csv.BiometrySampleImportModel; -import fr.ifremer.echobase.services.csv.BiometrySampleImportModelRow; -import fr.ifremer.echobase.services.csv.SubSampleImportModel; -import fr.ifremer.echobase.services.csv.SubSampleImportModelRow; -import fr.ifremer.echobase.services.csv.TotalSampleImportModel; -import fr.ifremer.echobase.services.csv.TotalSampleImportModelRow; +import fr.ifremer.echobase.services.importdata.csv.BiometrySampleImportModel; +import fr.ifremer.echobase.services.importdata.csv.BiometrySampleImportRow; +import fr.ifremer.echobase.services.importdata.csv.SubSampleImportModel; +import fr.ifremer.echobase.services.importdata.csv.SubSampleImportRow; +import fr.ifremer.echobase.services.importdata.csv.TotalSampleImportModel; +import fr.ifremer.echobase.services.importdata.csv.TotalSampleImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Import; @@ -193,11 +192,11 @@ Reader reader = getInputFileReader(inputFile); Locale locale = getLocale(); try { - Import<TotalSampleImportModelRow> importer = + Import<TotalSampleImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (TotalSampleImportModelRow row : importer) { + for (TotalSampleImportRow row : importer) { configuration.incrementsProgression(); Operation operation = row.getOperation(); @@ -354,11 +353,11 @@ Reader reader = getInputFileReader(inputFile); try { - Import<SubSampleImportModelRow> importer = + Import<SubSampleImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (SubSampleImportModelRow row : importer) { + for (SubSampleImportRow row : importer) { configuration.incrementsProgression(); Operation operation = row.getOperation(); @@ -458,11 +457,11 @@ Reader reader = getInputFileReader(inputFile); try { - Import<BiometrySampleImportModelRow> importer = + Import<BiometrySampleImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (BiometrySampleImportModelRow row : importer) { + for (BiometrySampleImportRow row : importer) { configuration.incrementsProgression(); Operation operation = row.getOperation(); Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CellPositionReference.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CellPositionReference.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CellPositionReference.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CellPositionReference.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,74 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import fr.ifremer.echobase.I18nAble; + +import static org.nuiton.i18n.I18n.n_; + +/** + * To define cell position reference in acoustic import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public enum CellPositionReference implements I18nAble { + + /** Begin. */ + START(n_("echobase.common.cellPositionReference.start")) { + @Override + public String getMetadataNameSuffix() { + return "Start"; + } + }, + + /** Mid. */ + MID(n_("echobase.common.cellPositionReference.mid")) { + @Override + public String getMetadataNameSuffix() { + return "Bary"; + } + }, + + /** End. */ + END(n_("echobase.common.cellPositionReference.end")) { + @Override + public String getMetadataNameSuffix() { + return "End"; + } + }; + + private final String i18nKey; + + CellPositionReference(String i18nKey) { + this.i18nKey = i18nKey; + } + + @Override + public String getI18nKey() { + return i18nKey; + } + + public abstract String getMetadataNameSuffix(); +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CellPositionReference.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,186 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import fr.ifremer.echobase.InputFile; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Configuration of a "common data complete" import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class CommonDataImportConfiguration extends AbstractImportConfiguration { + + private static final long serialVersionUID = 1L; + + /** Selected import mode. */ + protected CommonDataImportMode importMode; + + /** Selected mission id to use in voyage. */ + protected String missionId; + + /** Selected voyage id to use (in mode 2). */ + protected String voyageId; + + /** Selected area of operation to use for voyage. */ + protected String areaOfOperationId; + + /** Manual description of voyage. */ + protected String voyageDescription; + + /** transit related activity. */ + protected String transitRelatedActivity; + + /** transect license. */ + protected String transectLicence; + + /** transect geospatialVerticalPositive. */ + protected String transectGeospatialVerticalPositive = "down"; + + /** transect binUnitsPingAxis. */ + protected String transectBinUnitsPingAxis = "1 nautical mile"; + + /** Manual datum to use in voyage. */ + protected String datum = "WGS84"; + + /** Voyage file to import. */ + protected final InputFile voyageFile; + + /** Transit file to import. */ + protected final InputFile transitFile; + + /** Transect file to import. */ + protected final InputFile transectFile; + + public CommonDataImportConfiguration(Locale locale) { + voyageFile = InputFile.newFile( + l_(locale, "echobase.common.voyageFile")); + transitFile = InputFile.newFile( + l_(locale, "echobase.common.transitFile")); + transectFile = InputFile.newFile( + l_(locale, "echobase.common.transectFile")); + } + + public CommonDataImportMode getImportMode() { + return importMode; + } + + public void setImportMode(CommonDataImportMode importMode) { + this.importMode = importMode; + } + + public String getMissionId() { + return missionId; + } + + public void setMissionId(String missionId) { + this.missionId = missionId; + } + + public String getAreaOfOperationId() { + return areaOfOperationId; + } + + public void setAreaOfOperationId(String areaOfOperationId) { + this.areaOfOperationId = areaOfOperationId; + } + + public String getVoyageId() { + return voyageId; + } + + public void setVoyageId(String voyageId) { + this.voyageId = voyageId; + } + + public String getVoyageDescription() { + return voyageDescription; + } + + public void setVoyageDescription(String voyageDescription) { + this.voyageDescription = voyageDescription; + } + + public String getDatum() { + return datum; + } + + public void setDatum(String datum) { + this.datum = datum; + } + + public String getTransitRelatedActivity() { + return transitRelatedActivity; + } + + public void setTransitRelatedActivity(String transitRelatedActivity) { + this.transitRelatedActivity = transitRelatedActivity; + } + + public String getTransectLicence() { + return transectLicence; + } + + public void setTransectLicence(String transectLicence) { + this.transectLicence = transectLicence; + } + + public String getTransectGeospatialVerticalPositive() { + return transectGeospatialVerticalPositive; + } + + public void setTransectGeospatialVerticalPositive(String transectGeospatialVerticalPositive) { + this.transectGeospatialVerticalPositive = transectGeospatialVerticalPositive; + } + + public String getTransectBinUnitsPingAxis() { + return transectBinUnitsPingAxis; + } + + public void setTransectBinUnitsPingAxis(String transectBinUnitsPingAxis) { + this.transectBinUnitsPingAxis = transectBinUnitsPingAxis; + } + + public InputFile getVoyageFile() { + return voyageFile; + } + + public InputFile getTransitFile() { + return transitFile; + } + + public InputFile getTransectFile() { + return transectFile; + } + + @Override + public InputFile[] getInputFiles() { + return new InputFile[]{voyageFile, transitFile, transectFile}; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportMode.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataImportMode.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportMode.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportMode.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,54 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import fr.ifremer.echobase.I18nAble; + +import static org.nuiton.i18n.I18n.n_; + +/** + * To define common data import mode. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public enum CommonDataImportMode implements I18nAble { + + /** Import Voyage / Transit / Transect. */ + ALL(n_("echobase.common.commonDataImportMode.all")), + + /** Import all common data from Transect to Operation. */ + TRANSECT(n_("echobase.common.commonDataImportMode.transect")); + + private final String i18nKey; + + CommonDataImportMode(String i18nKey) { + this.i18nKey = i18nKey; + } + + @Override + public String getI18nKey() { + return i18nKey; + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportMode.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -44,13 +44,12 @@ import fr.ifremer.echobase.entities.references.MissionDAO; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.CommonDataImportConfiguration; -import fr.ifremer.echobase.services.csv.TransectImportModel; -import fr.ifremer.echobase.services.csv.TransectImportModelRow; -import fr.ifremer.echobase.services.csv.TransitImportModel; -import fr.ifremer.echobase.services.csv.TransitImportModelRow; -import fr.ifremer.echobase.services.csv.VoyageImportModel; import fr.ifremer.echobase.services.exceptions.MissionNameAlreadyExistException; +import fr.ifremer.echobase.services.importdata.csv.TransectImportModel; +import fr.ifremer.echobase.services.importdata.csv.TransectImportRow; +import fr.ifremer.echobase.services.importdata.csv.TransitImportModel; +import fr.ifremer.echobase.services.importdata.csv.TransitImportRow; +import fr.ifremer.echobase.services.importdata.csv.VoyageImportModel; import org.nuiton.topia.TopiaException; import org.nuiton.util.csv.Import; import org.nuiton.util.csv.ImportModel; @@ -238,11 +237,11 @@ Reader reader = getInputFileReader(inputFile); try { - Import<TransitImportModelRow> importer = + Import<TransitImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (TransitImportModelRow row : importer) { + for (TransitImportRow row : importer) { configuration.incrementsProgression(); Transit transit = row.getTransit(); @@ -294,11 +293,11 @@ Reader reader = getInputFileReader(inputFile); try { - Import<TransectImportModelRow> importer = + Import<TransectImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (TransectImportModelRow row : importer) { + for (TransectImportRow row : importer) { configuration.incrementsProgression(); Transect transect = row.getTransect(); Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/OperationImportConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,89 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import fr.ifremer.echobase.InputFile; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Configuration of a "operation" import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class OperationImportConfiguration extends AbstractImportConfiguration { + + private static final long serialVersionUID = 1L; + + /** Selected voyage id where to import datas. */ + protected String voyageId; + + /** operation file to import. */ + protected final InputFile operationFile; + + /** operation metadatas file to import. */ + protected final InputFile operationMetadataFile; + + /** gear metadatas file to import. */ + protected final InputFile gearMetadataFile; + + public OperationImportConfiguration(Locale locale) { + operationFile = InputFile.newFile( + l_(locale, "echobase.common.operationFile")); + operationMetadataFile = InputFile.newFile( + l_(locale, "echobase.common.operationMetadataFile")); + gearMetadataFile = InputFile.newFile( + l_(locale, "echobase.common.gearMetadataFile")); + } + + public String getVoyageId() { + return voyageId; + } + + public void setVoyageId(String voyageId) { + this.voyageId = voyageId; + } + + public InputFile getOperationFile() { + return operationFile; + } + + public InputFile getOperationMetadataFile() { + return operationMetadataFile; + } + + public InputFile getGearMetadataFile() { + return gearMetadataFile; + } + + @Override + public InputFile[] getInputFiles() { + return new InputFile[]{operationFile, + operationMetadataFile, + gearMetadataFile}; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -46,13 +46,12 @@ import fr.ifremer.echobase.entities.references.OperationMetadata; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.OperationImportConfiguration; -import fr.ifremer.echobase.services.csv.GearMetadataValueImportModel; -import fr.ifremer.echobase.services.csv.GearMetadataValueImportModelRow; -import fr.ifremer.echobase.services.csv.OperationImportModel; -import fr.ifremer.echobase.services.csv.OperationImportModelRow; -import fr.ifremer.echobase.services.csv.OperationMetadataValueImportModel; -import fr.ifremer.echobase.services.csv.OperationMetadataValueImportModelRow; +import fr.ifremer.echobase.services.importdata.csv.GearMetadataValueImportModel; +import fr.ifremer.echobase.services.importdata.csv.GearMetadataValueImportRow; +import fr.ifremer.echobase.services.importdata.csv.OperationImportModel; +import fr.ifremer.echobase.services.importdata.csv.OperationImportRow; +import fr.ifremer.echobase.services.importdata.csv.OperationMetadataValueImportModel; +import fr.ifremer.echobase.services.importdata.csv.OperationMetadataValueImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Import; @@ -169,11 +168,11 @@ Reader reader = getInputFileReader(inputFile); try { - Import<OperationImportModelRow> importer = + Import<OperationImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (OperationImportModelRow row : importer) { + for (OperationImportRow row : importer) { configuration.incrementsProgression(); Vessel vessel = row.getVessel(); @@ -232,11 +231,11 @@ Reader reader = getInputFileReader(inputFile); try { - Import<OperationMetadataValueImportModelRow> importer = + Import<OperationMetadataValueImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (OperationMetadataValueImportModelRow row : importer) { + for (OperationMetadataValueImportRow row : importer) { configuration.incrementsProgression(); Operation operation = row.getOperation(); @@ -288,11 +287,11 @@ Reader reader = getInputFileReader(inputFile); try { - Import<GearMetadataValueImportModelRow> importer = + Import<GearMetadataValueImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (GearMetadataValueImportModelRow row : importer) { + for (GearMetadataValueImportRow row : importer) { configuration.incrementsProgression(); Operation operation = row.getOperation(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -49,16 +49,14 @@ import fr.ifremer.echobase.entities.references.SpeciesCategoryDAO; import fr.ifremer.echobase.services.DecoratorService; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.configurations.ResultsImportMode; -import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeAndSpeciesCategoryImportModel; -import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeAndSpeciesCategoryImportModelRow; -import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeImportModel; -import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeImportModelRow; -import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndAgeCategoryImportModel; -import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndAgeCategoryImportModelRow; -import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndSizeCategoryImportModel; -import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndSizeCategoryImportModelRow; +import fr.ifremer.echobase.services.importdata.csv.EsduResultByEchotypeAndSpeciesCategoryImportModel; +import fr.ifremer.echobase.services.importdata.csv.EsduResultByEchotypeAndSpeciesCategoryImportRow; +import fr.ifremer.echobase.services.importdata.csv.EsduResultByEchotypeImportModel; +import fr.ifremer.echobase.services.importdata.csv.EsduResultByEchotypeImportRow; +import fr.ifremer.echobase.services.importdata.csv.EsduResultBySpeciesAndAgeCategoryImportModel; +import fr.ifremer.echobase.services.importdata.csv.EsduResultBySpeciesAndAgeCategoryImportRow; +import fr.ifremer.echobase.services.importdata.csv.EsduResultBySpeciesAndSizeCategoryImportModel; +import fr.ifremer.echobase.services.importdata.csv.EsduResultBySpeciesAndSizeCategoryImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDAO; @@ -87,7 +85,8 @@ private static final Log log = LogFactory.getLog(ResultsEsduCellImportService.class); - public static final Pattern REMOVE_DOUBLE_QUOTES_PATTERN = Pattern.compile("\"(.+)\""); + public static final Pattern REMOVE_DOUBLE_QUOTES_PATTERN = + Pattern.compile("\"(.+)\""); @Override protected String getImportLabel() { @@ -102,22 +101,18 @@ ResultsImportMode importMode = configuration.getImportMode(); Map<String, Species> speciesMap = getEntitiesMap( - Species.class, - EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + Species.class, EchoBaseFunctions.SPECIES_BARACOUDA_CODE); Map<String, SizeCategory> sizeCategoryMap = Maps.newTreeMap(); sizeCategoryMap.putAll(getEntitiesMap( - SizeCategory.class, - EchoBaseFunctions.SIZE_CATEGORY_NAME)); + SizeCategory.class, EchoBaseFunctions.SIZE_CATEGORY_NAME)); Map<String, AgeCategory> ageCategoryMap = Maps.newTreeMap(); ageCategoryMap.putAll(getEntitiesMap( - AgeCategory.class, - EchoBaseFunctions.AGE_CATEGORY_NAME)); + AgeCategory.class, EchoBaseFunctions.AGE_CATEGORY_NAME)); Map<String, DataMetadata> dataMetadataMap = getEntitiesMap( - DataMetadata.class, - EchoBaseFunctions.DATA_METADATA_NAME); + DataMetadata.class, EchoBaseFunctions.DATA_METADATA_NAME); // get selected voyage Voyage voyage = getEntityById(Voyage.class, @@ -125,34 +120,32 @@ // index all echotypes of thi voyage Map<String, Echotype> echotypeMap = Maps.uniqueIndex( - voyage.getEchotype(), - EchoBaseFunctions.ECHOTYPE_NAME); + voyage.getEchotype(), EchoBaseFunctions.ECHOTYPE_NAME); InputFile inputFile; CsvFileImportResult importResult; switch (importMode) { - case ACOUSTIC_BY_ECHOTYPE: { + case ESDU_BY_ECHOTYPE: { - inputFile = configuration.getAcousticByEchotypeFile(); + inputFile = configuration.getEsduByEchotypeFile(); - importResult = importAcousticByEchotypeFile( + importResult = importByEchotypeFile( configuration, inputFile, voyage, echotypeMap, dataMetadataMap ); - } break; - case ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY: { + case ESDU_BY_ECHOTYPE_AND_SPECIES_CATEGORY: { inputFile = - configuration.getAcousticByEchotypeAndSpeciesCategoryFile(); - importResult = importAcousticByEchotypeAndSpeciesCategoryFile( + configuration.getEsduByEchotypeAndSpeciesCategoryFile(); + importResult = importByEchotypeAndSpeciesCategoryFile( configuration, inputFile, voyage, @@ -164,11 +157,11 @@ } break; - case ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY: { + case ESDU_BY_SPECIES_AND_SIZE_CATEGORY: { inputFile = - configuration.getAcousticBySpeciesAndSizeCategoryFile(); - importResult = importAcousticBySpeciesAndSizeCategoryFile( + configuration.getEsduBySpeciesAndSizeCategoryFile(); + importResult = importBySpeciesAndSizeCategoryFile( configuration, inputFile, voyage, @@ -179,12 +172,12 @@ } break; - case ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY: { + case ESDU_BY_SPECIES_AND_AGE_CATEGORY: { inputFile = - configuration.getAcousticBySpeciesAndAgeCategoryFile(); + configuration.getEsduBySpeciesAndAgeCategoryFile(); - importResult = importAcousticBySpeciesAndAgeCategoryFile( + importResult = importBySpeciesAndAgeCategoryFile( configuration, inputFile, voyage, @@ -192,7 +185,6 @@ speciesMap, ageCategoryMap ); - } break; default: @@ -206,7 +198,7 @@ return result; } - private CsvFileImportResult importAcousticByEchotypeFile( + private CsvFileImportResult importByEchotypeFile( ResultsImportConfiguration configuration, InputFile inputFile, Voyage voyage, @@ -226,13 +218,13 @@ inputFile.getFileName()); List<DataMetadata> metas = getMetas( - AcousticResultByEchotypeImportModel.COLUMN_NAMES_TO_EXCLUDE, + EsduResultByEchotypeImportModel.COLUMN_NAMES_TO_EXCLUDE, dataMetadataMap, header); CellDAO cellDAO = (CellDAO) getDAO(Cell.class); - AcousticResultByEchotypeImportModel csvModel = new AcousticResultByEchotypeImportModel( + EsduResultByEchotypeImportModel csvModel = new EsduResultByEchotypeImportModel( serviceContext.getConfiguration().getCsvSeparator(), echotypeMap, voyage, @@ -249,13 +241,13 @@ Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); Reader reader = getInputFileReader(inputFile); try { - Import<AcousticResultByEchotypeImportModelRow> importer = + Import<EsduResultByEchotypeImportRow> importer = EchoBaseImport.newImport(csvModel, reader); int rowNumber = 0; configuration.incrementsProgression(); - for (AcousticResultByEchotypeImportModelRow row : importer) { + for (EsduResultByEchotypeImportRow row : importer) { configuration.incrementsProgression(); rowNumber++; @@ -272,7 +264,7 @@ if (rowNumber % 100 == 0) { if (log.isInfoEnabled()) { - log.info("Treate row " + rowNumber + " for esdu cell " + + log.info("Treat row " + rowNumber + " for esdu cell " + cell.getName() + " and category " + categoryDecorator.toString(category)); } @@ -302,7 +294,7 @@ } } - private CsvFileImportResult importAcousticByEchotypeAndSpeciesCategoryFile( + private CsvFileImportResult importByEchotypeAndSpeciesCategoryFile( ResultsImportConfiguration configuration, InputFile inputFile, Voyage voyage, @@ -326,7 +318,7 @@ List<DataMetadata> metas = getMetas( - AcousticResultByEchotypeAndSpeciesCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, + EsduResultByEchotypeAndSpeciesCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, dataMetadataMap, header); @@ -335,7 +327,7 @@ SpeciesCategoryDAO speciesCategoryDAO = getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); - AcousticResultByEchotypeAndSpeciesCategoryImportModel csvModel = new AcousticResultByEchotypeAndSpeciesCategoryImportModel( + EsduResultByEchotypeAndSpeciesCategoryImportModel csvModel = new EsduResultByEchotypeAndSpeciesCategoryImportModel( serviceContext.getConfiguration().getCsvSeparator(), echotypeMap, speciesMap, @@ -353,13 +345,13 @@ Reader reader = getInputFileReader(inputFile); try { - EchoBaseImport<AcousticResultByEchotypeAndSpeciesCategoryImportModelRow> importer = + EchoBaseImport<EsduResultByEchotypeAndSpeciesCategoryImportRow> importer = EchoBaseImport.newImport(csvModel, reader); int rowNumber = 0; configuration.incrementsProgression(); - for (AcousticResultByEchotypeAndSpeciesCategoryImportModelRow row : importer) { + for (EsduResultByEchotypeAndSpeciesCategoryImportRow row : importer) { configuration.incrementsProgression(); rowNumber++; @@ -376,7 +368,7 @@ if (rowNumber % 100 == 0) { if (log.isInfoEnabled()) { - log.info("Treate row " + rowNumber + " for esdu cell " + + log.info("Treat row " + rowNumber + " for esdu cell " + cell.getName() + " and category " + categoryDecorator.toString(category)); } @@ -407,7 +399,7 @@ } } - private CsvFileImportResult importAcousticBySpeciesAndSizeCategoryFile( + private CsvFileImportResult importBySpeciesAndSizeCategoryFile( ResultsImportConfiguration configuration, InputFile inputFile, Voyage voyage, Map<String, DataMetadata> dataMetadataMap, @@ -429,7 +421,7 @@ List<DataMetadata> metas = getMetas( - AcousticResultBySpeciesAndSizeCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, + EsduResultBySpeciesAndSizeCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, dataMetadataMap, header); @@ -441,7 +433,7 @@ SizeCategoryDAO sizeCategoryDAO = getDAO(SizeCategory.class, SizeCategoryDAO.class); - AcousticResultBySpeciesAndSizeCategoryImportModel csvModel = new AcousticResultBySpeciesAndSizeCategoryImportModel( + EsduResultBySpeciesAndSizeCategoryImportModel csvModel = new EsduResultBySpeciesAndSizeCategoryImportModel( serviceContext.getConfiguration().getCsvSeparator(), speciesMap, voyage, @@ -457,13 +449,13 @@ Reader reader = getInputFileReader(inputFile); try { - EchoBaseImport<AcousticResultBySpeciesAndSizeCategoryImportModelRow> importer = + EchoBaseImport<EsduResultBySpeciesAndSizeCategoryImportRow> importer = EchoBaseImport.newImport(csvModel, reader); int rowNumber = 0; configuration.incrementsProgression(); - for (AcousticResultBySpeciesAndSizeCategoryImportModelRow row : importer) { + for (EsduResultBySpeciesAndSizeCategoryImportRow row : importer) { configuration.incrementsProgression(); rowNumber++; @@ -499,7 +491,7 @@ if (rowNumber % 100 == 0) { if (log.isInfoEnabled()) { - log.info("Treate row " + rowNumber + " for esdu cell " + + log.info("Treat row " + rowNumber + " for esdu cell " + cell.getName() + " and category " + categoryDecorator.toString(category)); } @@ -530,7 +522,7 @@ } } - private CsvFileImportResult importAcousticBySpeciesAndAgeCategoryFile( + private CsvFileImportResult importBySpeciesAndAgeCategoryFile( ResultsImportConfiguration configuration, InputFile inputFile, Voyage voyage, @@ -553,7 +545,7 @@ List<DataMetadata> metas = getMetas( - AcousticResultBySpeciesAndAgeCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, + EsduResultBySpeciesAndAgeCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, dataMetadataMap, header); @@ -566,7 +558,7 @@ getDAO(AgeCategory.class, AgeCategoryDAO.class); - AcousticResultBySpeciesAndAgeCategoryImportModel csvModel = new AcousticResultBySpeciesAndAgeCategoryImportModel( + EsduResultBySpeciesAndAgeCategoryImportModel csvModel = new EsduResultBySpeciesAndAgeCategoryImportModel( serviceContext.getConfiguration().getCsvSeparator(), speciesMap, voyage, @@ -582,13 +574,13 @@ Reader reader = getInputFileReader(inputFile); try { - EchoBaseImport<AcousticResultBySpeciesAndAgeCategoryImportModelRow> importer = + EchoBaseImport<EsduResultBySpeciesAndAgeCategoryImportRow> importer = EchoBaseImport.newImport(csvModel, reader); int rowNumber = 0; configuration.incrementsProgression(); - for (AcousticResultBySpeciesAndAgeCategoryImportModelRow row : importer) { + for (EsduResultBySpeciesAndAgeCategoryImportRow row : importer) { configuration.incrementsProgression(); rowNumber++; @@ -624,7 +616,7 @@ if (rowNumber % 100 == 0) { if (log.isInfoEnabled()) { - log.info("Treate row " + rowNumber + " for esdu cell " + + log.info("Treat row " + rowNumber + " for esdu cell " + cell.getName() + " and category " + categoryDecorator.toString(category)); } Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,208 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import fr.ifremer.echobase.InputFile; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Configuration of a "results" import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ResultsImportConfiguration extends AbstractImportConfiguration { + + private static final long serialVersionUID = 1L; + + /** Selected voyage id where to import datas. */ + protected String voyageId; + + /** Selected vessel id to find out transect where to import datas. */ + protected String vesselId; + + /** resultLabel to store while importing acoustic result. */ + protected String resultLabel; + + /** Type of import. */ + protected ResultsImportMode importMode; + + /** Acoustic result by echotype import. */ + protected final InputFile esduByEchotypeFile; + + /** Acoustic result by echotype and species category import. */ + protected final InputFile esduByEchotypeAndSpeciesCategoryFile; + + /** Acoustic result by species and size category import. */ + protected final InputFile esduBySpeciesAndSizeCategoryFile; + + /** Acoustic result by species and age category import. */ + protected final InputFile esduBySpeciesAndAgeCategoryFile; + + /** Region file to import. */ + protected final InputFile regionsFile; + + /** Region cell associations file to import. */ + protected final InputFile regionAssociationFile; + + /** Region cell results file to import. */ + protected final InputFile regionResultFile; + + /** Map cells file to import. */ + protected final InputFile mapsFile; + + /** Map cell results file to import. */ + protected final InputFile mapResultFile; + + /** Echotype file to import. */ + protected final InputFile echotypeFile; + + /** LengthAgeKey file to import. */ + protected final InputFile lengthAgeKeyFile; + + /** LengthWeightKey file to import. */ + protected final InputFile lengthWeightKeyFile; + + public ResultsImportConfiguration(Locale locale) { + regionsFile = InputFile.newFile( + l_(locale, "echobase.common.cellRegionsFile")); + regionAssociationFile = InputFile.newFile( + l_(locale, "echobase.common.cellRegionAssociationFile")); + regionResultFile = InputFile.newFile( + l_(locale, "echobase.common.cellRegionResultFile")); + mapsFile = InputFile.newFile( + l_(locale, "echobase.common.cellMapsFile")); + mapResultFile = InputFile.newFile( + l_(locale, "echobase.common.cellMapResultFile")); + echotypeFile = InputFile.newFile( + l_(locale, "echobase.common.echotypeFile")); + lengthAgeKeyFile = InputFile.newFile( + l_(locale, "echobase.common.lengthAgeKeyFile")); + lengthWeightKeyFile = InputFile.newFile( + l_(locale, "echobase.common.lengthWeightKeyFile")); + esduByEchotypeFile = InputFile.newFile( + l_(locale, "echobase.common.esduByEchotypeFile")); + esduByEchotypeAndSpeciesCategoryFile = InputFile.newFile( + l_(locale, "echobase.common.esduByEchotypeAndSpeciesCategoryFile")); + esduBySpeciesAndSizeCategoryFile = InputFile.newFile( + l_(locale, "echobase.common.esduBySpeciesAndSizeCategoryFile")); + esduBySpeciesAndAgeCategoryFile = InputFile.newFile( + l_(locale, "echobase.common.esduBySpeciesAndAgeCategoryFile")); + } + + public String getVoyageId() { + return voyageId; + } + + public void setVoyageId(String voyageId) { + this.voyageId = voyageId; + } + + public String getVesselId() { + return vesselId; + } + + public void setVesselId(String vesselId) { + this.vesselId = vesselId; + } + + public ResultsImportMode getImportMode() { + return importMode; + } + + public void setImportMode(ResultsImportMode importMode) { + this.importMode = importMode; + } + + public String getResultLabel() { + return resultLabel; + } + + public void setResultLabel(String resultLabel) { + this.resultLabel = resultLabel; + } + + public InputFile getRegionsFile() { + return regionsFile; + } + + public InputFile getRegionAssociationFile() { + return regionAssociationFile; + } + + public InputFile getRegionResultFile() { + return regionResultFile; + } + + public InputFile getMapsFile() { + return mapsFile; + } + + public InputFile getMapResultFile() { + return mapResultFile; + } + + public InputFile getEchotypeFile() { + return echotypeFile; + } + + public InputFile getLengthAgeKeyFile() { + return lengthAgeKeyFile; + } + + public InputFile getLengthWeightKeyFile() { + return lengthWeightKeyFile; + } + + public InputFile getEsduByEchotypeFile() { + return esduByEchotypeFile; + } + + public InputFile getEsduByEchotypeAndSpeciesCategoryFile() { + return esduByEchotypeAndSpeciesCategoryFile; + } + + public InputFile getEsduBySpeciesAndSizeCategoryFile() { + return esduBySpeciesAndSizeCategoryFile; + } + + public InputFile getEsduBySpeciesAndAgeCategoryFile() { + return esduBySpeciesAndAgeCategoryFile; + } + + @Override + public InputFile[] getInputFiles() { + return new InputFile[]{regionsFile, regionAssociationFile, + regionResultFile, + mapsFile, mapResultFile, echotypeFile, + lengthAgeKeyFile, lengthWeightKeyFile, + esduByEchotypeFile, + esduByEchotypeAndSpeciesCategoryFile, + esduBySpeciesAndSizeCategoryFile, + esduBySpeciesAndAgeCategoryFile}; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportMode.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportMode.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportMode.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportMode.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,69 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import fr.ifremer.echobase.I18nAble; + +import static org.nuiton.i18n.I18n.n_; + +/** + * To define results import mode. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public enum ResultsImportMode implements I18nAble { + + /** Import results at voyage level. */ + VOYAGE(n_("echobase.common.resultsImportMode.voyage")), + + /** Import cells Region. */ + REGION(n_("echobase.common.resultsImportMode.region")), + + /** Import cells Map. */ + MAP(n_("echobase.common.resultsImportMode.map")), + + /** Import esdu results by echotype. */ + ESDU_BY_ECHOTYPE(n_("echobase.common.resultsImportMode.esdu.byEchotype")), + + /** Import esdu results by echotype and species category. */ + ESDU_BY_ECHOTYPE_AND_SPECIES_CATEGORY(n_("echobase.common.resultsImportMode.esdu.byEchotypeAndSpeciesCategory")), + + /** Import esdu results by species and size category. */ + ESDU_BY_SPECIES_AND_SIZE_CATEGORY(n_("echobase.common.resultsImportMode.esdu.bySpeciesAndSizeCategory")), + + /** Import esdu results by species and age category. */ + ESDU_BY_SPECIES_AND_AGE_CATEGORY(n_("echobase.common.resultsImportMode.esdu.bySpeciesAndAgeCategory")); + + private final String i18nKey; + + ResultsImportMode(String i18nKey) { + this.i18nKey = i18nKey; + } + + @Override + public String getI18nKey() { + return i18nKey; + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportMode.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -27,8 +27,6 @@ import fr.ifremer.echobase.csv.CsvFileImportResult; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.configurations.ResultsImportMode; import java.util.List; @@ -61,31 +59,30 @@ service = getService(ResultsVoyageImportService.class); break; - case ACOUSTIC_BY_ECHOTYPE: - case ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY: - case ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY: - case ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY: + case ESDU_BY_ECHOTYPE: + case ESDU_BY_ECHOTYPE_AND_SPECIES_CATEGORY: + case ESDU_BY_SPECIES_AND_SIZE_CATEGORY: + case ESDU_BY_SPECIES_AND_AGE_CATEGORY: service = getService(ResultsEsduCellImportService.class); break; case REGION: - service = getService(ResultsEsduCellImportService.class); + service = getService(ResultsRegionCellImportService.class); break; case MAP: - service = getService(ResultsEsduCellImportService.class); + service = getService(ResultsMapCellImportService.class); break; default: throw new EchoBaseTechnicalException( "Can not treate import result of type " + importMode); } - List<CsvFileImportResult> result = service.startImport(configuration, - user); - + List<CsvFileImportResult> result; + result = service.startImport(configuration, user); return result; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,7 +23,10 @@ */ package fr.ifremer.echobase.services.importdata; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.csv.CsvFileImportResult; import fr.ifremer.echobase.csv.EchoBaseImport; @@ -31,19 +34,25 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Data; +import fr.ifremer.echobase.entities.data.DataDAO; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.DepthStratum; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.csv.MapImportModel; -import fr.ifremer.echobase.services.csv.MapImportModelRow; -import fr.ifremer.echobase.services.csv.MapResultImportModel; -import fr.ifremer.echobase.services.csv.MapResultImportModelRow; +import fr.ifremer.echobase.services.importdata.csv.MapCellImportModel; +import fr.ifremer.echobase.services.importdata.csv.MapCellImportRow; +import fr.ifremer.echobase.services.importdata.csv.MapCellResultImportModel; +import fr.ifremer.echobase.services.importdata.csv.MapCellResultImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.ImportRuntimeException; import java.io.Reader; +import java.util.Arrays; import java.util.List; +import java.util.Map; import static org.nuiton.i18n.I18n.l_; @@ -98,9 +107,43 @@ protected CsvFileImportResult importMapFile(ResultsImportConfiguration configuration, InputFile inputFile, Voyage voyage) throws ImportException { - MapImportModel csvModel = new MapImportModel( - serviceContext.getConfiguration().getCsvSeparator()); + CellType cellType = getEntityByProperty( + CellType.class, CellType.PROPERTY_ID, "Map"); + Preconditions.checkNotNull(cellType); + + DataMetadata dataXMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "LongitudeEnd"); + Preconditions.checkNotNull(dataXMeta); + + DataMetadata dataYMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "LatitudeEnd"); + Preconditions.checkNotNull(dataYMeta); + + DataMetadata dataDepthSurfaceMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefSurfaceEnd"); + Preconditions.checkNotNull(dataDepthSurfaceMeta); + + DataMetadata dataDepthBottomMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefBottomEnd"); + Preconditions.checkNotNull(dataDepthBottomMeta); + + DataMetadata dataSurfaceMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "Surface"); + Preconditions.checkNotNull(dataSurfaceMeta); + + // authorize only the selected voyage to be imported + Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( + voyage), EchoBaseFunctions.VOYAGE_NAME); + + Map<String, DepthStratum> depthStratumMap = getEntitiesMap( + DepthStratum.class, + EchoBaseFunctions.DEPTH_STRATUM_ID); + + MapCellImportModel csvModel = new MapCellImportModel( + serviceContext.getConfiguration().getCsvSeparator(), cellType, + voyageMap, depthStratumMap); + if (log.isInfoEnabled()) { log.info("Starts import of Map cells from file " + inputFile.getFileName()); @@ -110,19 +153,79 @@ inputFile.getFileName()); CellDAO dao = getDAO(Cell.class, CellDAO.class); + DataDAO dataDao = getDAO(Data.class, DataDAO.class); Reader reader = getInputFileReader(inputFile); try { - EchoBaseImport<MapImportModelRow> importer = + EchoBaseImport<MapCellImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (MapImportModelRow row : importer) { + int rowNumber = 0; + for (MapCellImportRow row : importer) { + + rowNumber++; configuration.incrementsProgression(); - //TODO - importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); + //TODO Do me + + Cell cell = create(dao, row.getCell()); + + voyage.addPostCell(cell); + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Cell); + + createCellData(dataDao, + cell, + dataXMeta, + String.valueOf(row.getDataX()), + importResult + ); + + createCellData(dataDao, + cell, + dataYMeta, + String.valueOf(row.getDataY()), + importResult + ); + + String depthStratumId = row.getDepthStratum().getId(); + + DataMetadata depth = null; + + if ("SURF".equals(depthStratumId)) { + + depth = dataDepthSurfaceMeta; + } else if ("CLAS".equals(depthStratumId)) { + depth = dataDepthBottomMeta; + + } else { + throw new ImportException( + "[Line " + rowNumber + + "] Depth stratum should be 'SURF' or 'CLAS', " + + "but was " + depthStratumId); + } + + createCellData(dataDao, + cell, + depth, + String.valueOf(row.getDataZ()), + importResult + ); + + createCellData(dataDao, + cell, + dataSurfaceMeta, + String.valueOf(row.getDataLag()), + importResult + ); + + createCellData(dataDao, + cell, + dataSurfaceMeta, + String.valueOf(row.getDataValue()), + importResult + ); } return importResult; @@ -136,7 +239,7 @@ protected CsvFileImportResult importMapResultFile(ResultsImportConfiguration configuration, InputFile inputFile, Voyage voyage) throws ImportException { - MapResultImportModel csvModel = new MapResultImportModel( + MapCellResultImportModel csvModel = new MapCellResultImportModel( serviceContext.getConfiguration().getCsvSeparator()); if (log.isInfoEnabled()) { @@ -153,15 +256,16 @@ Reader reader = getInputFileReader(inputFile); try { - EchoBaseImport<MapResultImportModelRow> importer = + EchoBaseImport<MapCellResultImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (MapResultImportModelRow row : importer) { + for (MapCellResultImportRow row : importer) { configuration.incrementsProgression(); - //TODO + //TODO Do me + importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); } @@ -174,4 +278,17 @@ } + private void createCellData(DataDAO dao, + Cell cell, + DataMetadata dataMetaData, + String dataValue, + CsvFileImportResult importResult) { + + Data data = create(dao); + data.setDataMetadata(dataMetaData); + data.setDataValue(dataValue); + cell.addData(data); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Data); + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -41,13 +41,12 @@ import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DepthStratum; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.csv.MapImportModel; -import fr.ifremer.echobase.services.csv.MapImportModelRow; -import fr.ifremer.echobase.services.csv.MapResultImportModel; -import fr.ifremer.echobase.services.csv.MapResultImportModelRow; -import fr.ifremer.echobase.services.csv.RegionCellImportModel; -import fr.ifremer.echobase.services.csv.RegionCellImportModelRow; +import fr.ifremer.echobase.services.importdata.csv.RegionCellAssociationImportModel; +import fr.ifremer.echobase.services.importdata.csv.RegionCellAssociationImportRow; +import fr.ifremer.echobase.services.importdata.csv.RegionCellImportModel; +import fr.ifremer.echobase.services.importdata.csv.RegionCellImportRow; +import fr.ifremer.echobase.services.importdata.csv.RegionCellResultImportModel; +import fr.ifremer.echobase.services.importdata.csv.RegionCellResultImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.ImportRuntimeException; @@ -171,12 +170,12 @@ Reader reader = getInputFileReader(inputFile); try { - EchoBaseImport<RegionCellImportModelRow> importer = + EchoBaseImport<RegionCellImportRow> importer = EchoBaseImport.newImport(csvModel, reader); int rowNumber = 0; configuration.incrementsProgression(); - for (RegionCellImportModelRow row : importer) { + for (RegionCellImportRow row : importer) { rowNumber++; configuration.incrementsProgression(); @@ -257,7 +256,7 @@ protected CsvFileImportResult importRegionAssociationFile(ResultsImportConfiguration configuration, InputFile inputFile, Voyage voyage) throws ImportException { - MapImportModel csvModel = new MapImportModel( + RegionCellAssociationImportModel csvModel = new RegionCellAssociationImportModel( serviceContext.getConfiguration().getCsvSeparator()); if (log.isInfoEnabled()) { @@ -272,15 +271,16 @@ Reader reader = getInputFileReader(inputFile); try { - EchoBaseImport<MapImportModelRow> importer = + EchoBaseImport<RegionCellAssociationImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (MapImportModelRow row : importer) { + for (RegionCellAssociationImportRow row : importer) { configuration.incrementsProgression(); - //TODO + //TODO Do me + importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); } @@ -295,7 +295,7 @@ protected CsvFileImportResult importRegionResultFile(ResultsImportConfiguration configuration, InputFile inputFile, Voyage voyage) throws ImportException { - MapResultImportModel csvModel = new MapResultImportModel( + RegionCellResultImportModel csvModel = new RegionCellResultImportModel( serviceContext.getConfiguration().getCsvSeparator()); if (log.isInfoEnabled()) { @@ -311,15 +311,16 @@ Reader reader = getInputFileReader(inputFile); try { - EchoBaseImport<MapResultImportModelRow> importer = + EchoBaseImport<RegionCellResultImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (MapResultImportModelRow row : importer) { + for (RegionCellResultImportRow row : importer) { configuration.incrementsProgression(); - //TODO + //TODO Do me + importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-03-27 23:02:51 UTC (rev 420) @@ -46,13 +46,12 @@ import fr.ifremer.echobase.entities.references.SpeciesCategoryDAO; import fr.ifremer.echobase.entities.references.Strata; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.csv.EchotypeImportModel; -import fr.ifremer.echobase.services.csv.EchotypeImportModelRow; -import fr.ifremer.echobase.services.csv.LengthAgeKeyImportModel; -import fr.ifremer.echobase.services.csv.LengthAgeKeyImportModelRow; -import fr.ifremer.echobase.services.csv.LengthWeightKeyImportModel; -import fr.ifremer.echobase.services.csv.LengthWeightKeyImportModelRow; +import fr.ifremer.echobase.services.importdata.csv.EchotypeImportModel; +import fr.ifremer.echobase.services.importdata.csv.EchotypeImportRow; +import fr.ifremer.echobase.services.importdata.csv.LengthAgeKeyImportModel; +import fr.ifremer.echobase.services.importdata.csv.LengthAgeKeyImportRow; +import fr.ifremer.echobase.services.importdata.csv.LengthWeightKeyImportModel; +import fr.ifremer.echobase.services.importdata.csv.LengthWeightKeyImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDAO; @@ -107,7 +106,7 @@ if (inputFile.hasFile()) { CsvFileImportResult importResult = importLenthAgeKey( - configuration, + configuration, inputFile, voyageMap, speciesMap @@ -175,11 +174,11 @@ Reader reader = getInputFileReader(inputFile); try { - Import<LengthWeightKeyImportModelRow> importer = + Import<LengthWeightKeyImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (LengthWeightKeyImportModelRow row : importer) { + for (LengthWeightKeyImportRow row : importer) { configuration.incrementsProgression(); Voyage voyage = row.getVoyage(); @@ -248,12 +247,12 @@ Reader reader = getInputFileReader(inputFile); try { - Import<LengthAgeKeyImportModelRow> importer = + Import<LengthAgeKeyImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (LengthAgeKeyImportModelRow row : importer) { + for (LengthAgeKeyImportRow row : importer) { configuration.incrementsProgression(); @@ -303,12 +302,12 @@ Reader reader = getInputFileReader(inputFile); try { - Import<EchotypeImportModelRow> importer = + Import<EchotypeImportRow> importer = EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); - for (EchotypeImportModelRow row : importer) { + for (EchotypeImportRow row : importer) { configuration.incrementsProgression(); Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,164 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Cell; +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.references.AcousticInstrument; + +import java.util.Map; + +/** + * To import acoustic datas (says {@link DataAcquisition}, + * {@link DataProcessing}, {@link Cell} and {@link Data}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class AcousticDataImportModel extends AbstractImportModel<AcousticDataImportRow> { + + + /* +ESDU Data + +Latitude MOVIES_EILayer\\cellset\\lat, OK +Longitude MOVIES_EILayer\\cellset\\long OK +depth MOVIES_EILayer\\shipnav\\depth OK +timeStart MOVIES_EILayer\\cellset\\datestart OK +timeEnd MOVIES_EILayer\\cellset\\dateend OK +NASC MOVIES_EILayer\\eilayer\\sa OK +Volume MOVIES_EILayer\\cellset\\volume OK +Surface MOVIES_EILayer\\cellset\\area OK +NumberOfSamplesRecorded MOVIES_EILayer\\cellset\\nt OK +NumberOfSamplesEchoIntegrated MOVIES_EILayer\\cellset\\ni"OK + + +Elementary Data + +Latitude MOVIES_EILayer\\cellset\\lat +Longitude MOVIES_EILayer\\cellset\\long +depthStart (surface ou bottom) MOVIES_EILayer\\cellset\\depthstart +depthEnd (surface ou bottom) MOVIES_EILayer\\cellset\\depthend +timeStart MOVIES_EILayer\\cellset\\datestart +timeEnd MOVIES_EILayer\\cellset\\dateend +NASC MOVIES_EILayer\\eilayer\\sa +Volume MOVIES_EILayer\\cellset\\volume +Surface MOVIES_EILayer\\cellset\\area +NumberOfSamplesRecorded MOVIES_EILayer\\cellset\\nt +NumberOfSamplesEchoIntegrated MOVIES_EILayer\\cellset\\ni +minEIthr MOVIES_EILayer\cellset\thresholdlow +maxEIthr MOVIES_EILayer\cellset\thresholdup + */ + public AcousticDataImportModel(char separator, + Map<String, AcousticInstrument> instrumentsById) { + super(separator); + + newMandatoryColumn("MOVIES_EILayer", AcousticDataImportRow.PROPERTY_EI_LAYER);//A + newIgnoredColumn("MOVIES_EILayer\\sndset");//B + newIgnoredColumn("MOVIES_EILayer\\sndset\\sndname");//C + newIgnoredColumn("MOVIES_EILayer\\sndset\\sndident");//D + newForeignKeyColumn("MOVIES_EILayer\\sndset\\softChannelId", AcousticDataImportRow.PROPERTY_ACOUSTIC_INSTRUMENT, AcousticInstrument.class, AcousticInstrument.PROPERTY_ID, instrumentsById); //E + newIgnoredColumn("MOVIES_EILayer\\sndset\\channelName");//F + newIgnoredColumn("MOVIES_EILayer\\sndset\\dataType");//G + newIgnoredColumn("MOVIES_EILayer\\sndset\\beamType");//H + newIgnoredColumn("MOVIES_EILayer\\sndset\\acousticFrequency");//I + newIgnoredColumn("MOVIES_EILayer\\sndset\\startSample");//J + newIgnoredColumn("MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle");//K + newIgnoredColumn("MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle");//L + newMandatoryColumn("MOVIES_EILayer\\sndset\\absorptionCoef", AcousticDataImportRow.PROPERTY_TRANSCEIVER_ACQUISITION_ABSORPTION, EchobaseCsvUtil.FLOAT);//M + newMandatoryColumn("MOVIES_EILayer\\sndset\\transmissionPower", AcousticDataImportRow.PROPERTY_TRANSCEIVER_ACQUISITION_POWER, EchobaseCsvUtil.INTEGER);//N + newMandatoryColumn("MOVIES_EILayer\\sndset\\beamAlongAngleSensitivity", AcousticDataImportRow.PROPERTY_TRANSDUCER_ACQUISITION_BEAM_ANGLE_ALONGSHIP, EchobaseCsvUtil.FLOAT);//O + newMandatoryColumn("MOVIES_EILayer\\sndset\\beamAthwartAngleSensitivity", AcousticDataImportRow.PROPERTY_TRANSDUCER_ACQUISITION_BEAM_ANGLE_ATHWARTSHIP, EchobaseCsvUtil.FLOAT);//P + newIgnoredColumn("MOVIES_EILayer\\sndset\\beam3dBWidthAlong");//Q + newIgnoredColumn("MOVIES_EILayer\\sndset\\beam3dBWidthAthwart");//R + newMandatoryColumn("MOVIES_EILayer\\sndset\\beamEquTwoWayAngle", AcousticDataImportRow.PROPERTY_TRANSDUCER_ACQUISITION_PSI, EchobaseCsvUtil.FLOAT);//S + newMandatoryColumn("MOVIES_EILayer\\sndset\\beamGain", AcousticDataImportRow.PROPERTY_TRANSCEIVER_ACQUISITION_GAIN, EchobaseCsvUtil.FLOAT);//T + newMandatoryColumn("MOVIES_EILayer\\sndset\\beamSACorrection", AcousticDataImportRow.PROPERTY_TRANSCEIVER_ACQUISITION_SACORRECTION, EchobaseCsvUtil.FLOAT);//U + newIgnoredColumn("MOVIES_EILayer\\sndset\\bottomDetectionMinDepth");//V + newIgnoredColumn("MOVIES_EILayer\\sndset\\bottomDetectionMaxDepth");//W + newIgnoredColumn("MOVIES_EILayer\\sndset\\bottomDetectionMinLevel");//X + newIgnoredColumn("MOVIES_EILayer\\sndset\\AlongTXRXWeightId");//Y + newIgnoredColumn("MOVIES_EILayer\\sndset\\AthwartTXRXWeightId");//Z + newIgnoredColumn("MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId");//AA + newIgnoredColumn("MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId");//AB + newIgnoredColumn("MOVIES_EILayer\\sndset\\bandWidth");//AC + newIgnoredColumn("MOVIES_EILayer\\sndset\\tvgminrange");//AD + newIgnoredColumn("MOVIES_EILayer\\sndset\\tvgmaxrange");//AE + newMandatoryColumn("MOVIES_EILayer\\sndset\\pulseduration", AcousticDataImportRow.PROPERTY_TRANSCEIVER_ACQUISITION_PULSE_LENGTH, EchobaseCsvUtil.FLOAT);//AF + newIgnoredColumn("MOVIES_EILayer\\shipnav");//AG + newIgnoredColumn("MOVIES_EILayer\\shipnav\\lat");//AH + newIgnoredColumn("MOVIES_EILayer\\shipnav\\long");//AI + newIgnoredColumn("MOVIES_EILayer\\shipnav\\alt");//AJ + newIgnoredColumn("MOVIES_EILayer\\shipnav\\gndspeed");//AK + newIgnoredColumn("MOVIES_EILayer\\shipnav\\gndcourse");//AL + newIgnoredColumn("MOVIES_EILayer\\shipnav\\surfspeed");//AM + newIgnoredColumn("MOVIES_EILayer\\shipnav\\surfcourse");//AN + newIgnoredColumn("MOVIES_EILayer\\shipnav\\driftspeed");//AO + newIgnoredColumn("MOVIES_EILayer\\shipnav\\driftcourse");//AP + newIgnoredColumn("MOVIES_EILayer\\shipnav\\heading");//AQ + newIgnoredColumn("MOVIES_EILayer\\shipnav\\roll");//AR + newIgnoredColumn("MOVIES_EILayer\\shipnav\\pitch");//AS + newIgnoredColumn("MOVIES_EILayer\\shipnav\\heave");//AT + newMandatoryColumn("MOVIES_EILayer\\shipnav\\depth", AcousticDataImportRow.PROPERTY_ESDU_CELL_DATA_DEPTH);//AU + newIgnoredColumn("MOVIES_EILayer\\shipnav\\draught");//AV + + // Cell elementary Datas + newIgnoredColumn("MOVIES_EILayer\\cellset");//AW + newMandatoryColumn("MOVIES_EILayer\\cellset\\cellnum", AcousticDataImportRow.PROPERTY_CELL_NUM, EchobaseCsvUtil.PRIMITIVE_INTEGER);//AX + newMandatoryColumn("MOVIES_EILayer\\cellset\\celltype", AcousticDataImportRow.PROPERTY_CELL_TYPE, EchobaseCsvUtil.PRIMITIVE_INTEGER);//AY + newMandatoryColumn("MOVIES_EILayer\\cellset\\depthstart", AcousticDataImportRow.PROPERTY_CELL_DEPTH_START, EchobaseCsvUtil.PRIMITIVE_FLOAT);//AZ + newMandatoryColumn("MOVIES_EILayer\\cellset\\depthend", AcousticDataImportRow.PROPERTY_CELL_DEPTH_END, EchobaseCsvUtil.PRIMITIVE_FLOAT);//BA + newIgnoredColumn("MOVIES_EILayer\\cellset\\indexstart");//BB + newIgnoredColumn("MOVIES_EILayer\\cellset\\indexend");//BC + newMandatoryColumn("MOVIES_EILayer\\cellset\\datestart", AcousticDataImportRow.PROPERTY_CELL_DATE_START, EchobaseCsvUtil.IMPORT_DAY_TIME3);//BD + newMandatoryColumn("MOVIES_EILayer\\cellset\\dateend", AcousticDataImportRow.PROPERTY_CELL_DATE_END, EchobaseCsvUtil.IMPORT_DAY_TIME3);//BE + + newMandatoryColumn("MOVIES_EILayer\\cellset\\lat", AcousticDataImportRow.PROPERTY_CELL_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);//BF + newMandatoryColumn("MOVIES_EILayer\\cellset\\long", AcousticDataImportRow.PROPERTY_CELL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);//BG + newMandatoryColumn("MOVIES_EILayer\\cellset\\volume", AcousticDataImportRow.PROPERTY_CELL_VOLUME, EchobaseCsvUtil.NA_TO_INTEGER_PARSER);//BH + newMandatoryColumn("MOVIES_EILayer\\cellset\\area", AcousticDataImportRow.PROPERTY_CELL_SURFACE, EchobaseCsvUtil.PRIMITIVE_INTEGER);//BI + newIgnoredColumn("MOVIES_EILayer\\cellset\\diststart");//BJ + newIgnoredColumn("MOVIES_EILayer\\cellset\\distend");//BK + newMandatoryColumn("MOVIES_EILayer\\cellset\\thresholdup", AcousticDataImportRow.PROPERTY_E_ITHRESHOLD_HIGH, EchobaseCsvUtil.PRIMITIVE_INTEGER);//BL + newMandatoryColumn("MOVIES_EILayer\\cellset\\thresholdlow", AcousticDataImportRow.PROPERTY_E_ITHRESHOLD_LOW, EchobaseCsvUtil.PRIMITIVE_INTEGER);//BM + newIgnoredColumn("MOVIES_EILayer\\eilayer");//BN + newMandatoryColumn("MOVIES_EILayer\\eilayer\\sa", AcousticDataImportRow.PROPERTY_CELL_NASC, EchobaseCsvUtil.NA_TO_FLOAT_PARSER);//BO + newIgnoredColumn("MOVIES_EILayer\\eilayer\\sv");//BP + newMandatoryColumn("MOVIES_EILayer\\eilayer\\ni", AcousticDataImportRow.PROPERTY_CELL_NUMBER_OF_SAMPLES_ECHO_INTEGRATED, EchobaseCsvUtil.NA_TO_INTEGER_PARSER);//BQ + newMandatoryColumn("MOVIES_EILayer\\eilayer\\nt", AcousticDataImportRow.PROPERTY_CELL_NUMBER_OF_SAMPLES_RECORDED, EchobaseCsvUtil.NA_TO_INTEGER_PARSER);//BR + newIgnoredColumn("MOVIES_EILayer\\boterr");//BR + newIgnoredColumn("MOVIES_EILayer\\boterr\\sa");//BT + newIgnoredColumn("MOVIES_EILayer\\boterr\\ni");//BU + newMandatoryColumn("MOVIES_EILayer\\sndset\\soundcelerity", AcousticDataImportRow.PROPERTY_SOUND_CELERITY);//BV + } + + @Override + public AcousticDataImportRow newEmptyInstance() { + return new AcousticDataImportRow(); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,365 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.references.AcousticInstrument; + +import java.util.Date; + +/** + * Bean of a row for {@link AcousticDataImportModel} import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class AcousticDataImportRow { + + public static final String PROPERTY_ACOUSTIC_INSTRUMENT = "acousticInstrument"; + + public static final String PROPERTY_EI_LAYER = "eiLayer"; + + public static final String PROPERTY_CELL_TYPE = "cellType"; + + public static final String PROPERTY_CELL_NUM = "cellNum"; + + public static final String PROPERTY_ESDU_CELL_DATA_DEPTH = "esduCellDataDepth"; + + public static final String PROPERTY_CELL_DATE_START = "cellDateStart"; + + public static final String PROPERTY_CELL_DATE_END = "cellDateEnd"; + + public static final String PROPERTY_CELL_DEPTH_START = "cellDepthStart"; + + public static final String PROPERTY_CELL_DEPTH_END = "cellDepthEnd"; + + public static final String PROPERTY_CELL_NASC = "cellNasc"; + + public static final String PROPERTY_TRANSCEIVER_ACQUISITION_PULSE_LENGTH = "transceiverAcquisitionPulseLength"; + + public static final String PROPERTY_TRANSCEIVER_ACQUISITION_GAIN = "transceiverAcquisitionGain"; + + public static final String PROPERTY_TRANSCEIVER_ACQUISITION_ABSORPTION = "transceiverAcquisitionAbsorption"; + + public static final String PROPERTY_TRANSDUCER_ACQUISITION_BEAM_ANGLE_ATHWARTSHIP = "transducerAcquisitionBeamAngleAthwartship"; + + public static final String PROPERTY_TRANSDUCER_ACQUISITION_BEAM_ANGLE_ALONGSHIP = "transducerAcquisitionBeamAngleAlongship"; + + public static final String PROPERTY_TRANSDUCER_ACQUISITION_PSI = "transducerAcquisitionPsi"; + + public static final String PROPERTY_TRANSCEIVER_ACQUISITION_POWER = "transceiverAcquisitionPower"; + + public static final String PROPERTY_TRANSCEIVER_ACQUISITION_SACORRECTION = "transceiverAcquisitionSacorrection"; + + public static final String PROPERTY_E_ITHRESHOLD_LOW = "eIThresholdLow"; + + public static final String PROPERTY_E_ITHRESHOLD_HIGH = "eIThresholdHigh"; + + public static final String PROPERTY_CELL_VOLUME = "cellVolume"; + + public static final String PROPERTY_CELL_SURFACE = "cellSurface"; + + public static final String PROPERTY_CELL_NUMBER_OF_SAMPLES_RECORDED = "cellNumberOfSamplesRecorded"; + + public static final String PROPERTY_CELL_NUMBER_OF_SAMPLES_ECHO_INTEGRATED = "cellNumberOfSamplesEchoIntegrated"; + + public static final String PROPERTY_SOUND_CELERITY = "soundCelerity"; + + public static final String PROPERTY_CELL_LATITUDE = "cellLatitude"; + + public static final String PROPERTY_CELL_LONGITUDE = "cellLongitude"; + + protected String eiLayer; + + protected String esduCellDataDepth; + + protected Date cellDateStart; + + protected Date cellDateEnd; + + protected float cellLatitude; + + protected float cellLongitude; + + protected Float cellVolume; + + protected int cellSurface; + + protected Integer cellNumberOfSamplesRecorded; + + protected Integer cellNumberOfSamplesEchoIntegrated; + + protected int cellType; + + protected int cellNum; + + protected float cellDepthStart; + + protected float cellDepthEnd; + + protected Float cellNasc; + + protected float transceiverAcquisitionPulseLength; + + protected float transceiverAcquisitionGain; + + protected float transceiverAcquisitionAbsorption; + + protected float transceiverAcquisitionPower; + + protected float transceiverAcquisitionSacorrection; + + protected float transducerAcquisitionBeamAngleAthwartship; + + protected float transducerAcquisitionBeamAngleAlongship; + + protected float transducerAcquisitionPsi; + + protected int eIThresholdLow; + + protected int eIThresholdHigh; + + protected String soundCelerity; + + protected AcousticInstrument acousticInstrument; + + public boolean isCellToAdd() { + return cellNasc != null; + } + + public String getEiLayer() { + return eiLayer; + } + + public void setEiLayer(String eiLayer) { + this.eiLayer = eiLayer; + } + + public AcousticInstrument getAcousticInstrument() { + return acousticInstrument; + } + + public void setAcousticInstrument(AcousticInstrument acousticInstrument) { + this.acousticInstrument = acousticInstrument; + } + + public Date getCellDateStart() { + return cellDateStart; + } + + public void setCellDateStart(Date cellDateStart) { + this.cellDateStart = cellDateStart; + } + + public int getCellType() { + return cellType; + } + + public void setCellType(int cellType) { + this.cellType = cellType; + } + + public int getCellNum() { + return cellNum; + } + + public void setCellNum(int cellNum) { + this.cellNum = cellNum; + } + + public String getEsduCellDataDepth() { + return esduCellDataDepth; + } + + public void setEsduCellDataDepth(String esduCellDataDepth) { + this.esduCellDataDepth = esduCellDataDepth; + } + + public float getCellDepthStart() { + return cellDepthStart; + } + + public void setCellDepthStart(float cellDepthStart) { + this.cellDepthStart = cellDepthStart; + } + + public float getCellDepthEnd() { + return cellDepthEnd; + } + + public void setCellDepthEnd(float cellDepthEnd) { + this.cellDepthEnd = cellDepthEnd; + } + + public Float getCellNasc() { + return cellNasc; + } + + public void setCellNasc(Float cellNasc) { + this.cellNasc = cellNasc; + } + + public float getTransceiverAcquisitionPulseLength() { + return transceiverAcquisitionPulseLength; + } + + public void setTransceiverAcquisitionPulseLength(float transceiverAcquisitionPulseLength) { + this.transceiverAcquisitionPulseLength = transceiverAcquisitionPulseLength; + } + + public float getTransceiverAcquisitionGain() { + return transceiverAcquisitionGain; + } + + public void setTransceiverAcquisitionGain(float transceiverAcquisitionGain) { + this.transceiverAcquisitionGain = transceiverAcquisitionGain; + } + + public float getTransceiverAcquisitionAbsorption() { + return transceiverAcquisitionAbsorption; + } + + public void setTransceiverAcquisitionAbsorption(float transceiverAcquisitionAbsorption) { + this.transceiverAcquisitionAbsorption = transceiverAcquisitionAbsorption; + } + + public float getTransceiverAcquisitionPower() { + return transceiverAcquisitionPower; + } + + public void setTransceiverAcquisitionPower(float transceiverAcquisitionPower) { + this.transceiverAcquisitionPower = transceiverAcquisitionPower; + } + + public float getTransceiverAcquisitionSacorrection() { + return transceiverAcquisitionSacorrection; + } + + public void setTransceiverAcquisitionSacorrection(float transceiverAcquisitionSacorrection) { + this.transceiverAcquisitionSacorrection = transceiverAcquisitionSacorrection; + } + + public float getTransducerAcquisitionBeamAngleAthwartship() { + return transducerAcquisitionBeamAngleAthwartship; + } + + public void setTransducerAcquisitionBeamAngleAthwartship(float transducerAcquisitionBeamAngleAthwartship) { + this.transducerAcquisitionBeamAngleAthwartship = transducerAcquisitionBeamAngleAthwartship; + } + + public float getTransducerAcquisitionBeamAngleAlongship() { + return transducerAcquisitionBeamAngleAlongship; + } + + public void setTransducerAcquisitionBeamAngleAlongship(float transducerAcquisitionBeamAngleAlongship) { + this.transducerAcquisitionBeamAngleAlongship = transducerAcquisitionBeamAngleAlongship; + } + + public float getTransducerAcquisitionPsi() { + return transducerAcquisitionPsi; + } + + public void setTransducerAcquisitionPsi(float transducerAcquisitionPsi) { + this.transducerAcquisitionPsi = transducerAcquisitionPsi; + } + + public float getCellLatitude() { + return cellLatitude; + } + + public void setCellLatitude(float cellLatitude) { + this.cellLatitude = cellLatitude; + } + + public float getCellLongitude() { + return cellLongitude; + } + + public void setCellLongitude(float cellLongitude) { + this.cellLongitude = cellLongitude; + } + + public int geteIThresholdLow() { + return eIThresholdLow; + } + + public void seteIThresholdLow(int eIThresholdLow) { + this.eIThresholdLow = eIThresholdLow; + } + + public int geteIThresholdHigh() { + return eIThresholdHigh; + } + + public void seteIThresholdHigh(int eIThresholdHigh) { + this.eIThresholdHigh = eIThresholdHigh; + } + + public Date getCellDateEnd() { + return cellDateEnd; + } + + public void setCellDateEnd(Date cellDateEnd) { + this.cellDateEnd = cellDateEnd; + } + + public Float getCellVolume() { + return cellVolume; + } + + public void setCellVolume(Float cellVolume) { + this.cellVolume = cellVolume; + } + + public int getCellSurface() { + return cellSurface; + } + + public void setCellSurface(int cellSurface) { + this.cellSurface = cellSurface; + } + + public Integer getCellNumberOfSamplesRecorded() { + return cellNumberOfSamplesRecorded; + } + + public void setCellNumberOfSamplesRecorded(Integer cellNumberOfSamplesRecorded) { + this.cellNumberOfSamplesRecorded = cellNumberOfSamplesRecorded; + } + + public Integer getCellNumberOfSamplesEchoIntegrated() { + return cellNumberOfSamplesEchoIntegrated; + } + + public void setCellNumberOfSamplesEchoIntegrated(Integer cellNumberOfSamplesEchoIntegrated) { + this.cellNumberOfSamplesEchoIntegrated = cellNumberOfSamplesEchoIntegrated; + } + + public String getSoundCelerity() { + return soundCelerity; + } + + public void setSoundCelerity(String soundCelerity) { + this.soundCelerity = soundCelerity; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticDataImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,72 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.Sample; +import fr.ifremer.echobase.entities.data.SampleData; +import fr.ifremer.echobase.entities.references.SampleDataType; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.Map; + +/** + * Model to import {@link Sample} of total biometry. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class BiometrySampleImportModel extends AbstractImportModel<BiometrySampleImportRow> { + + public BiometrySampleImportModel(char separator, Map<String, Operation> operationMap, + Map<String, Species> speciesMap, + Map<String, SampleDataType> sampleDataTypeMap) { + super(separator); + + /* + operationID + baracoudacode + numFish + dataLabel + dataValue + name + */ + + newForeignKeyColumn("operationID", BiometrySampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + newForeignKeyColumn("baracoudacode", BiometrySampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + + newMandatoryColumn(BiometrySampleImportRow.PROPERTY_NUM_FISH, EchobaseCsvUtil.PRIMITIVE_INTEGER); + + newForeignKeyColumn("name", SampleData.PROPERTY_SAMPLE_DATA_TYPE, SampleDataType.class, SampleDataType.PROPERTY_NAME, sampleDataTypeMap); + newMandatoryColumn(SampleData.PROPERTY_DATA_LABEL); + newMandatoryColumn(SampleData.PROPERTY_DATA_VALUE, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); + } + + @Override + public BiometrySampleImportRow newEmptyInstance() { + return new BiometrySampleImportRow(); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,97 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.SampleData; +import fr.ifremer.echobase.entities.data.SampleDataImpl; +import fr.ifremer.echobase.entities.references.SampleDataType; +import fr.ifremer.echobase.entities.references.Species; + +/** + * Bean used as a row for import of {@link BiometrySampleImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class BiometrySampleImportRow { + + public static final String PROPERTY_NUM_FISH = "numFish"; + + public static final String PROPERTY_OPERATION = "operation"; + + public static final String PROPERTY_SPECIES = "species"; + + protected final SampleData sampleData; + + protected Operation operation; + + protected Species species; + + protected int numFish; + + public BiometrySampleImportRow() { + sampleData = new SampleDataImpl(); + } + + public Operation getOperation() { + return operation; + } + + public void setOperation(Operation operation) { + this.operation = operation; + } + + public Species getSpecies() { + return species; + } + + public void setSpecies(Species species) { + this.species = species; + } + + public int getNumFish() { + return numFish; + } + + public void setNumFish(int numfish) { + this.numFish = numfish; + } + + public void setDataValue(Float dataValue) { + sampleData.setDataValue(dataValue); + } + + public void setSampleDataType(SampleDataType sampleDataType) { + sampleData.setSampleDataType(sampleDataType); + } + + public void setDataLabel(String dataLabel) { + sampleData.setDataLabel(dataLabel); + } + + public SampleData getSampleData() { + return sampleData; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,77 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.Map; + +/** + * Model to import echotypes. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EchotypeImportModel extends AbstractImportModel<EchotypeImportRow> { + + protected final Map<String, Voyage> voyageMap; + + protected final Map<String, DepthStratum> depthStratumMap; + + protected final Map<String, Species> speciesMap; + + public EchotypeImportModel(char separator, + Map<String, Voyage> voyageMap, + Map<String, DepthStratum> depthStratumMap, + Map<String, Species> speciesMap) { + super(separator); + this.voyageMap = voyageMap; + this.depthStratumMap = depthStratumMap; + this.speciesMap = speciesMap; + + /* + voyage + echotypeName + DepthStratumID + meaning + baracoudacode + */ + + newMandatoryColumn("echotypeName", Echotype.PROPERTY_NAME); + newMandatoryColumn("meaning", Echotype.PROPERTY_MEANING); + newForeignKeyColumn(EchotypeImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + newForeignKeyColumn("DepthStratumID", Echotype.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStratumMap); + newForeignKeyColumn("baracoudacode", Echotype.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + + } + + @Override + public EchotypeImportRow newEmptyInstance() { + return new EchotypeImportRow(); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,81 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.EchotypeImpl; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.Species; + +import java.io.Serializable; + +/** + * Bean used as a row for import of {@link EchotypeImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EchotypeImportRow implements Serializable { + + private static final long serialVersionUID = 1L; + + public static final String PROPERTY_VOYAGE = "voyage"; + + protected Voyage voyage; + + protected final Echotype echotype; + + public EchotypeImportRow() { + echotype = new EchotypeImpl(); + } + + public Voyage getVoyage() { + return voyage; + } + + public void setVoyage(Voyage voyage) { + this.voyage = voyage; + } + + public Echotype getEchotype() { + return echotype; + } + + public void setName(String name) { + echotype.setName(name); + } + + public void setMeaning(String meaning) { + echotype.setMeaning(meaning); + } + + public void setDepthStratum(DepthStratum depthStratum) { + echotype.setDepthStratum(depthStratum); + } + + public void setSpecies(Species species) { + echotype.addSpecies(species); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,83 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.List; +import java.util.Map; + +/** + * Model to import {@link Result} for esdu cell and echotypes. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EsduResultByEchotypeAndSpeciesCategoryImportModel extends AbstractImportModel<EsduResultByEchotypeAndSpeciesCategoryImportRow> { + + public static final String[] COLUMN_NAMES_TO_EXCLUDE = { + "name", + "baracoudaCode", + "sizeCategory", + EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE + }; + + public EsduResultByEchotypeAndSpeciesCategoryImportModel( + char separator, + Map<String, Echotype> echotypeMap, + Map<String, Species> speciesMap, + Map<String, SizeCategory> sizeCategoryMap, + Voyage voyage, + CellDAO cellDAO, + List<DataMetadata> dataMetadatas) { + super(separator); + + newForeignKeyColumn(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, echotypeMap); + newForeignKeyColumn("baracoudaCode", EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); + newMandatoryColumn("name", EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); + + for (DataMetadata metadata : dataMetadatas) { + String name = metadata.getName(); + newMandatoryColumn( + name, + EchobaseCsvUtil.newResultValueParser(metadata), + EchobaseCsvUtil.<EsduResultByEchotypeAndSpeciesCategoryImportRow>newResultValueSetter()); + } + } + + @Override + public EsduResultByEchotypeAndSpeciesCategoryImportRow newEmptyInstance() { + return new EsduResultByEchotypeAndSpeciesCategoryImportRow(); + } + +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeAndSpeciesCategoryImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,104 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import com.google.common.collect.Lists; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.List; + +/** + * Bean used as a row for import of + * {@link EsduResultByEchotypeAndSpeciesCategoryImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EsduResultByEchotypeAndSpeciesCategoryImportRow implements EchobaseCsvUtil.ResultAble { + + public static final String PROPERTY_ECHOTYPE = "echotype"; + + public static final String PROPERTY_CELL = "cell"; + + public static final String PROPERTY_SPECIES = "species"; + + public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; + + protected Echotype echotype; + + protected Cell cell; + + protected List<Result> result = Lists.newArrayList(); + + protected Species species; + + private SizeCategory sizeCategory; + + public Echotype getEchotype() { + return echotype; + } + + public void setEchotype(Echotype echotype) { + this.echotype = echotype; + } + + public Cell getCell() { + return cell; + } + + public void setCell(Cell cell) { + this.cell = cell; + } + + public List<Result> getResult() { + return result; + } + + @Override + public void addResult(Result result) { + this.result.add(result); + } + + public Species getSpecies() { + return species; + } + + public void setSpecies(Species species) { + this.species = species; + } + + public SizeCategory getSizeCategory() { + return sizeCategory; + } + + public void setSizeCategory(SizeCategory sizeCategory) { + this.sizeCategory = sizeCategory; + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,75 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DataMetadata; + +import java.util.List; +import java.util.Map; + +/** + * Model to import {@link Result} for esdu cell and echotypes. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EsduResultByEchotypeImportModel extends AbstractImportModel<EsduResultByEchotypeImportRow> { + + public static final String[] COLUMN_NAMES_TO_EXCLUDE = { + "name", + EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE + }; + + public EsduResultByEchotypeImportModel( + char separator, + Map<String, Echotype> echotypeMap, + Voyage voyage, + CellDAO cellDAO, + List<DataMetadata> dataMetadatas) { + super(separator); + + newForeignKeyColumn(EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, echotypeMap); + newMandatoryColumn("name", EsduResultByEchotypeImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); + + for (DataMetadata metadata : dataMetadatas) { + String name = metadata.getName(); + newMandatoryColumn( + name, + EchobaseCsvUtil.newResultValueParser(metadata), + EchobaseCsvUtil.<EsduResultByEchotypeImportRow>newResultValueSetter()); + } + } + + @Override + public EsduResultByEchotypeImportRow newEmptyInstance() { + return new EsduResultByEchotypeImportRow(); + } + +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultByEchotypeImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,76 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import com.google.common.collect.Lists; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Result; + +import java.util.List; + +/** + * Bean used as a row for import of {@link EsduResultByEchotypeImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EsduResultByEchotypeImportRow implements EchobaseCsvUtil.ResultAble { + + public static final String PROPERTY_ECHOTYPE = "echotype"; + + public static final String PROPERTY_CELL = "cell"; + + protected Echotype echotype; + + protected Cell cell; + + protected List<Result> result = Lists.newArrayList(); + + public Echotype getEchotype() { + return echotype; + } + + public void setEchotype(Echotype echotype) { + this.echotype = echotype; + } + + public Cell getCell() { + return cell; + } + + public void setCell(Cell cell) { + this.cell = cell; + } + + public List<Result> getResult() { + return result; + } + + @Override + public void addResult(Result result) { + this.result.add(result); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,79 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.List; +import java.util.Map; + +/** + * Model to import {@link Result} for esdu cell and species and size category. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EsduResultBySpeciesAndAgeCategoryImportModel extends AbstractImportModel<EsduResultBySpeciesAndAgeCategoryImportRow> { + + public static final String[] COLUMN_NAMES_TO_EXCLUDE = { + "name", + "baracoudaCode", + EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY, + EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY_MEANING, + }; + + public EsduResultBySpeciesAndAgeCategoryImportModel( + char separator, + Map<String, Species> speciesMap, + Voyage voyage, + CellDAO cellDAO, + List<DataMetadata> dataMetadatas) { + super(separator); + + newMandatoryColumn("name", EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); + newMandatoryColumn(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY); + newMandatoryColumn(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY_MEANING); + newForeignKeyColumn("baracoudaCode", EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + + for (DataMetadata metadata : dataMetadatas) { + String name = metadata.getName(); + newMandatoryColumn( + name, + EchobaseCsvUtil.newResultValueParser(metadata), + EchobaseCsvUtil.<EsduResultBySpeciesAndAgeCategoryImportRow>newResultValueSetter()); + } + } + + @Override + public EsduResultBySpeciesAndAgeCategoryImportRow newEmptyInstance() { + return new EsduResultBySpeciesAndAgeCategoryImportRow(); + } + +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndAgeCategoryImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,101 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import com.google.common.collect.Lists; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.List; + +/** + * Bean used as a row for import of + * {@link EsduResultBySpeciesAndAgeCategoryImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EsduResultBySpeciesAndAgeCategoryImportRow implements EchobaseCsvUtil.ResultAble { + + public static final String PROPERTY_CELL = "cell"; + + public static final String PROPERTY_SPECIES = "species"; + + public static final String PROPERTY_AGE_CATEGORY = "ageCategory"; + + public static final String PROPERTY_AGE_CATEGORY_MEANING = "ageCategoryMeaning"; + + protected Cell cell; + + protected List<Result> result = Lists.newArrayList(); + + protected Species species; + + private String ageCategory; + + private String ageCategoryMeaning; + + public Species getSpecies() { + return species; + } + + public void setSpecies(Species species) { + this.species = species; + } + + public Cell getCell() { + return cell; + } + + public void setCell(Cell cell) { + this.cell = cell; + } + + public String getAgeCategory() { + return ageCategory; + } + + public void setAgeCategory(String ageCategory) { + this.ageCategory = ageCategory; + } + + public String getAgeCategoryMeaning() { + return ageCategoryMeaning; + } + + public void setAgeCategoryMeaning(String ageCategoryMeaning) { + this.ageCategoryMeaning = ageCategoryMeaning; + } + + public List<Result> getResult() { + return result; + } + + @Override + public void addResult(Result result) { + this.result.add(result); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,79 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.List; +import java.util.Map; + +/** + * Model to import {@link Result} for esdu cell and species and size category. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EsduResultBySpeciesAndSizeCategoryImportModel extends AbstractImportModel<EsduResultBySpeciesAndSizeCategoryImportRow> { + + public static final String[] COLUMN_NAMES_TO_EXCLUDE = { + "name", + "baracoudaCode", + EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY, + EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY_MEANING + }; + + public EsduResultBySpeciesAndSizeCategoryImportModel( + char separator, + Map<String, Species> speciesMap, + Voyage voyage, + CellDAO cellDAO, + List<DataMetadata> dataMetadatas) { + super(separator); + + newMandatoryColumn("name", EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); + newMandatoryColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY); + newMandatoryColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY_MEANING); + newForeignKeyColumn("baracoudaCode", EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + + for (DataMetadata metadata : dataMetadatas) { + String name = metadata.getName(); + newMandatoryColumn( + name, + EchobaseCsvUtil.newResultValueParser(metadata), + EchobaseCsvUtil.<EsduResultBySpeciesAndSizeCategoryImportRow>newResultValueSetter()); + } + } + + @Override + public EsduResultBySpeciesAndSizeCategoryImportRow newEmptyInstance() { + return new EsduResultBySpeciesAndSizeCategoryImportRow(); + } + +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticResultBySpeciesAndSizeCategoryImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,101 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import com.google.common.collect.Lists; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.List; + +/** + * Bean used as a row for import of + * {@link EsduResultBySpeciesAndSizeCategoryImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class EsduResultBySpeciesAndSizeCategoryImportRow implements EchobaseCsvUtil.ResultAble { + + public static final String PROPERTY_CELL = "cell"; + + public static final String PROPERTY_SPECIES = "species"; + + public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; + + public static final String PROPERTY_SIZE_CATEGORY_MEANING = "sizeCategoryMeaning"; + + protected Cell cell; + + protected List<Result> result = Lists.newArrayList(); + + protected Species species; + + private String sizeCategory; + + private String sizeCategoryMeaning; + + public Species getSpecies() { + return species; + } + + public void setSpecies(Species species) { + this.species = species; + } + + public Cell getCell() { + return cell; + } + + public void setCell(Cell cell) { + this.cell = cell; + } + + public String getSizeCategory() { + return sizeCategory; + } + + public void setSizeCategory(String sizeCategory) { + this.sizeCategory = sizeCategory; + } + + public String getSizeCategoryMeaning() { + return sizeCategoryMeaning; + } + + public void setSizeCategoryMeaning(String sizeCategoryMeaning) { + this.sizeCategoryMeaning = sizeCategoryMeaning; + } + + public List<Result> getResult() { + return result; + } + + @Override + public void addResult(Result result) { + this.result.add(result); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,71 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.entities.data.GearMetadataValue; +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.references.Gear; +import fr.ifremer.echobase.entities.references.GearMetadata; +import fr.ifremer.echobase.entities.references.Vessel; + +import java.util.Map; + +/** + * Model to import {@link GearMetadataValue}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class GearMetadataValueImportModel extends AbstractImportModel<GearMetadataValueImportRow> { + + public GearMetadataValueImportModel(char separator, + Map<String, Vessel> vesselMap, + Map<String, GearMetadata> gearMetadataMap, + Map<String, Gear> gearMap, + Map<String, Operation> operationMap) { + super(separator); + + /* + vesselName + id + gearID + metadataType + gearMetadataValue + */ + + newForeignKeyColumn("vesselName", GearMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); + newForeignKeyColumn("operationID", GearMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + + newForeignKeyColumn("metadataType", GearMetadataValue.PROPERTY_GEAR_METADATA, GearMetadata.class, GearMetadata.PROPERTY_NAME, gearMetadataMap); + newForeignKeyColumn("gearCode", GearMetadataValue.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); + newMandatoryColumn("gearMetadataValue", GearMetadataValue.PROPERTY_DATA_VALUE); + + } + + @Override + public GearMetadataValueImportRow newEmptyInstance() { + return new GearMetadataValueImportRow(); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/GearMetadataValueImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,87 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.GearMetadataValue; +import fr.ifremer.echobase.entities.data.GearMetadataValueImpl; +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.references.Gear; +import fr.ifremer.echobase.entities.references.GearMetadata; +import fr.ifremer.echobase.entities.references.Vessel; + +/** + * Bean used as a row for import of {@link GearMetadataValueImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class GearMetadataValueImportRow { + + public static final String PROPERTY_VESSEL = Transect.PROPERTY_VESSEL; + + public static final String PROPERTY_OPERATION = Transect.PROPERTY_OPERATION; + + protected Vessel vessel; + + protected Operation operation; + + protected final GearMetadataValue gearMetadataValue; + + public GearMetadataValueImportRow() { + gearMetadataValue = new GearMetadataValueImpl(); + } + + public GearMetadataValue getGearMetadataValue() { + return gearMetadataValue; + } + + public void setGearMetadata(GearMetadata gearMetadata) { + gearMetadataValue.setGearMetadata(gearMetadata); + } + + public void setDataValue(String dataValue) { + gearMetadataValue.setDataValue(dataValue); + } + + public void setGear(Gear gear) { + gearMetadataValue.setGear(gear); + } + + public Operation getOperation() { + return operation; + } + + public void setOperation(Operation operation) { + this.operation = operation; + } + + public Vessel getVessel() { + return vessel; + } + + public void setVessel(Vessel vessel) { + this.vessel = vessel; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,72 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.LengthAgeKey; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Strata; + +import java.util.Map; + +/** + * Model to import {@link LengthAgeKey}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LengthAgeKeyImportModel extends AbstractImportModel<LengthAgeKeyImportRow> { + + protected final Map<String, Voyage> voyageMap; + + protected final Map<String, Strata> strataMap; + + protected final Map<String, Species> speciesMap; + + public LengthAgeKeyImportModel(char separator, + Map<String, Voyage> voyageMap, + Map<String, Strata> strataMap, + Map<String, Species> speciesMap) { + super(separator); + this.voyageMap = voyageMap; + this.strataMap = strataMap; + this.speciesMap = speciesMap; + + newForeignKeyColumn(LengthAgeKeyImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + + newMandatoryColumn(LengthAgeKey.PROPERTY_AGE, EchobaseCsvUtil.PRIMITIVE_INTEGER); + newMandatoryColumn(LengthAgeKey.PROPERTY_PERCENT_AT_AGE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(LengthAgeKey.PROPERTY_LENGTH, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(LengthAgeKey.PROPERTY_METADATA); + newForeignKeyColumn(LengthAgeKey.PROPERTY_STRATA, Strata.class, Strata.PROPERTY_NAME, strataMap); + newForeignKeyColumn("baracoudacode", LengthAgeKey.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + } + + @Override + public LengthAgeKeyImportRow newEmptyInstance() { + return new LengthAgeKeyImportRow(); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,89 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.LengthAgeKey; +import fr.ifremer.echobase.entities.data.LengthAgeKeyImpl; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Strata; + +import java.io.Serializable; + +/** + * Bean used as a row for import of {@link LengthAgeKeyImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LengthAgeKeyImportRow implements Serializable { + + private static final long serialVersionUID = 1L; + + public static final String PROPERTY_VOYAGE = "voyage"; + + protected Voyage voyage; + + protected final LengthAgeKey lengthAgeKey; + + public LengthAgeKeyImportRow() { + lengthAgeKey = new LengthAgeKeyImpl(); + } + + public LengthAgeKey getLengthAgeKey() { + return lengthAgeKey; + } + + public Voyage getVoyage() { + return voyage; + } + + public void setVoyage(Voyage voyage) { + this.voyage = voyage; + } + + public void setAge(int age) { + lengthAgeKey.setAge(age); + } + + public void setLength(float length) { + lengthAgeKey.setLength(length); + } + + public void setPercentAtAge(float percentAtAge) { + lengthAgeKey.setPercentAtAge(percentAtAge); + } + + public void setMetadata(String metadata) { + lengthAgeKey.setMetadata(metadata); + } + + public void setStrata(Strata strata) { + lengthAgeKey.setStrata(strata); + } + + public void setSpecies(Species species) { + lengthAgeKey.setSpecies(species); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,78 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.LengthWeightKey; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.Map; + +/** + * Model to import {@link LengthWeightKey}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LengthWeightKeyImportModel extends AbstractImportModel<LengthWeightKeyImportRow> { + + protected final Map<String, Voyage> voyageMap; + + protected final Map<String, SizeCategory> sizeCategoryMap; + + protected final Map<String, Species> speciesMap; + + public LengthWeightKeyImportModel(char separator, + Map<String, Voyage> voyageMap, + Map<String, SizeCategory> sizeCategoryMap, + Map<String, Species> speciesMap) { + super(separator); + this.voyageMap = voyageMap; + this.sizeCategoryMap = sizeCategoryMap; + this.speciesMap = speciesMap; + + /* + voyage + sizeCategory + aParameter + bParameter + codeMemo + */ + + newMandatoryColumn("aParameter", LengthWeightKey.PROPERTY_APARAMETER, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("bParameter", LengthWeightKey.PROPERTY_BPARAMETER, EchobaseCsvUtil.PRIMITIVE_FLOAT); + + newForeignKeyColumn(LengthWeightKeyImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + newForeignKeyColumn(LengthWeightKeyImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); + newForeignKeyColumn("baracoudacode", LengthWeightKeyImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + } + + @Override + public LengthWeightKeyImportRow newEmptyInstance() { + return new LengthWeightKeyImportRow(); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,97 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.LengthWeightKey; +import fr.ifremer.echobase.entities.data.LengthWeightKeyImpl; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; + +import java.io.Serializable; + +/** + * Bean used as a row for import of {@link LengthWeightKeyImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class LengthWeightKeyImportRow implements Serializable { + + private static final long serialVersionUID = 1L; + + public static final String PROPERTY_VOYAGE = "voyage"; + + public static final String PROPERTY_SPECIES = "species"; + + public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; + + protected Species species; + + protected SizeCategory sizeCategory; + + protected Voyage voyage; + + protected final LengthWeightKey lengthWeightKey; + + public LengthWeightKeyImportRow() { + lengthWeightKey = new LengthWeightKeyImpl(); + } + + public LengthWeightKey getLengthWeightKey() { + return lengthWeightKey; + } + + public Species getSpecies() { + return species; + } + + public void setSpecies(Species species) { + this.species = species; + } + + public SizeCategory getSizeCategory() { + return sizeCategory; + } + + public void setSizeCategory(SizeCategory sizeCategory) { + this.sizeCategory = sizeCategory; + } + + public Voyage getVoyage() { + return voyage; + } + + public void setVoyage(Voyage voyage) { + this.voyage = voyage; + } + + public void setBParameter(float BParameter) { + lengthWeightKey.setBParameter(BParameter); + } + + public void setAParameter(float AParameter) { + lengthWeightKey.setAParameter(AParameter); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,68 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DepthStratum; + +import java.util.Map; + +/** + * Model to import cells of type 'Map'. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class MapCellImportModel extends AbstractImportModel<MapCellImportRow> { + + protected final CellType cellType; + + public MapCellImportModel(char separator, + CellType cellType, + Map<String, Voyage> voyageMap, + Map<String, DepthStratum> depthStramMap) { + super(separator); + this.cellType = cellType; + + newForeignKeyColumn(MapCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + newForeignKeyColumn(MapCellImportRow.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStramMap); + + newMandatoryColumn(MapCellImportRow.PROPERTY_NAME); + newMandatoryColumn("x", MapCellImportRow.PROPERTY_DATA_X, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("y", MapCellImportRow.PROPERTY_DATA_Y, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("z", MapCellImportRow.PROPERTY_DATA_Z, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("lag", MapCellImportRow.PROPERTY_DATA_LAG, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("value", MapCellImportRow.PROPERTY_DATA_VALUE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + } + + @Override + public MapCellImportRow newEmptyInstance() { + MapCellImportRow row = new MapCellImportRow(); + row.getCell().setCellType(cellType); + return row; + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,138 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.CellImpl; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DepthStratum; + +/** + * Bean used as a row for import of {@link MapCellImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class MapCellImportRow { + + public static final String PROPERTY_NAME = "name"; + + public static final String PROPERTY_VOYAGE = "voyage"; + + public static final String PROPERTY_DEPTH_STRATUM = "depthStratum"; + + public static final String PROPERTY_DATA_X = "dataX"; + + public static final String PROPERTY_DATA_Y = "dataY"; + + public static final String PROPERTY_DATA_Z = "dataZ"; + + public static final String PROPERTY_DATA_LAG = "dataLag"; + + public static final String PROPERTY_DATA_VALUE = "dataValue"; + + protected Voyage voyage; + + protected DepthStratum depthStratum; + + protected final Cell cell; + + protected float dataX; + + protected float dataY; + + protected float dataZ; + + protected float dataLag; + + protected float dataValue; + + public MapCellImportRow() { + this.cell = new CellImpl(); + } + + public Cell getCell() { + return cell; + } + + public Voyage getVoyage() { + return voyage; + } + + public DepthStratum getDepthStratum() { + return depthStratum; + } + + public float getDataX() { + return dataX; + } + + public float getDataY() { + return dataY; + } + + public float getDataZ() { + return dataZ; + } + + public float getDataLag() { + return dataLag; + } + + public float getDataValue() { + return dataValue; + } + + public void setName(String name) { + getCell().setName(name); + } + + public void setVoyage(Voyage voyage) { + this.voyage = voyage; + } + + public void setDepthStratum(DepthStratum depthStratum) { + this.depthStratum = depthStratum; + } + + public void setDataX(float dataX) { + this.dataX = dataX; + } + + public void setDataY(float dataY) { + this.dataY = dataY; + } + + public void setDataZ(float dataZ) { + this.dataZ = dataZ; + } + + public void setDataLag(float dataLag) { + this.dataLag = dataLag; + } + + public void setDataValue(float dataValue) { + this.dataValue = dataValue; + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,44 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; + +/** + * Model to import results of cell of type 'Map'. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class MapCellResultImportModel extends AbstractImportModel<MapCellResultImportRow> { + + public MapCellResultImportModel(char separator) { + super(separator); + } + + @Override + public MapCellResultImportRow newEmptyInstance() { + return new MapCellResultImportRow(); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/MapResultImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,33 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +/** + * Bean used as a row for import of {@link MapCellResultImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class MapCellResultImportRow { +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellResultImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,82 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.Gear; +import fr.ifremer.echobase.entities.references.Vessel; + +import java.util.Map; + +/** + * Model to import {@link Operation}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class OperationImportModel extends AbstractImportModel<OperationImportRow> { + + public OperationImportModel(char separator, + Map<String, Vessel> vesselMap, + Map<String, Gear> gearMap, + Map<String, DepthStratum> depthStratumMap) { + super(separator); + + /* + vesselName // + id // + depthStratumID // + gearShootingStartTime // + midHaulLatitude // + midHaulLongitude // + gearShootingStartLatitude // + gearShootingStartLongitude // + gearShootingEndTime // + gearShootingEndLatitude // + gearShootingEndLongitude // + gearName // + */ + newForeignKeyColumn("vesselName", OperationImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); + + newForeignKeyColumn("gearCode", Operation.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); + newForeignKeyColumn("depthStratumID", Operation.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStratumMap); + newMandatoryColumn("operationID", Operation.PROPERTY_ID); + newMandatoryColumn(Operation.PROPERTY_MID_HAUL_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Operation.PROPERTY_MID_HAUL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_TIME, EchobaseCsvUtil.DAY_TIME_SECOND); + newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_END_TIME, EchobaseCsvUtil.DAY_TIME_SECOND); + newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_END_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_END_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + } + + @Override + public OperationImportRow newEmptyInstance() { + return new OperationImportRow(); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,108 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.OperationImpl; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.Gear; +import fr.ifremer.echobase.entities.references.Vessel; + +import java.util.Date; + +/** + * Bean used as a row for import of {@link OperationImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class OperationImportRow { + + public static final String PROPERTY_VESSEL = Transect.PROPERTY_VESSEL; + + protected Vessel vessel; + + protected final Operation operation; + + public OperationImportRow() { + operation = new OperationImpl(); + } + + public Operation getOperation() { + return operation; + } + + public Vessel getVessel() { + return vessel; + } + + public void setVessel(Vessel vessel) { + this.vessel = vessel; + } + + public void setId(String id) { + operation.setId(id); + } + + public void setGearShootingStartTime(Date gearShootingStartTime) { + operation.setGearShootingStartTime(gearShootingStartTime); + } + + public void setGearShootingEndTime(Date gearShootingEndTime) { + operation.setGearShootingEndTime(gearShootingEndTime); + } + + public void setGearShootingStartLatitude(Float gearShootingStartLatitude) { + operation.setGearShootingStartLatitude(gearShootingStartLatitude); + } + + public void setGearShootingEndLatitude(Float gearShootingEndLatitude) { + operation.setGearShootingEndLatitude(gearShootingEndLatitude); + } + + public void setGearShootingStartLongitude(Float gearShootingStartLongitude) { + operation.setGearShootingStartLongitude(gearShootingStartLongitude); + } + + public void setGearShootingEndLongitude(Float gearShootingEndLongitude) { + operation.setGearShootingEndLongitude(gearShootingEndLongitude); + } + + public void setMidHaulLatitude(float midHauleLatitude) { + operation.setMidHaulLatitude(midHauleLatitude); + } + + public void setMidHaulLongitude(float midHauleLongitude) { + operation.setMidHaulLongitude(midHauleLongitude); + } + + public void setDepthStratum(DepthStratum depthStratum) { + operation.setDepthStratum(depthStratum); + } + + public void setGear(Gear gear) { + operation.setGear(gear); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,66 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.OperationMetadataValue; +import fr.ifremer.echobase.entities.references.OperationMetadata; +import fr.ifremer.echobase.entities.references.Vessel; + +import java.util.Map; + +/** + * Model to import {@link OperationMetadataValue}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class OperationMetadataValueImportModel extends AbstractImportModel<OperationMetadataValueImportRow> { + + public OperationMetadataValueImportModel(char separator, + Map<String, Vessel> vesselMap, + Map<String, OperationMetadata> operationMetadataMap, + Map<String, Operation> operationMap) { + super(separator); + + /* + vesselName/ + id/ + metadataType/ + operationMetadataValue/ + */ + + newForeignKeyColumn("vesselName", OperationMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); + newForeignKeyColumn("operationID", OperationMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + + newForeignKeyColumn("metadataType", OperationMetadataValue.PROPERTY_OPERATION_METADATA, OperationMetadata.class, OperationMetadata.PROPERTY_NAME, operationMetadataMap); + newMandatoryColumn("operationMetadataValue", OperationMetadataValue.PROPERTY_DATA_VALUE); + } + + @Override + public OperationMetadataValueImportRow newEmptyInstance() { + return new OperationMetadataValueImportRow(); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/OperationMetadataValueImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,82 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.OperationMetadataValue; +import fr.ifremer.echobase.entities.data.OperationMetadataValueImpl; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.references.OperationMetadata; +import fr.ifremer.echobase.entities.references.Vessel; + +/** + * Bean used as a row for import of {@link OperationMetadataValueImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class OperationMetadataValueImportRow { + + public static final String PROPERTY_VESSEL = Transect.PROPERTY_VESSEL; + + public static final String PROPERTY_OPERATION = Transect.PROPERTY_OPERATION; + + protected Operation operation; + + protected Vessel vessel; + + protected final OperationMetadataValue operationMetadataValue; + + public OperationMetadataValueImportRow() { + operationMetadataValue = new OperationMetadataValueImpl(); + } + + public OperationMetadataValue getOperationMetadataValue() { + return operationMetadataValue; + } + + public void setOperationMetadata(OperationMetadata operationMetadata) { + operationMetadataValue.setOperationMetadata(operationMetadata); + } + + public void setDataValue(String dataValue) { + operationMetadataValue.setDataValue(dataValue); + } + + public Operation getOperation() { + return operation; + } + + public void setOperation(Operation operation) { + this.operation = operation; + } + + public Vessel getVessel() { + return vessel; + } + + public void setVessel(Vessel vessel) { + this.vessel = vessel; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,44 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; + +/** + * Model to import cells associations from region cells and esdu cells. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class RegionCellAssociationImportModel extends AbstractImportModel<RegionCellAssociationImportRow> { + + public RegionCellAssociationImportModel(char separator) { + super(separator); + } + + @Override + public RegionCellAssociationImportRow newEmptyInstance() { + return new RegionCellAssociationImportRow(); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,69 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Cell; + +/** + * Bean used as a row for import of {@link RegionCellAssociationImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class RegionCellAssociationImportRow { + + protected Cell esduCell; + + protected Cell regionSurfaceCell; + + protected Cell regionBottomCell; + + public RegionCellAssociationImportRow() { + } + + + public Cell getEsduCell() { + return esduCell; + } + + public void setEsduCell(Cell esduCell) { + this.esduCell = esduCell; + } + + public Cell getRegionSurfaceCell() { + return regionSurfaceCell; + } + + public void setRegionSurfaceCell(Cell regionSurfaceCell) { + this.regionSurfaceCell = regionSurfaceCell; + } + + public Cell getRegionBottomCell() { + return regionBottomCell; + } + + public void setRegionBottomCell(Cell regionBottomCell) { + this.regionBottomCell = regionBottomCell; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportModel.java (from rev 417, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,67 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DepthStratum; + +import java.util.Map; + +/** + * Model to import cells (with type "region"). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class RegionCellImportModel extends AbstractImportModel<RegionCellImportRow> { + + protected final CellType cellType; + + public RegionCellImportModel(char separator, + CellType cellType, + Map<String, Voyage> voyageMap, + Map<String, DepthStratum> depthStramMap) { + super(separator); + this.cellType = cellType; + + newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + newForeignKeyColumn(RegionCellImportRow.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStramMap); + + newMandatoryColumn(RegionCellImportRow.PROPERTY_NAME); + newMandatoryColumn("x", RegionCellImportRow.PROPERTY_DATA_X, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("y", RegionCellImportRow.PROPERTY_DATA_Y, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("z", RegionCellImportRow.PROPERTY_DATA_Z, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("surface", RegionCellImportRow.PROPERTY_DATA_SURFACE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + } + + @Override + public RegionCellImportRow newEmptyInstance() { + RegionCellImportRow row = new RegionCellImportRow(); + row.getCell().setCellType(cellType); + return row; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportRow.java (from rev 417, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,126 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.CellImpl; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DepthStratum; + +/** + * Bean used as a row for import of {@link RegionCellImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class RegionCellImportRow { + + public static final String PROPERTY_NAME = "name"; + + public static final String PROPERTY_VOYAGE = "voyage"; + + public static final String PROPERTY_DEPTH_STRATUM = "depthStratum"; + + public static final String PROPERTY_DATA_X = "dataX"; + + public static final String PROPERTY_DATA_Y = "dataY"; + + public static final String PROPERTY_DATA_Z = "dataZ"; + + public static final String PROPERTY_DATA_SURFACE = "dataSurface"; + + protected Voyage voyage; + + protected DepthStratum depthStratum; + + protected final Cell cell; + + protected float dataX; + + protected float dataY; + + protected float dataZ; + + protected float dataSurface; + + public RegionCellImportRow() { + this.cell = new CellImpl(); + } + + public Cell getCell() { + return cell; + } + + public Voyage getVoyage() { + return voyage; + } + + public DepthStratum getDepthStratum() { + return depthStratum; + } + + public float getDataX() { + return dataX; + } + + public float getDataY() { + return dataY; + } + + public float getDataZ() { + return dataZ; + } + + public float getDataSurface() { + return dataSurface; + } + + public void setName(String name) { + getCell().setName(name); + } + + public void setVoyage(Voyage voyage) { + this.voyage = voyage; + } + + public void setDepthStratum(DepthStratum depthStratum) { + this.depthStratum = depthStratum; + } + + public void setDataX(float dataX) { + this.dataX = dataX; + } + + public void setDataY(float dataY) { + this.dataY = dataY; + } + + public void setDataZ(float dataZ) { + this.dataZ = dataZ; + } + + public void setDataSurface(float dataSurface) { + this.dataSurface = dataSurface; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,44 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; + +/** + * Model to import results of cell of type 'Region'. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class RegionCellResultImportModel extends AbstractImportModel<RegionCellResultImportRow> { + + public RegionCellResultImportModel(char separator) { + super(separator); + } + + @Override + public RegionCellResultImportRow newEmptyInstance() { + return new RegionCellResultImportRow(); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionResultImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,33 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +/** + * Bean used as a row for import of {@link RegionCellResultImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class RegionCellResultImportRow { +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,88 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.Sample; +import fr.ifremer.echobase.entities.data.SampleData; +import fr.ifremer.echobase.entities.references.SexCategory; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.Map; + +/** + * Model to import {@link SampleData}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class SubSampleImportModel extends AbstractImportModel<SubSampleImportRow> { + + public SubSampleImportModel(char separator, + Map<String, Operation> operationMap, + Map<String, Species> speciesMap, + Map<String, SizeCategory> sizeCategoryMap, + Map<String, SexCategory> sexCategoryMap) { + super(separator); + + /* + operationID + subHaul + baracoudacode + sizeCategory + sexCategory + sampleWeight + numberSampled + + numberAtLength + weightAtLength + units + round + */ + + newIgnoredColumn("subHaul"); + newIgnoredColumn("units"); + newIgnoredColumn("round"); + + newForeignKeyColumn("operationID", SubSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + newForeignKeyColumn("baracoudacode", SubSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(SubSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); + newForeignKeyColumn(SubSampleImportRow.PROPERTY_SEX_CATEGORY, SexCategory.class, SexCategory.PROPERTY_NAME, sexCategoryMap); + + newMandatoryColumn(Sample.PROPERTY_SAMPLE_WEIGHT, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Sample.PROPERTY_NUMBER_SAMPLED, EchobaseCsvUtil.PRIMITIVE_INTEGER); + + newMandatoryColumn(SubSampleImportRow.PROPERTY_NUMBER_AT_LENGTH, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(SubSampleImportRow.PROPERTY_WEIGHT_AT_LENGTH, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); + newMandatoryColumn(SubSampleImportRow.PROPERTY_LENGTH_CLASS); + } + + @Override + public SubSampleImportRow newEmptyInstance() { + return new SubSampleImportRow(); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/SubSampleImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,145 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.Sample; +import fr.ifremer.echobase.entities.data.SampleImpl; +import fr.ifremer.echobase.entities.references.SexCategory; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; + +/** + * Bean used as a row for import of {@link SubSampleImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class SubSampleImportRow { + + + public static final String PROPERTY_OPERATION = "operation"; + + public static final String PROPERTY_SPECIES = "species"; + + public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; + + public static final String PROPERTY_SEX_CATEGORY = "sexCategory"; + + public static final String PROPERTY_SAMPLE = "sample"; + + public static final String PROPERTY_NUMBER_AT_LENGTH = "numberAtLength"; + + public static final String PROPERTY_WEIGHT_AT_LENGTH = "weightAtLength"; + + public static final String PROPERTY_LENGTH_CLASS = "lengthClass"; + + protected Operation operation; + + protected Species species; + + protected SizeCategory sizeCategory; + + protected SexCategory sexCategory; + + protected final Sample sample; + + protected float numberAtLength; + + protected Float weightAtLength; + + protected String lengthClass; + + public SubSampleImportRow() { + sample = new SampleImpl(); + } + + public Sample getSample() { + return sample; + } + + public Operation getOperation() { + return operation; + } + + public void setOperation(Operation operation) { + this.operation = operation; + } + + public Species getSpecies() { + return species; + } + + public void setSpecies(Species species) { + this.species = species; + } + + public SizeCategory getSizeCategory() { + return sizeCategory; + } + + public void setSizeCategory(SizeCategory sizeCategory) { + this.sizeCategory = sizeCategory; + } + + public void setNumberSampled(Integer numberSampled) { + sample.setNumberSampled(numberSampled); + } + + public void setSampleWeight(Float sampleWeight) { + sample.setSampleWeight(sampleWeight); + } + + public SexCategory getSexCategory() { + return sexCategory; + } + + public void setSexCategory(SexCategory sexCategory) { + this.sexCategory = sexCategory; + } + + public float getNumberAtLength() { + return numberAtLength; + } + + public void setNumberAtLength(float numberAtLength) { + this.numberAtLength = numberAtLength; + } + + public Float getWeightAtLength() { + return weightAtLength; + } + + public void setWeightAtLength(Float weightAtLength) { + this.weightAtLength = weightAtLength; + } + + public String getLengthClass() { + return lengthClass; + } + + public void setLengthClass(String lengthClass) { + this.lengthClass = lengthClass; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,78 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.Sample; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; + +import java.util.Map; + +/** + * Model to import {@link Sample} of total type. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class TotalSampleImportModel extends AbstractImportModel<TotalSampleImportRow> { + + public TotalSampleImportModel(char separator, + Map<String, Operation> operationMap, + Map<String, Species> speciesMap, + Map<String, SizeCategory> sizeCategoryMap) { + super(separator); + + /* + operationID + baracoudacode + sizeCategory + sampleWeight + numberSampled + meanLength + meanWeight + noPerKg + sortedWeight + */ + + newForeignKeyColumn("operationID", TotalSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + newForeignKeyColumn("baracoudacode", TotalSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(TotalSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); + + newMandatoryColumn(Sample.PROPERTY_SAMPLE_WEIGHT, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Sample.PROPERTY_NUMBER_SAMPLED, EchobaseCsvUtil.NA_TO_INTEGER_PARSER); + + newMandatoryColumn(TotalSampleImportRow.PROPERTY_MEAN_LENGTH, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); + newMandatoryColumn(TotalSampleImportRow.PROPERTY_MEAN_WEIGHT, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); + newMandatoryColumn(TotalSampleImportRow.PROPERTY_NO_PER_KG, EchobaseCsvUtil.NA_TO_FLOAT_PARSER); + newMandatoryColumn(TotalSampleImportRow.PROPERTY_SORTED_WEIGHT, EchobaseCsvUtil.PRIMITIVE_FLOAT); + } + + @Override + public TotalSampleImportRow newEmptyInstance() { + return new TotalSampleImportRow(); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TotalSampleImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,143 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Operation; +import fr.ifremer.echobase.entities.data.Sample; +import fr.ifremer.echobase.entities.data.SampleImpl; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; + +/** + * Bean used as a row for import of {@link TotalSampleImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class TotalSampleImportRow { + + public static final String PROPERTY_OPERATION = "operation"; + + public static final String PROPERTY_SPECIES = "species"; + + public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; + + public static final String PROPERTY_SAMPLE = "sample"; + + public static final String PROPERTY_MEAN_LENGTH = "meanLength"; + + public static final String PROPERTY_MEAN_WEIGHT = "meanWeight"; + + public static final String PROPERTY_NO_PER_KG = "noPerKg"; + + public static final String PROPERTY_SORTED_WEIGHT = "sortedWeight"; + + protected Float meanLength; + + protected Float meanWeight; + + protected Float noPerKg; + + protected float sortedWeight; + + protected Operation operation; + + protected Species species; + + protected SizeCategory sizeCategory; + + protected final Sample sample; + + public TotalSampleImportRow() { + sample = new SampleImpl(); + } + + public Sample getSample() { + return sample; + } + + public Operation getOperation() { + return operation; + } + + public void setOperation(Operation operation) { + this.operation = operation; + } + + public Species getSpecies() { + return species; + } + + public void setSpecies(Species species) { + this.species = species; + } + + public SizeCategory getSizeCategory() { + return sizeCategory; + } + + public void setSizeCategory(SizeCategory sizeCategory) { + this.sizeCategory = sizeCategory; + } + + public void setNumberSampled(Integer numberSampled) { + sample.setNumberSampled(numberSampled); + } + + public void setSampleWeight(Float sampleWeight) { + sample.setSampleWeight(sampleWeight); + } + + public Float getMeanLength() { + return meanLength; + } + + public void setMeanLength(Float meanLength) { + this.meanLength = meanLength; + } + + public Float getMeanWeight() { + return meanWeight; + } + + public void setMeanWeight(Float meanWeight) { + this.meanWeight = meanWeight; + } + + public Float getNoPerKg() { + return noPerKg; + } + + public void setNoPerKg(Float noPerKg) { + this.noPerKg = noPerKg; + } + + public float getSortedWeight() { + return sortedWeight; + } + + public void setSortedWeight(float sortedWeight) { + this.sortedWeight = sortedWeight; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,77 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Vessel; + +import java.util.Map; + +/** + * Model to import transects. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class TransectImportModel extends AbstractImportModel<TransectImportRow> { + + public TransectImportModel(char separator, + Map<String, Voyage> voyageMap, + Map<String, Vessel> vesselMap) { + super(separator); + newForeignKeyColumn( + "voyageName", TransectImportRow.PROPERTY_VOYAGE, + Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + + newForeignKeyColumn( + "vesselName", Transect.PROPERTY_VESSEL, + Vessel.class, Vessel.PROPERTY_NAME, vesselMap); + + newMandatoryColumn(Transect.PROPERTY_TITLE); + newMandatoryColumn(Transect.PROPERTY_TRANSECT_ABSTRACT); + newMandatoryColumn(Transect.PROPERTY_STRATUM); + newMandatoryColumn(Transect.PROPERTY_COMMENT); + + newMandatoryColumn(Transect.PROPERTY_DATE_CREATED, EchobaseCsvUtil.IMPORT_DAY_TIME2); + newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_START, EchobaseCsvUtil.IMPORT_DAY_TIME2); + newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_END, EchobaseCsvUtil.IMPORT_DAY_TIME2); + + newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LON_MIN, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LAT_MIN, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LON_MAX, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LAT_MAX, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(Transect.PROPERTY_LINESTRING); + } + + @Override + public TransectImportRow newEmptyInstance() { + return new TransectImportRow(); + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransectImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,125 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.TransectImpl; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Vessel; + +import java.io.Serializable; +import java.util.Date; + +/** + * Bean used as a row for import of {@link TransectImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class TransectImportRow implements Serializable { + + private static final long serialVersionUID = 1L; + + public static final String PROPERTY_VOYAGE = "voyage"; + + protected Voyage voyage; + + protected Transect transect; + + public TransectImportRow() { + transect = new TransectImpl(); + } + + public Transect getTransect() { + return transect; + } + + public Voyage getVoyage() { + return voyage; + } + + public void setVoyage(Voyage voyage) { + this.voyage = voyage; + } + + public void setTitle(String title) { + transect.setTitle(title); + } + + public void setTransectAbstract(String transectAbstract) { + transect.setTransectAbstract(transectAbstract); + } + + public void setComment(String comment) { + transect.setComment(comment); + } + + public void setDateCreated(Date dateCreated) { + transect.setDateCreated(dateCreated); + } + + public void setGeospatialLonMin(float geospatialLonMin) { + transect.setGeospatialLonMin(geospatialLonMin); + } + + public void setGeospatialLonMax(float geospatialLonMax) { + transect.setGeospatialLonMax(geospatialLonMax); + } + + public void setGeospatialLatMin(float geospatialLatMin) { + transect.setGeospatialLatMin(geospatialLatMin); + } + + public void setGeospatialLatMax(float geospatialLatMax) { + transect.setGeospatialLatMax(geospatialLatMax); + } + + public void setLinestring(String linestring) { + transect.setLinestring(linestring); + } + + public void setGeospatialVerticalMin(float geospatialVerticalMin) { + transect.setGeospatialVerticalMin(geospatialVerticalMin); + } + + public void setGeospatialVerticalMax(float geospatialVerticalMax) { + transect.setGeospatialVerticalMax(geospatialVerticalMax); + } + + public void setTimeCoverageStart(Date timeCoverageStart) { + transect.setTimeCoverageStart(timeCoverageStart); + } + + public void setTimeCoverageEnd(Date timeCoverageEnd) { + transect.setTimeCoverageEnd(timeCoverageEnd); + } + + public void setStratum(String stratum) { + transect.setStratum(stratum); + } + + public void setVessel(Vessel vessel) { + transect.setVessel(vessel); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,58 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; + +import java.util.Map; + +/** + * Model to import Transits. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class TransitImportModel extends AbstractImportModel<TransitImportRow> { + + public static final String TRANSIT_VoyageId = "voyageName"; + + public TransitImportModel(char separator, + Map<String, Voyage> voyageMap) { + super(separator); + newForeignKeyColumn("voyageName", TransitImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + newMandatoryColumn(Transit.PROPERTY_DESCRIPTION); + newMandatoryColumn(Transit.PROPERTY_START_TIME, EchobaseCsvUtil.DAY_TIME); + newMandatoryColumn(Transit.PROPERTY_END_TIME, EchobaseCsvUtil.DAY_TIME); + newMandatoryColumn(Transit.PROPERTY_START_LOCALITY); + newMandatoryColumn(Transit.PROPERTY_END_LOCALITY); + } + + @Override + public TransitImportRow newEmptyInstance() { + return new TransitImportRow(); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportRow.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/TransitImportModelRow.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportRow.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,93 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.TransitImpl; +import fr.ifremer.echobase.entities.data.Voyage; + +import java.util.Date; + +/** + * Bean used as a row for import of {@link TransitImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class TransitImportRow { + + public static final String PROPERTY_VOYAGE = "voyage"; + + protected Voyage voyage; + + protected final Transit transit; + + protected String description; + + protected String relatedActivity; + + protected Date startTime; + + protected Date endTime; + + protected String startLocality; + + protected String endLocality; + + public TransitImportRow() { + transit = new TransitImpl(); + } + + public Transit getTransit() { + return transit; + } + + public Voyage getVoyage() { + return voyage; + } + + public void setVoyage(Voyage voyage) { + this.voyage = voyage; + } + + public void setDescription(String description) { + transit.setDescription(description); + } + + public void setStartTime(Date startTime) { + transit.setStartTime(startTime); + } + + public void setEndTime(Date endTime) { + transit.setEndTime(endTime); + } + + public void setStartLocality(String startLocality) { + transit.setStartLocality(startLocality); + } + + public void setEndLocality(String endLocality) { + transit.setEndLocality(endLocality); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/VoyageImportModel.java (from rev 416, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/VoyageImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/VoyageImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/VoyageImportModel.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,52 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata.csv; + +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.VoyageImpl; + +/** + * Model to import Voyages. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class VoyageImportModel extends AbstractImportModel<Voyage> { + + public VoyageImportModel(char separator) { + super(separator); + newMandatoryColumn(Voyage.PROPERTY_NAME); + newMandatoryColumn(Voyage.PROPERTY_START_DATE, EchobaseCsvUtil.DAY); + newMandatoryColumn(Voyage.PROPERTY_END_DATE, EchobaseCsvUtil.DAY); + newMandatoryColumn(Voyage.PROPERTY_START_PORT); + newMandatoryColumn(Voyage.PROPERTY_END_PORT); + } + + @Override + public Voyage newEmptyInstance() { + return new VoyageImpl(); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/VoyageImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-03-27 23:02:51 UTC (rev 420) @@ -1,7 +1,3 @@ -echobase.common.acousticByEchotypeAndSpeciesCategoryFile= -echobase.common.acousticByEchotypeFile= -echobase.common.acousticBySpeciesAndAgeCategoryFile= -echobase.common.acousticBySpeciesAndSizeCategoryFile= echobase.common.biometrySampleFile= echobase.common.cellMapResultFile= echobase.common.cellMapsFile= @@ -14,6 +10,10 @@ echobase.common.commonDataImportMode.all= echobase.common.commonDataImportMode.transect= echobase.common.echotypeFile= +echobase.common.esduByEchotypeAndSpeciesCategoryFile= +echobase.common.esduByEchotypeFile= +echobase.common.esduBySpeciesAndAgeCategoryFile= +echobase.common.esduBySpeciesAndSizeCategoryFile= echobase.common.gearMetadataFile= echobase.common.importDataMode.accousticData= echobase.common.importDataMode.catchesData= @@ -26,10 +26,10 @@ echobase.common.moviesFile= echobase.common.operationFile= echobase.common.operationMetadataFile= -echobase.common.resultsImportMode.acoustic.byEchotype= -echobase.common.resultsImportMode.acoustic.byEchotypeAndSpeciesCategory= -echobase.common.resultsImportMode.acoustic.bySpeciesAndAgeCategory= -echobase.common.resultsImportMode.acoustic.bySpeciesAndSizeCategory= +echobase.common.resultsImportMode.esdu.byEchotype= +echobase.common.resultsImportMode.esdu.byEchotypeAndSpeciesCategory= +echobase.common.resultsImportMode.esdu.bySpeciesAndAgeCategory= +echobase.common.resultsImportMode.esdu.bySpeciesAndSizeCategory= echobase.common.resultsImportMode.map= echobase.common.resultsImportMode.region= echobase.common.resultsImportMode.voyage= Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-03-27 23:02:51 UTC (rev 420) @@ -1,7 +1,3 @@ -echobase.common.acousticByEchotypeAndSpeciesCategoryFile=Fichier d'import -echobase.common.acousticByEchotypeFile=Fichier d'import -echobase.common.acousticBySpeciesAndAgeCategoryFile=Fichier d'import -echobase.common.acousticBySpeciesAndSizeCategoryFile=Fichier d'import echobase.common.biometrySampleFile=Fichier BiometrySample echobase.common.cellMapResultFile=Fichier de résultats de cellules Carte echobase.common.cellMapsFile=Fichier des cellules Cartes @@ -14,6 +10,10 @@ echobase.common.commonDataImportMode.all=Import Voyage / Transit / Transects echobase.common.commonDataImportMode.transect=Import Transects echobase.common.echotypeFile=Fichier echotype +echobase.common.esduByEchotypeAndSpeciesCategoryFile=Fichier d'import +echobase.common.esduByEchotypeFile=Fichier d'import +echobase.common.esduBySpeciesAndAgeCategoryFile=Fichier d'import +echobase.common.esduBySpeciesAndSizeCategoryFile=Fichier d'import echobase.common.gearMetadataFile=Fichier Méta-données d'engin echobase.common.importDataMode.accousticData=Import des données accoustiques echobase.common.importDataMode.catchesData=Import des données de pêche @@ -26,10 +26,10 @@ echobase.common.moviesFile=Fichier Movies echobase.common.operationFile=Fichier Opérations echobase.common.operationMetadataFile=Fichier Méta-données opération -echobase.common.resultsImportMode.acoustic.byEchotype=Import des résultats acoustiques par echotype -echobase.common.resultsImportMode.acoustic.byEchotypeAndSpeciesCategory=Import des résultats acoustiques par echotype et catégorie d'espèce -echobase.common.resultsImportMode.acoustic.bySpeciesAndAgeCategory=Import des résultats acoustiques par espèce et catégorie d'age -echobase.common.resultsImportMode.acoustic.bySpeciesAndSizeCategory=Import des résultats acoustiques par espèce et catégorie de taille +echobase.common.resultsImportMode.esdu.byEchotype=Import des résultats de cellule esdu par echotype +echobase.common.resultsImportMode.esdu.byEchotypeAndSpeciesCategory=Import des résultats de cellule esdu par echotype et catégorie d'espèce +echobase.common.resultsImportMode.esdu.bySpeciesAndAgeCategory=Import des résultats de cellule esdu par espèce et catégorie d'age +echobase.common.resultsImportMode.esdu.bySpeciesAndSizeCategory=Import des résultats de cellule esdu par espèce et catégorie de taille echobase.common.resultsImportMode.map=Import des cellules de type Carte echobase.common.resultsImportMode.region=Import des cellules de type Région echobase.common.resultsImportMode.voyage=Import des résultats du voyage Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-03-27 23:02:51 UTC (rev 420) @@ -30,7 +30,6 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserImpl; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.configurations.ProgressionModel; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,7 +23,6 @@ */ package fr.ifremer.echobase.services; -import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; import fr.ifremer.echobase.services.importdata.AbstractImportDataServiceIT; import org.apache.commons.io.FileUtils; import org.junit.Assert; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,7 +23,6 @@ */ package fr.ifremer.echobase.services; -import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; import fr.ifremer.echobase.services.importdata.AbstractImportDataServiceIT; import org.junit.Test; import org.nuiton.util.FileUtil; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-03-27 23:02:51 UTC (rev 420) @@ -25,7 +25,6 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserImpl; -import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.TopiaException; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -43,7 +43,6 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -130,18 +129,6 @@ public static final int NB_ECHOTYPE = 8; - public static final int NB_ESDU_RESULT_BY_ECHOTYPE = 43533; - - public static final int NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES = 396990; - - public static final int NB_ESDU_RESULT_BY_SPECIES_AND_SIZE_CATEGORY = 68108; - - public static final int NB_ESDU_RESULT_BY_SPECIES_AND_AGE_CATEGORY = 10021; - - public static final int NB_REGION_CELLS = 228; - - public static final int NB_REGION_DATAS = NB_REGION_CELLS * 4; - public void assertImportCommonData() throws TopiaException { assertNbEntities(Voyage.class, NB_VOYAGE); assertNbEntities(Transit.class, NB_TRANSIT); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,17 +24,11 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; -import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.data.Cell; 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.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; -import fr.ifremer.echobase.services.configurations.AcousticDataImportConfiguration; -import fr.ifremer.echobase.services.configurations.CellPositionReference; -import org.junit.Assert; import org.junit.Test; import java.util.List; @@ -102,5 +96,4 @@ } - } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -27,7 +27,6 @@ import fr.ifremer.echobase.entities.data.Sample; import fr.ifremer.echobase.entities.data.SampleData; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; import org.junit.Ignore; import org.junit.Test; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -27,8 +27,6 @@ import fr.ifremer.echobase.entities.data.Transect; import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.CommonDataImportConfiguration; -import fr.ifremer.echobase.services.configurations.CommonDataImportMode; import org.junit.Test; import java.util.Iterator; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -28,8 +28,6 @@ import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.CommonDataImportConfiguration; -import fr.ifremer.echobase.services.configurations.CommonDataImportMode; import org.junit.Test; import java.util.Iterator; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -28,7 +28,6 @@ import fr.ifremer.echobase.entities.data.Operation; import fr.ifremer.echobase.entities.data.OperationMetadataValue; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.OperationImportConfiguration; import org.junit.Test; import java.util.Iterator; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -31,6 +31,7 @@ import fr.ifremer.echobase.csv.CsvFileImportResult; import fr.ifremer.echobase.csv.EchoBaseImport; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.CellDAO; import fr.ifremer.echobase.entities.data.DataAcquisition; @@ -41,9 +42,9 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.AgeCategory; import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.configurations.ResultsImportMode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; @@ -73,7 +74,7 @@ } protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "result", filename}; + return new String[]{"/import-data", "result", "esdu", filename}; } @Test @@ -91,19 +92,19 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_ECHOTYPE); + conf.setImportMode(ResultsImportMode.ESDU_BY_ECHOTYPE); - prepareInputFile(conf.getAcousticByEchotypeFile(), - getImportPath("acousticResultByEchotype.csv.gz")); + InputFile inputFile = conf.getEsduByEchotypeFile(); + prepareInputFile(inputFile, getImportPath("byEchotype.csv.gz")); - addMissingEsduCells(conf.getVoyageId(), - conf.getAcousticByEchotypeAndSpeciesCategoryFile() - ); + addMissingEsduCells(conf.getVoyageId(), inputFile); List<CsvFileImportResult> result = doImport( conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE); + assertCsvImportResult(result.get(0), Result.class, 43533); + assertCsvImportResult(result.get(0), Category.class, 7); + assertCsvImportResult(result.get(0), SpeciesCategory.class, 1); } @Test @@ -121,14 +122,13 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY); + conf.setImportMode(ResultsImportMode.ESDU_BY_ECHOTYPE_AND_SPECIES_CATEGORY); - prepareInputFile(conf.getAcousticByEchotypeAndSpeciesCategoryFile(), - getImportPath("acousticResultByEchotypeAndSpeciesCategory.csv.gz")); + InputFile inputFile = conf.getEsduByEchotypeAndSpeciesCategoryFile(); + prepareInputFile(inputFile, + getImportPath("byEchotypeAndSpeciesCategory.csv.gz")); - addMissingEsduCells(conf.getVoyageId(), - conf.getAcousticByEchotypeAndSpeciesCategoryFile() - ); + addMissingEsduCells(conf.getVoyageId(), inputFile); //TODO Remove this when referentiel is ok create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "SigmaSp"); @@ -137,10 +137,10 @@ create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondAbundance"); - List<CsvFileImportResult> result = doImport( - conf, ResultsEsduCellImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); + assertCsvImportResult(result.get(0), Result.class, 396990); } @Test @@ -158,20 +158,21 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY); + conf.setImportMode(ResultsImportMode.ESDU_BY_SPECIES_AND_SIZE_CATEGORY); - prepareInputFile(conf.getAcousticBySpeciesAndSizeCategoryFile(), - getImportPath("acousticResultBySpeciesAndSizeCategory.csv.gz")); + InputFile intputFile = conf.getEsduBySpeciesAndSizeCategoryFile(); + prepareInputFile(intputFile, + getImportPath("bySpeciesAndSizeCategory.csv.gz")); - addMissingEsduCells(conf.getVoyageId(), - conf.getAcousticBySpeciesAndSizeCategoryFile() - ); + addMissingEsduCells(conf.getVoyageId(), intputFile); - List<CsvFileImportResult> result = doImport( - conf, ResultsEsduCellImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsEsduCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, - NB_ESDU_RESULT_BY_SPECIES_AND_SIZE_CATEGORY); + assertCsvImportResult(result.get(0), Result.class, 68108); + assertCsvImportResult(result.get(0), Category.class, 129); + assertCsvImportResult(result.get(0), SpeciesCategory.class, 129); + assertCsvImportResult(result.get(0), SizeCategory.class, 62); } @Test @@ -189,24 +190,25 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY); + conf.setImportMode(ResultsImportMode.ESDU_BY_SPECIES_AND_AGE_CATEGORY); - prepareInputFile(conf.getAcousticBySpeciesAndAgeCategoryFile(), - getImportPath("acousticResultBySpeciesAndAgeCategory.csv.gz")); + InputFile inputFile = conf.getEsduBySpeciesAndAgeCategoryFile(); + prepareInputFile(inputFile, + getImportPath("bySpeciesAndAgeCategory.csv.gz")); - addMissingEsduCells(conf.getVoyageId(), - conf.getAcousticBySpeciesAndSizeCategoryFile() - ); + addMissingEsduCells(conf.getVoyageId(), inputFile); //TODO Remove this when referentiel is ok create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "N"); - List<CsvFileImportResult> result = doImport( - conf, ResultsEsduCellImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsEsduCellImportService.class, 1); CsvFileImportResult actual = result.get(0); - assertCsvImportResult(actual, Result.class, NB_ESDU_RESULT_BY_SPECIES_AND_AGE_CATEGORY); + assertCsvImportResult(actual, Result.class, 10021); assertCsvImportResult(actual, AgeCategory.class, 10); + assertCsvImportResult(actual, Category.class, 14); + assertCsvImportResult(actual, SpeciesCategory.class, 14); } protected void addMissingEsduCells(String voyageId, Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,10 +24,10 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.configurations.ResultsImportMode; import org.junit.Ignore; import org.junit.Test; @@ -47,7 +47,7 @@ } protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "result", filename}; + return new String[]{"/import-data", "result", "map", filename}; } @Ignore @@ -71,12 +71,16 @@ conf.setImportMode(ResultsImportMode.MAP); prepareInputFile(conf.getMapsFile(), getImportPath("maps.csv.gz")); - prepareInputFile(conf.getMapResultFile(), getImportPath("mapResult.csv.gz")); + //TODO Use this + //prepareInputFile(conf.getMapResultFile(), getImportPath("mapResults.csv.gz")); List<CsvFileImportResult> result = doImport( conf, ResultsMapCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); + assertCsvImportResult(result.get(0), Cell.class, 0); + assertCsvImportResult(result.get(0), Data.class, 0); + assertCsvImportResult(result.get(1), Result.class, 0); + } } \ No newline at end of file Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -28,8 +28,6 @@ import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.configurations.ResultsImportMode; import org.junit.Test; import java.util.List; @@ -48,14 +46,12 @@ } protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "result", filename}; + return new String[]{"/import-data", "result", "region", filename}; } @Test public void doImportRegion() throws Exception { - //TODO - assertImportCommonData(); assertImportOperations(); assertImportSampleDatas(); @@ -78,11 +74,13 @@ // prepareInputFile(conf.getRegionsFile(), // getImportPath("regionResults.csv.gz")); - List<CsvFileImportResult> result = doImport( - conf, ResultsRegionCellImportService.class, 1); + List<CsvFileImportResult> result; + result = doImport(conf, ResultsRegionCellImportService.class, 1); - assertCsvImportResult(result.get(0), Cell.class, NB_REGION_CELLS); - assertCsvImportResult(result.get(0), Data.class, NB_REGION_DATAS); + assertCsvImportResult(result.get(0), Cell.class, 228); + assertCsvImportResult(result.get(0), Data.class, 228 * 4); + //assertCsvImportResult(result.get(1), Result.class, 0); + //assertCsvImportResult(result.get(2), Result.class, 0); } } \ No newline at end of file Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 23:02:51 UTC (rev 420) @@ -28,8 +28,6 @@ import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.configurations.ResultsImportMode; import org.junit.Ignore; import org.junit.Test; @@ -48,7 +46,7 @@ } protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "result", filename}; + return new String[]{"/import-data", "result", "voyage", filename}; } @Test Deleted: trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotype.csv.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotypeAndSpeciesCategory.csv.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndAgeCategory.csv.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndSizeCategory.csv.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz (from rev 417, trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotype.csv.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory.csv.gz (from rev 417, trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotypeAndSpeciesCategory.csv.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory.csv.gz (from rev 417, trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndAgeCategory.csv.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz (from rev 417, trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndSizeCategory.csv.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz =================================================================== (Binary files differ) Deleted: trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz (from rev 418, trunk/echobase-services/src/test/resources/import-data/result/regions.csv.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/echobase-services/src/test/resources/import-data/result/regions.csv.gz =================================================================== (Binary files differ) Copied: trunk/echobase-services/src/test/resources/import-data/result/voyage/echotype.csv.gz (from rev 417, trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/voyage/echotype.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthAgeKey.csv.gz (from rev 417, trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthAgeKey.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthWeightKey.csv.gz (from rev 417, trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz) =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthWeightKey.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AcousticInstrumentLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AcousticInstrumentLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AcousticInstrumentLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,9 +24,9 @@ package fr.ifremer.echobase.tools.loaders; import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.AcousticInstrument; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AgeCategoryLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AgeCategoryLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AgeCategoryLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.AgeCategory; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AreaOfOperationLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AreaOfOperationLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AreaOfOperationLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.AreaOfOperation; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellMethodLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellMethodLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellMethodLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.CellMethod; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellTypeLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellTypeLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.CellType; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -27,13 +27,13 @@ import com.healthmarketscience.jackcess.Database; import com.healthmarketscience.jackcess.Table; import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.CellMethod; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataType; import fr.ifremer.echobase.entities.references.ReferenceDatum; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataQualityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataQualityLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataQualityLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.DataQuality; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataTypeLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataTypeLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.DataType; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DepthStratumLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeCategoryLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeCategoryLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeCategoryLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.EchotypeCategory; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -25,6 +25,7 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.meta.AssociationMeta; @@ -33,7 +34,6 @@ import fr.ifremer.echobase.entities.references.EchotypeCategory; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.services.DbEditorService; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import org.nuiton.util.csv.Import; 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 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -33,6 +33,7 @@ import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.csv.CsvImportResult; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.MetaFilenameAware; @@ -42,7 +43,6 @@ import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.ExportService; import fr.ifremer.echobase.services.ImportService; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,9 +24,9 @@ package fr.ifremer.echobase.tools.loaders; import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.Gear; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.Date; Modified: 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 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,11 +24,11 @@ package fr.ifremer.echobase.tools.loaders; import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.csv.EntityCsvModel; 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.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.List; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/MissionLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/MissionLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/MissionLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.Mission; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: 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 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.OperationEvent; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: 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 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,12 +24,12 @@ package fr.ifremer.echobase.tools.loaders; import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.csv.EntityCsvModel; 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.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.List; 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,10 +24,10 @@ package fr.ifremer.echobase.tools.loaders; import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.ReferenceDatum; import fr.ifremer.echobase.entities.references.ReferenceDatumType; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.List; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumTypeLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumTypeLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.ReferenceDatumType; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: 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 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.SampleDataType; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: 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 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,10 +23,10 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; 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.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: 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 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.SexCategory; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: 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 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,10 +23,10 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; 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.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.Species; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** 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-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/StrataLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -25,10 +25,10 @@ import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.csv.EntityCsvModel; 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.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.List; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TSParametersLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TSParametersLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/TSParametersLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,9 +24,9 @@ package fr.ifremer.echobase.tools.loaders; import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.TSParameters; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -25,10 +25,10 @@ import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.entities.references.VesselType; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.List; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.tools.loaders; +import fr.ifremer.echobase.csv.EntityCsvModel; import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.VesselType; -import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,10 +24,10 @@ package fr.ifremer.echobase.ui; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; -import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; -import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; -import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; +import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.ExportDbConfiguration; +import fr.ifremer.echobase.services.ImportDbConfiguration; +import fr.ifremer.echobase.services.importdata.AbstractImportConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -182,6 +182,6 @@ public boolean isAdmin() { EchoBaseUser user = getEchoBaseUser(); - return user!=null && user.isAdmin(); + return user != null && user.isAdmin(); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2012-03-27 23:02:51 UTC (rev 420) @@ -25,7 +25,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.Preparable; -import fr.ifremer.echobase.services.configurations.AbstractEchobaseActionConfiguration; +import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaContextImplementor; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.ui.actions.embeddedApplication; +import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; import fr.ifremer.echobase.services.EmbeddedApplicationService; -import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2012-03-27 23:02:51 UTC (rev 420) @@ -26,7 +26,7 @@ import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.ui.actions.embeddedApplication; -import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import java.io.BufferedInputStream; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.ui.actions.exportDb; -import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; +import fr.ifremer.echobase.services.ExportDbConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.ui.actions.exportDb; -import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; +import fr.ifremer.echobase.services.ExportDbConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import java.io.BufferedInputStream; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.ui.actions.exportDb; +import fr.ifremer.echobase.services.ExportDbConfiguration; import fr.ifremer.echobase.services.ExportDbService; -import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java 2012-03-27 23:02:51 UTC (rev 420) @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; +import fr.ifremer.echobase.services.importdata.AbstractImportConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,9 +24,9 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.services.ImportException; +import fr.ifremer.echobase.services.importdata.AbstractImportConfiguration; import fr.ifremer.echobase.services.importdata.AbstractImportDataService; -import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java 2012-03-27 23:02:51 UTC (rev 420) @@ -1,96 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.ui.actions.importData; - -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.AcousticDataImportConfiguration; -import fr.ifremer.echobase.services.configurations.CellPositionReference; - -import java.io.File; -import java.util.Map; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ConfigureAccousticData extends AbstractConfigureImport<AcousticDataImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - protected Map<String, String> cellPositionReferences; - - public ConfigureAccousticData() { - super(AcousticDataImportConfiguration.class); - } - - @Override - protected AcousticDataImportConfiguration createModel() { - return new AcousticDataImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - cellPositionReferences = decorateEnums(CellPositionReference.values()); - - if (getModel().getCellPositionReference() == null) { - - getModel().setCellPositionReference(CellPositionReference.START); - } - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public Map<String, String> getCellPositionReferences() { - return cellPositionReferences; - } - - public void setMoviesFile(File file) { - getModel().getMoviesFile().setFile(file); - } - - public void setMoviesFileContentType(String contentType) { - getModel().getMoviesFile().setContentType(contentType); - } - - public void setMoviesFileFileName(String fileName) { - getModel().getMoviesFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData.java (from rev 416, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData.java 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,96 @@ +/* + * #%L + * EchoBase :: UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.importdata.AcousticDataImportConfiguration; +import fr.ifremer.echobase.services.importdata.CellPositionReference; + +import java.io.File; +import java.util.Map; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ConfigureAcousticData extends AbstractConfigureImport<AcousticDataImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + protected Map<String, String> cellPositionReferences; + + public ConfigureAcousticData() { + super(AcousticDataImportConfiguration.class); + } + + @Override + protected AcousticDataImportConfiguration createModel() { + return new AcousticDataImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + cellPositionReferences = decorateEnums(CellPositionReference.values()); + + if (getModel().getCellPositionReference() == null) { + + getModel().setCellPositionReference(CellPositionReference.START); + } + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public Map<String, String> getCellPositionReferences() { + return cellPositionReferences; + } + + public void setMoviesFile(File file) { + getModel().getMoviesFile().setFile(file); + } + + public void setMoviesFileContentType(String contentType) { + getModel().getMoviesFile().setContentType(contentType); + } + + public void setMoviesFileFileName(String fileName) { + getModel().getMoviesFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java 2012-03-27 23:02:51 UTC (rev 420) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; +import fr.ifremer.echobase.services.importdata.CatchesDataImportConfiguration; import java.io.File; import java.util.Map; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java 2012-03-27 23:02:51 UTC (rev 420) @@ -28,8 +28,8 @@ import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.CommonDataImportConfiguration; -import fr.ifremer.echobase.services.configurations.CommonDataImportMode; +import fr.ifremer.echobase.services.importdata.CommonDataImportConfiguration; +import fr.ifremer.echobase.services.importdata.CommonDataImportMode; import java.io.File; import java.util.Map; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperation.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperation.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperation.java 2012-03-27 23:02:51 UTC (rev 420) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.OperationImportConfiguration; +import fr.ifremer.echobase.services.importdata.OperationImportConfiguration; import java.io.File; import java.util.Map; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java 2012-03-27 23:02:51 UTC (rev 420) @@ -27,8 +27,8 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.configurations.ResultsImportMode; +import fr.ifremer.echobase.services.importdata.ResultsImportConfiguration; +import fr.ifremer.echobase.services.importdata.ResultsImportMode; import java.io.File; import java.util.Map; @@ -89,25 +89,25 @@ } @InputConfig(methodName = "input") - public String modeAcousticByEchotype() throws Exception { + public String modeEsduByEchotype() throws Exception { return execute(); } @InputConfig(methodName = "input") - public String modeAcousticByEchotypeAndSpeciesCategory() throws Exception { + public String modeEsduByEchotypeAndSpeciesCategory() throws Exception { return execute(); } @InputConfig(methodName = "input") - public String modeAcousticBySpeciesAndSizeCategory() throws Exception { + public String modeEsduBySpeciesAndSizeCategory() throws Exception { return execute(); } @InputConfig(methodName = "input") - public String modeAcousticBySpeciesAndAgeCategory() throws Exception { + public String modeEsduBySpeciesAndAgeCategory() throws Exception { return execute(); } @@ -241,28 +241,51 @@ getModel().getEchotypeFile().setFileName(fileName); } - public void setAcousticByEchotypeFile(File file) { - getModel().getAcousticByEchotypeFile().setFile(file); + public void setEsduByEchotypeFile(File file) { + getModel().getEsduByEchotypeFile().setFile(file); } - public void setAcousticByEchotypeFileContentType(String contentType) { - getModel().getAcousticByEchotypeFile().setContentType(contentType); + public void setEsduByEchotypeFileContentType(String contentType) { + getModel().getEsduByEchotypeFile().setContentType(contentType); } - public void setAcousticByEchotypeFileName(String fileName) { - getModel().getAcousticByEchotypeFile().setFileName(fileName); + public void setEsduByEchotypeFileName(String fileName) { + getModel().getEsduByEchotypeFile().setFileName(fileName); } - public void setAcousticByEchotypeAndSpeciesCategoryFileFile(File file) { - getModel().getAcousticByEchotypeAndSpeciesCategoryFile().setFile(file); + public void setEsduByEchotypeAndSpeciesCategoryFileFile(File file) { + getModel().getEsduByEchotypeAndSpeciesCategoryFile().setFile(file); } - public void setAcousticByEchotypeAndSpeciesCategoryFileContentType(String contentType) { - getModel().getAcousticByEchotypeAndSpeciesCategoryFile().setContentType(contentType); + public void setEsduByEchotypeAndSpeciesCategoryFileContentType(String contentType) { + getModel().getEsduByEchotypeAndSpeciesCategoryFile().setContentType(contentType); } - public void setAcousticByEchotypeAndSpeciesCategoryFileName(String fileName) { - getModel().getAcousticByEchotypeAndSpeciesCategoryFile().setFileName(fileName); + public void setEsduByEchotypeAndSpeciesCategoryFileName(String fileName) { + getModel().getEsduByEchotypeAndSpeciesCategoryFile().setFileName(fileName); } + public void setEsduBySpeciesAndSizeCategoryFile(File file) { + getModel().getEsduBySpeciesAndSizeCategoryFile().setFile(file); + } + + public void setEsduBySpeciesAndSizeCategoryFileContentType(String contentType) { + getModel().getEsduBySpeciesAndSizeCategoryFile().setContentType(contentType); + } + + public void setEsduBySpeciesAndSizeCategoryFileName(String fileName) { + getModel().getEsduBySpeciesAndSizeCategoryFile().setFileName(fileName); + } + + public void setEsduBySpeciesAndAgeCategoryFile(File file) { + getModel().getEsduBySpeciesAndAgeCategoryFile().setFile(file); + } + + public void setEsduBySpeciesAndAgeCategoryFileContentType(String contentType) { + getModel().getEsduBySpeciesAndAgeCategoryFile().setContentType(contentType); + } + + public void setEsduBySpeciesAndAgeCategoryFileName(String fileName) { + getModel().getEsduBySpeciesAndAgeCategoryFile().setFileName(fileName); + } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.services.importdata.AcousticDataImportConfiguration; import fr.ifremer.echobase.services.importdata.AcousticDataImportService; -import fr.ifremer.echobase.services.configurations.AcousticDataImportConfiguration; /** * Configure a accoustic data import. Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.services.importdata.CatchesDataImportConfiguration; import fr.ifremer.echobase.services.importdata.CatchesDataImportService; -import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; /** * Configure a accoustic data import. Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonData.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonData.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.services.importdata.CommonDataImportConfiguration; import fr.ifremer.echobase.services.importdata.CommonDataImportService; -import fr.ifremer.echobase.services.configurations.CommonDataImportConfiguration; /** * Configure a accoustic data import. Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperation.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperation.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperation.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.services.importdata.OperationImportConfiguration; import fr.ifremer.echobase.services.importdata.OperationImportService; -import fr.ifremer.echobase.services.configurations.OperationImportConfiguration; /** * TODO Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResults.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResults.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResults.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.services.importdata.ResultsImportConfiguration; import fr.ifremer.echobase.services.importdata.ResultsImportService; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; /** * Configure a "result" import. Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-03-27 23:02:51 UTC (rev 420) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.ui.actions.importDb; import fr.ifremer.echobase.InputFile; -import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; +import fr.ifremer.echobase.services.ImportDbConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-03-27 23:02:51 UTC (rev 420) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.ui.actions.importDb; +import fr.ifremer.echobase.services.ImportDbConfiguration; import fr.ifremer.echobase.services.ImportDbService; -import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -42,7 +42,8 @@ </action>  - <action name="logout" class="fr.ifremer.echobase.ui.actions.user.LoginAction" + <action name="logout" + class="fr.ifremer.echobase.ui.actions.user.LoginAction" method="doLogout"> <result type="redirectAction"> <param name="namespace">/</param> @@ -53,7 +54,8 @@ </action>  - <action name="userList" class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> + <action name="userList" + class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="checkUserIsAdmin"/> <result>/WEB-INF/jsp/user/userList.jsp</result> Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -1,156 +0,0 @@ - -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="model.voyageId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.voyage.required"/> - </field-validator> - </field> - - <field name="model.transitId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.transit.required"/> - </field-validator> - </field> - - <field name="model.vesselId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.vessel.required"/> - </field-validator> - </field> - - <field name="model.cellPositionReference"> - <field-validator type="nrequired"> - <message key="echobase.error.import.cellPositionReference.required"/> - </field-validator> - </field> - - <field name="model.transceiverAcquisitionAbsorptionDescription"> - <field-validator type="nrequiredstring"> - <message - key="echobase.error.import.transceiverAcquisitionAbsorptionDescription.required"/> - </field-validator> - </field> - - <field name="model.acquisitionSoftwareVersionER60"> - <field-validator type="nrequiredstring"> - <message - key="echobase.error.import.acquisitionSoftwareVersionER60.required"/> - </field-validator> - </field> - - <field name="model.acquisitionSoftwareVersionME70"> - <field-validator type="nrequiredstring"> - <message - key="echobase.error.import.acquisitionSoftwareVersionME70.required"/> - </field-validator> - </field> - - <field name="model.echosounderSoundSpeed"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.echosounderSoundSpeed.required"/> - </field-validator> - </field> - - <field name="model.loggedDataFormat"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.loggedDataFormat.required"/> - </field-validator> - </field> - - <field name="model.loggedDataDatatype"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.loggedDataDatatype.required"/> - </field-validator> - </field> - - <field name="model.pingDutyCycle"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.pingDutyCycle.required"/> - </field-validator> - </field> - - <field name="model.soundSpeedCalculationsER60"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.soundSpeedCalculationsER60.required"/> - </field-validator> - </field> - - <field name="model.soundSpeedCalculationsME70"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.soundSpeedCalculationsME70.required"/> - </field-validator> - </field> - - <field name="model.sounderConstant"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.sounderConstant.required"/> - </field-validator> - </field> - - <field name="model.processingTemplate"> - <field-validator type="nrequiredstring"> - <message - key="echobase.error.import.processingTemplate.required"/> - </field-validator> - </field> - - <field name="model.processingDescription"> - <field-validator type="nrequiredstring"> - <message - key="echobase.error.import.processingDescription.required"/> - </field-validator> - </field> - - <field name="model.digitThreshold"> - <field-validator type="nrequiredstring"> - <message - key="echobase.error.import.digitThreshold.required"/> - </field-validator> - </field> - - <field name="model.acousticDensityUnit"> - <field-validator type="nrequiredstring"> - <message - key="echobase.error.import.acousticDensityUnit.required"/> - </field-validator> - </field> - - <field name="model.notes"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.notes.required"/> - </field-validator> - </field> - - <field name="moviesFile"> - <field-validator type="nfieldexpression"> - <param name="expression">model.moviesFile.file!=null</param> - <message key="echobase.error.import.moviesFile.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData-validation.xml (from rev 419, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,156 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.transitId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.transit.required"/> + </field-validator> + </field> + + <field name="model.vesselId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.vessel.required"/> + </field-validator> + </field> + + <field name="model.cellPositionReference"> + <field-validator type="nrequired"> + <message key="echobase.error.import.cellPositionReference.required"/> + </field-validator> + </field> + + <field name="model.transceiverAcquisitionAbsorptionDescription"> + <field-validator type="nrequiredstring"> + <message + key="echobase.error.import.transceiverAcquisitionAbsorptionDescription.required"/> + </field-validator> + </field> + + <field name="model.acquisitionSoftwareVersionER60"> + <field-validator type="nrequiredstring"> + <message + key="echobase.error.import.acquisitionSoftwareVersionER60.required"/> + </field-validator> + </field> + + <field name="model.acquisitionSoftwareVersionME70"> + <field-validator type="nrequiredstring"> + <message + key="echobase.error.import.acquisitionSoftwareVersionME70.required"/> + </field-validator> + </field> + + <field name="model.echosounderSoundSpeed"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.echosounderSoundSpeed.required"/> + </field-validator> + </field> + + <field name="model.loggedDataFormat"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.loggedDataFormat.required"/> + </field-validator> + </field> + + <field name="model.loggedDataDatatype"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.loggedDataDatatype.required"/> + </field-validator> + </field> + + <field name="model.pingDutyCycle"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.pingDutyCycle.required"/> + </field-validator> + </field> + + <field name="model.soundSpeedCalculationsER60"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.soundSpeedCalculationsER60.required"/> + </field-validator> + </field> + + <field name="model.soundSpeedCalculationsME70"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.soundSpeedCalculationsME70.required"/> + </field-validator> + </field> + + <field name="model.sounderConstant"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.sounderConstant.required"/> + </field-validator> + </field> + + <field name="model.processingTemplate"> + <field-validator type="nrequiredstring"> + <message + key="echobase.error.import.processingTemplate.required"/> + </field-validator> + </field> + + <field name="model.processingDescription"> + <field-validator type="nrequiredstring"> + <message + key="echobase.error.import.processingDescription.required"/> + </field-validator> + </field> + + <field name="model.digitThreshold"> + <field-validator type="nrequiredstring"> + <message + key="echobase.error.import.digitThreshold.required"/> + </field-validator> + </field> + + <field name="model.acousticDensityUnit"> + <field-validator type="nrequiredstring"> + <message + key="echobase.error.import.acousticDensityUnit.required"/> + </field-validator> + </field> + + <field name="model.notes"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.notes.required"/> + </field-validator> + </field> + + <field name="moviesFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.moviesFile.file!=null</param> + <message key="echobase.error.import.moviesFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticData-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -1,47 +0,0 @@ - -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="model.voyageId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.voyage.required"/> - </field-validator> - </field> - - <field name="model.resultLabel"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.resultLabel.required"/> - </field-validator> - </field> - - <field name="acousticByEchotypeFile"> - <field-validator type="nfieldexpression"> - <param name="expression">model.acousticByEchotypeFile.file!=null</param> - <message key="echobase.error.import.acousticByEchotypeFile.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -1,50 +0,0 @@ - -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="model.voyageId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.voyage.required"/> - </field-validator> - </field> - - <field name="model.resultLabel"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.resultLabel.required"/> - </field-validator> - </field> - - <field name="acousticByEchotypeAndSpeciesCategoryFile"> - <field-validator type="nfieldexpression"> - <param name="expression"> - model.acousticByEchotypeAndSpeciesCategoryFile.file!=null - </param> - <message - key="echobase.error.import.acousticByEchotypeAndSpeciesCategoryFile.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -1,50 +0,0 @@ - -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="model.voyageId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.voyage.required"/> - </field-validator> - </field> - - <field name="model.resultLabel"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.resultLabel.required"/> - </field-validator> - </field> - - <field name="acousticBySpeciesAndAgeCategoryFile"> - <field-validator type="nfieldexpression"> - <param name="expression"> - model.acousticBySpeciesAndAgeCategoryFile.file!=null - </param> - <message - key="echobase.error.import.acousticBySpeciesAndAgeCategoryFile.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -1,50 +0,0 @@ - -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="model.voyageId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.voyage.required"/> - </field-validator> - </field> - - <field name="model.resultLabel"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.resultLabel.required"/> - </field-validator> - </field> - - <field name="acousticBySpeciesAndSizeCategoryFile"> - <field-validator type="nfieldexpression"> - <param name="expression"> - model.acousticBySpeciesAndSizeCategoryFile.file!=null - </param> - <message - key="echobase.error.import.acousticBySpeciesAndSizeCategoryFile.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotype-validation.xml (from rev 419, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotype-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotype-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,47 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="esduByEchotypeFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.esduByEchotypeFile.file!=null</param> + <message key="echobase.error.import.esduByEchotypeFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotype-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotypeAndSpeciesCategory-validation.xml (from rev 419, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotypeAndSpeciesCategory-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotypeAndSpeciesCategory-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,50 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="esduByEchotypeAndSpeciesCategoryFile"> + <field-validator type="nfieldexpression"> + <param name="expression"> + model.esduByEchotypeAndSpeciesCategoryFile.file!=null + </param> + <message + key="echobase.error.import.esduByEchotypeAndSpeciesCategoryFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduByEchotypeAndSpeciesCategory-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndAgeCategory-validation.xml (from rev 419, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndAgeCategory-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndAgeCategory-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,50 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="esduBySpeciesAndAgeCategoryFile"> + <field-validator type="nfieldexpression"> + <param name="expression"> + model.esduBySpeciesAndAgeCategoryFile.file!=null + </param> + <message + key="echobase.error.import.esduBySpeciesAndAgeCategoryFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndAgeCategory-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndSizeCategory-validation.xml (from rev 419, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndSizeCategory-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndSizeCategory-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -0,0 +1,50 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="esduBySpeciesAndSizeCategoryFile"> + <field-validator type="nfieldexpression"> + <param name="expression"> + model.esduBySpeciesAndSizeCategoryFile.file!=null + </param> + <message + key="echobase.error.import.esduBySpeciesAndSizeCategoryFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeEsduBySpeciesAndSizeCategory-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -26,7 +26,7 @@ <validators> <field name="email"> - + <field-validator type="login"> <message key="echobase.error.login.wrongLogin"/> </field-validator> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-27 23:02:51 UTC (rev 420) @@ -20,8 +20,8 @@ echobase.error.export.sqlQuery.forbidden.drop.word=Export query contains a forbidden word 'DROP' echobase.error.export.sqlQuery.forbidden.insert.word=Export query contains a forbidden word 'INSERT' echobase.error.export.sqlQuery.forbidden.update.word=Export query contains a forbidden word 'UPDATE' -echobase.error.import.acousticByEchotypeAndSpeciesFile.required=Import file is mandatory -echobase.error.import.acousticByEchotypeFile.required=Import file is mandatory +echobase.error.import.esduByEchotypeAndSpeciesFile.required=Import file is mandatory +echobase.error.import.esduByEchotypeFile.required=Import file is mandatory echobase.error.import.resultLabel.required=ResultLabel is required echobase.error.invalid.sql=Invalid request \: %s echobase.error.login.unknown=Unkwon login Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-27 23:02:51 UTC (rev 420) @@ -83,10 +83,6 @@ echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requête de l'export est obligatoire echobase.error.export.sqlQuery.wrongformat=La requêtes n'est pas valide -echobase.error.import.acousticByEchotypeAndSpeciesCategoryFile.required=La sélection d'un fichier d'import est obligatoire -echobase.error.import.acousticByEchotypeFile.required=La sélection d'un fichier d'import est obligatoire -echobase.error.import.acousticBySpeciesAndAgeCategoryFile.required=La sélection d'un fichier d'import est obligatoire -echobase.error.import.acousticBySpeciesAndSizeCategoryFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -97,6 +93,10 @@ echobase.error.import.digitThreshold.required=digitThreshold non renseigné echobase.error.import.echosounderSoundSpeed.required=echosounderSoundSpeed non renseigné echobase.error.import.echotypeFile.required=La sélection d'un fichier Echotype est obligatoire +echobase.error.import.esduByEchotypeAndSpeciesCategoryFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.esduByEchotypeFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.esduBySpeciesAndAgeCategoryFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.esduBySpeciesAndSizeCategoryFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.gearMetadataFile.required=La sélection d'un fichier GearMetadata est obligatoire echobase.error.import.importMode.required=Le mode d'import est obligatoire echobase.error.import.lengthWeightKeyFile.required=La sélection d'un fichier lengthWeightKey est obligatoire Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2012-03-27 23:02:51 UTC (rev 420) @@ -27,83 +27,85 @@ lables --> <#assign hasFieldErrors = fieldErrors?? && fieldErrors[parameters.name]??/> -<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp"> +<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> + class="wwgrp"> <#if hasFieldErrors> -<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr"> -<#list fieldErrors[parameters.name] as error> - <div<#rt/> - <#if parameters.id??> - errorFor="${parameters.id}"<#rt/> - </#if> - class="errorMessage"> - ${error?html} - </div><#t/> -</#list> -</div><#t/> + <div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> + class="wwerr"> + <#list fieldErrors[parameters.name] as error> + <div<#rt/> + <#if parameters.id??> + errorFor="${parameters.id}"<#rt/> + </#if> + class="errorMessage"> + ${error?html} + </div><#t/> + </#list> + </div><#t/> </#if> <#if parameters.labelposition?default("left") == 'left'> -<span <#rt/> -<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> + <span <#rt/> + <#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> <label<#t/> -<#if parameters.id??> - for="${parameters.id?html}"<#rt/> -</#if> -<#if hasFieldErrors> - class="checkboxErrorLabel"<#rt/> -<#else> - class="label"<#rt/> -</#if> ->${parameters.label?html} + <#if parameters.id??> + for="${parameters.id?html}"<#rt/> + </#if> + <#if hasFieldErrors> + class="checkboxErrorLabel"<#rt/> + <#else> + class="label"<#rt/> + </#if> + >${parameters.label?html} <#if parameters.tooltip??> - <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> + <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> </#if> </label><#rt/> </span> </#if> <#if parameters.labelposition?default("left") == 'top'> -<div <#rt/> + <div <#rt/> <#else> -<span <#rt/> + <span <#rt/> </#if> <#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl"> <#if parameters.required?default(false)> - <span class="required">*</span><#t/> + <span class="required">*</span><#t/> </#if> <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> <#if parameters.labelposition?default("left") != 'left'> -<#if parameters.labelposition?default("left") == 'top'> -</div> <#rt/> -<#else> -</span> <#rt/> + <#if parameters.labelposition?default("left") == 'top'> + </div> <#rt/> + <#else> + </span> <#rt/> + </#if> + <#if parameters.label??> + <#if parameters.labelposition?default("left") == 'top'> + <div <#rt/> + <#else> + <span <#rt/> + </#if> + <#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> + <label<#t/> + <#if parameters.id??> + for="${parameters.id?html}"<#rt/> + </#if> + <#if hasFieldErrors> + class="checkboxErrorLabel"<#rt/> + <#else> + class="checkboxLabel"<#rt/> + </#if> + >${parameters.label?html}</label><#rt/> + </#if> </#if> <#if parameters.label??> -<#if parameters.labelposition?default("left") == 'top'> -<div <#rt/> -<#else> -<span <#rt/> + <#if parameters.labelposition?default("left") == 'top'> + </div> <#rt/> + <#else> + </span> <#rt/> + </#if> </#if> -<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> -<label<#t/> -<#if parameters.id??> - for="${parameters.id?html}"<#rt/> -</#if> -<#if hasFieldErrors> - class="checkboxErrorLabel"<#rt/> -<#else> - class="checkboxLabel"<#rt/> -</#if> ->${parameters.label?html}</label><#rt/> -</#if> -</#if> -<#if parameters.label??> -<#if parameters.labelposition?default("left") == 'top'> -</div> <#rt/> -<#else> -</span> <#rt/> -</#if> -</#if> </div> Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2012-03-27 23:02:51 UTC (rev 420) @@ -26,49 +26,51 @@ This will be done if ActionSupport is used. --> <#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> -<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp"> +<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> + class="wwgrp"> <#if hasFieldErrors> -<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr"> -<#list fieldErrors[parameters.name] as error> - <div<#rt/> - <#if parameters.id??> - errorFor="${parameters.id}"<#rt/> - </#if> - class="errorMessage"> - ${error?html} - </div><#t/> -</#list> -</div><#t/> + <div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> + class="wwerr"> + <#list fieldErrors[parameters.name] as error> + <div<#rt/> + <#if parameters.id??> + errorFor="${parameters.id}"<#rt/> + </#if> + class="errorMessage"> + ${error?html} + </div><#t/> + </#list> + </div><#t/> </#if> <#if parameters.label??> -<#if parameters.labelposition?default("top") == 'top'> -<div <#rt/> -<#else> -<span <#rt/> -</#if> -<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> - <label <#t/> -<#if parameters.id??> - for="${parameters.id?html}" <#t/> -</#if> -<#if hasFieldErrors> - class="errorLabel"<#t/> -<#else> - class="label"<#t/> -</#if> - ><#t/> + <#if parameters.labelposition?default("top") == 'top'> + <div <#rt/> + <#else> + <span <#rt/> + </#if> + <#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> + <label <#t/> + <#if parameters.id??> + for="${parameters.id?html}" <#t/> + </#if> + <#if hasFieldErrors> + class="errorLabel"<#t/> + <#else> + class="label"<#t/> + </#if> + ><#t/> - ${parameters.label?html} ${parameters.labelseparator!":"?html} -<#if parameters.required?default(false)> - <span class="required">*</span><#t/> + ${parameters.label?html} ${parameters.labelseparator!":"?html} + <#if parameters.required?default(false)> + <span class="required">*</span><#t/> + </#if> + <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> + </label><#t/> + <#if parameters.labelposition?default("top") == 'top'> + </div> <#rt/> + <#else> + </span> <#rt/> + </#if> </#if> -<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> - </label><#t/> -<#if parameters.labelposition?default("top") == 'top'> -</div> <#rt/> -<#else> -</span> <#rt/> -</#if> -</#if> Modified: trunk/echobase-ui/src/main/resources/template/simple/myradiomap.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/simple/myradiomap.ftl 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/template/simple/myradiomap.ftl 2012-03-27 23:02:51 UTC (rev 420) @@ -47,53 +47,53 @@ <#if parameters.name??> id="${parameters.name?html}_ul"<#rt/> </#if> -> + > <@s.iterator value="parameters.list"> - <#if parameters.listKey??> - <#assign itemKey = stack.findValue(parameters.listKey)/> - <#else> - <#assign itemKey = stack.findValue('top')/> - </#if> - <#assign itemKeyStr = itemKey.toString() /> - <#if parameters.listValue??> - <#assign itemValue = stack.findString(parameters.listValue)/> - <#else> - <#assign itemValue = stack.findString('top')/> - </#if> -<li> -<input type="radio"<#rt/> -<#if parameters.name??> - name="${parameters.name?html}"<#rt/> -</#if> - id="${parameters.id?html}${itemKeyStr?html}"<#rt/> -<#if tag.contains(parameters.nameValue?default(''), itemKeyStr)> - checked="checked"<#rt/> -</#if> -<#if itemKey??> - value="${itemKeyStr?html}"<#rt/> -</#if> -<#if parameters.disabled?default(false)> - disabled="disabled"<#rt/> -</#if> -<#if parameters.tabindex??> - tabindex="${parameters.tabindex?html}"<#rt/> -</#if> -<#if parameters.cssClass??> - class="${parameters.cssClass?html}"<#rt/> -</#if> -<#if parameters.cssStyle??> - style="${parameters.cssStyle?html}"<#rt/> -</#if> -<#include "/${parameters.templateDir}/simple/css.ftl" /> -<#if parameters.title??> - title="${parameters.title?html}"<#rt/> -</#if> -<#include "/${parameters.templateDir}/simple/scripting-events.ftl" /> -<#include "/${parameters.templateDir}/simple/common-attributes.ftl" /> -/><#rt/> -<label for="${parameters.id?html}${itemKeyStr?html}"><#rt/> + <#if parameters.listKey??> + <#assign itemKey = stack.findValue(parameters.listKey)/> + <#else> + <#assign itemKey = stack.findValue('top')/> + </#if> + <#assign itemKeyStr = itemKey.toString() /> + <#if parameters.listValue??> + <#assign itemValue = stack.findString(parameters.listValue)/> + <#else> + <#assign itemValue = stack.findString('top')/> + </#if> + <li> + <input type="radio"<#rt/> + <#if parameters.name??> + name="${parameters.name?html}"<#rt/> + </#if> + id="${parameters.id?html}${itemKeyStr?html}"<#rt/> + <#if tag.contains(parameters.nameValue?default(''), itemKeyStr)> + checked="checked"<#rt/> + </#if> + <#if itemKey??> + value="${itemKeyStr?html}"<#rt/> + </#if> + <#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> + </#if> + <#if parameters.tabindex??> + tabindex="${parameters.tabindex?html}"<#rt/> + </#if> + <#if parameters.cssClass??> + class="${parameters.cssClass?html}"<#rt/> + </#if> + <#if parameters.cssStyle??> + style="${parameters.cssStyle?html}"<#rt/> + </#if> + <#include "/${parameters.templateDir}/simple/css.ftl" /> + <#if parameters.title??> + title="${parameters.title?html}"<#rt/> + </#if> + <#include "/${parameters.templateDir}/simple/scripting-events.ftl" /> + <#include "/${parameters.templateDir}/simple/common-attributes.ftl" /> + /><#rt/> + <label for="${parameters.id?html}${itemKeyStr?html}"><#rt/> ${itemValue}<#t/> -</label> -</li> + </label> + </li> </(a)s.iterator> </ul> \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/validators.xml =================================================================== --- trunk/echobase-ui/src/main/resources/validators.xml 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/resources/validators.xml 2012-03-27 23:02:51 UTC (rev 420) @@ -27,24 +27,39 @@ "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd"> <validators>  - <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/> - <validator name="long" class="com.opensymphony.xwork2.validator.validators.LongRangeFieldValidator"/> - <validator name="short" class="com.opensymphony.xwork2.validator.validators.ShortRangeFieldValidator"/> - <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/> - <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/> - <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/> - <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/> - <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/> - <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/> - <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/> - <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/> + <validator name="int" + class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/> + <validator name="long" + class="com.opensymphony.xwork2.validator.validators.LongRangeFieldValidator"/> + <validator name="short" + class="com.opensymphony.xwork2.validator.validators.ShortRangeFieldValidator"/> + <validator name="double" + class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/> + <validator name="date" + class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/> + <validator name="expression" + class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/> + <validator name="fieldexpression" + class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/> + <validator name="conversion" + class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/> + <validator name="stringlength" + class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/> + <validator name="required" + class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/> + <validator name="requiredstring" + class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>  - <validator name="nfieldexpression" class="org.nuiton.validator.xwork2.field.NuitonFieldExpressionValidator"/> - <validator name="nrequired" class="org.nuiton.validator.xwork2.field.SkipableRequiredFieldValidator"/> - <validator name="nrequiredstring" class="org.nuiton.validator.xwork2.field.SkipableRequiredStringFieldValidator"/> + <validator name="nfieldexpression" + class="org.nuiton.validator.xwork2.field.NuitonFieldExpressionValidator"/> + <validator name="nrequired" + class="org.nuiton.validator.xwork2.field.SkipableRequiredFieldValidator"/> + <validator name="nrequiredstring" + class="org.nuiton.validator.xwork2.field.SkipableRequiredStringFieldValidator"/>  - <validator name="login" class="fr.ifremer.echobase.ui.validators.LoginValidator"/> + <validator name="login" + class="fr.ifremer.echobase.ui.validators.LoginValidator"/> </validators> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp 2012-03-27 20:35:57 UTC (rev 419) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp 2012-03-27 23:02:51 UTC (rev 420) @@ -24,8 +24,6 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<%--script type="text/javascript" - src="<s:url value='/js/gridHelper.js' />"></script--%> <title> Configuration <s:text name="echobase.common.importDataMode.results"/> </title> @@ -79,7 +77,7 @@ <s:submit action="ConfigureResults-modeVoyage" key='echobase.action.import'/> </s:form> -<s:form id="ACOUSTIC_BY_ECHOTYPE" namespace="/importData" method="POST" +<s:form id="ESDU_BY_ECHOTYPE" namespace="/importData" method="POST" enctype="multipart/form-data" cssClass="hidden importMode"> <fieldset> @@ -87,7 +85,7 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="ACOUSTIC_BY_ECHOTYPE" label=''/> + <s:hidden key="model.importMode" value="ESDU_BY_ECHOTYPE" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -96,17 +94,16 @@ <s:textfield key="model.resultLabel" size="40" required="true" label='%{getText("echobase.common.resultLabel")}'/> - <s:file key="acousticByEchotypeFile" required="true" - label='%{getText("echobase.common.acousticByEchotypeFile")}'/> + <s:file key="esduByEchotypeFile" required="true" + label='%{getText("echobase.common.esduByEchotypeFile")}'/> </fieldset> <br/> - <s:submit action="ConfigureResults-modeAcousticByEchotype" + <s:submit action="ConfigureResults-modeEsduByEchotype" key='echobase.action.import'/> </s:form> -<s:form id="ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY" namespace="/importData" - method="POST" - enctype="multipart/form-data" cssClass="hidden importMode"> +<s:form id="ESDU_BY_ECHOTYPE_AND_SPECIES_CATEGORY" cssClass="hidden importMode" + namespace="/importData" method="POST" enctype="multipart/form-data"> <fieldset> <legend> @@ -114,7 +111,7 @@ </legend> <s:hidden key="model.importMode" - value="ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY" label=''/> + value="ESDU_BY_ECHOTYPE_AND_SPECIES_CATEGORY" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -123,17 +120,16 @@ <s:textfield key="model.resultLabel" size="40" required="true" label='%{getText("echobase.common.resultLabel")}'/> - <s:file key="acousticByEchotypeAndSpeciesCategoryFile" required="true" - label='%{getText("echobase.common.acousticByEchotypeAndSpeciesCategoryFile")}'/> + <s:file key="esduByEchotypeAndSpeciesCategoryFile" required="true" + label='%{getText("echobase.common.esduByEchotypeAndSpeciesCategoryFile")}'/> </fieldset> <br/> - <s:submit action="ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory" + <s:submit action="ConfigureResults-modeEsduByEchotypeAndSpeciesCategory" key='echobase.action.import'/> </s:form> -<s:form id="ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY" namespace="/importData" - method="POST" - enctype="multipart/form-data" cssClass="hidden importMode"> +<s:form id="ESDU_BY_SPECIES_AND_SIZE_CATEGORY" enctype="multipart/form-data" + namespace="/importData" method="POST" cssClass="hidden importMode"> <fieldset> <legend> @@ -141,7 +137,7 @@ </legend> <s:hidden key="model.importMode" - value="ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY" label=''/> + value="ESDU_BY_SPECIES_AND_SIZE_CATEGORY" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -150,17 +146,16 @@ <s:textfield key="model.resultLabel" size="40" required="true" label='%{getText("echobase.common.resultLabel")}'/> - <s:file key="acousticBySpeciesAndSizeCategoryFile" required="true" - label='%{getText("echobase.common.acousticBySpeciesAndSizeCategoryFile")}'/> + <s:file key="esduBySpeciesAndSizeCategoryFile" required="true" + label='%{getText("echobase.common.esduBySpeciesAndSizeCategoryFile")}'/> </fieldset> <br/> - <s:submit action="ConfigureResults-modeAcousticBySpeciesAndSizeCategory" + <s:submit action="ConfigureResults-modeEsduBySpeciesAndSizeCategory" key='echobase.action.import'/> </s:form> -<s:form id="ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY" namespace="/importData" - method="POST" - enctype="multipart/form-data" cssClass="hidden importMode"> +<s:form id="ESDU_BY_SPECIES_AND_AGE_CATEGORY" cssClass="hidden importMode" + namespace="/importData" method="POST" enctype="multipart/form-data"> <fieldset> <legend> @@ -168,7 +163,7 @@ </legend> <s:hidden key="model.importMode" - value="ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY" label=''/> + value="ESDU_BY_SPECIES_AND_AGE_CATEGORY" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -177,11 +172,11 @@ <s:textfield key="model.resultLabel" size="40" required="true" label='%{getText("echobase.common.resultLabel")}'/> - <s:file key="acousticBySpeciesAndAgeCategoryFile" required="true" - label='%{getText("echobase.common.acousticBySpeciesAndAgeCategoryFile")}'/> + <s:file key="esduBySpeciesAndAgeCategoryFile" required="true" + label='%{getText("echobase.common.esduBySpeciesAndAgeCategoryFile")}'/> </fieldset> <br/> - <s:submit action="ConfigureResults-modeAcousticBySpeciesAndAgeCategory" + <s:submit action="ConfigureResults-modeEsduBySpeciesAndAgeCategory" key='echobase.action.import'/> </s:form>

1 0

r419 - in trunk/echobase-ui/src/main: resources/fr/ifremer/echobase/ui/actions/importData resources/i18n webapp/WEB-INF/jsp/importData
by tchemit＠users.forge.codelutin.com March 27, 2012

March 27, 2012

Author: tchemit Date: 2012-03-27 22:35:57 +0200 (Tue, 27 Mar 2012) New Revision: 419 Url: http://forge.codelutin.com/repositories/revision/echobase/419 Log: Validation des imports + fix r?\195?\169sultats import Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData-ConfigureCommonData-modeAll-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeRegion-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeVoyage-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -51,19 +51,22 @@ <field name="model.transceiverAcquisitionAbsorptionDescription"> <field-validator type="nrequiredstring"> - <message key="echobase.error.import.transceiverAcquisitionAbsorptionDescription.required"/> + <message + key="echobase.error.import.transceiverAcquisitionAbsorptionDescription.required"/> </field-validator> </field> <field name="model.acquisitionSoftwareVersionER60"> <field-validator type="nrequiredstring"> - <message key="echobase.error.import.acquisitionSoftwareVersionER60.required"/> + <message + key="echobase.error.import.acquisitionSoftwareVersionER60.required"/> </field-validator> </field> <field name="model.acquisitionSoftwareVersionME70"> <field-validator type="nrequiredstring"> - <message key="echobase.error.import.acquisitionSoftwareVersionME70.required"/> + <message + key="echobase.error.import.acquisitionSoftwareVersionME70.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData-ConfigureCommonData-modeAll-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData-ConfigureCommonData-modeAll-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData-ConfigureCommonData-modeAll-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -63,7 +63,8 @@ <field name="model.transectGeospatialVerticalPositive"> <field-validator type="nrequiredstring"> - <message key="echobase.error.import.transectGeospatialVerticalPositive.required"/> + <message + key="echobase.error.import.transectGeospatialVerticalPositive.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -31,7 +31,7 @@ </field-validator> </field> - <field name="resultLabel"> + <field name="model.resultLabel"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.resultLabel.required"/> </field-validator> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpeciesCategory-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -31,7 +31,7 @@ </field-validator> </field> - <field name="resultLabel"> + <field name="model.resultLabel"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.resultLabel.required"/> </field-validator> @@ -39,8 +39,11 @@ <field name="acousticByEchotypeAndSpeciesCategoryFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.acousticByEchotypeAndSpeciesCategoryFile.file!=null</param> - <message key="echobase.error.import.acousticByEchotypeAndSpeciesCategoryFile.required"/> + <param name="expression"> + model.acousticByEchotypeAndSpeciesCategoryFile.file!=null + </param> + <message + key="echobase.error.import.acousticByEchotypeAndSpeciesCategoryFile.required"/> </field-validator> </field> Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -0,0 +1,50 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="acousticBySpeciesAndAgeCategoryFile"> + <field-validator type="nfieldexpression"> + <param name="expression"> + model.acousticBySpeciesAndAgeCategoryFile.file!=null + </param> + <message + key="echobase.error.import.acousticBySpeciesAndAgeCategoryFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndAgeCategory-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -0,0 +1,50 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="model.resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="acousticBySpeciesAndSizeCategoryFile"> + <field-validator type="nfieldexpression"> + <param name="expression"> + model.acousticBySpeciesAndSizeCategoryFile.file!=null + </param> + <message + key="echobase.error.import.acousticBySpeciesAndSizeCategoryFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticBySpeciesAndSizeCategory-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -31,7 +31,7 @@ </field-validator> </field> - <field name="resultLabel"> + <field name="model.resultLabel"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.resultLabel.required"/> </field-validator> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeRegion-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeRegion-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeRegion-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -31,7 +31,7 @@ </field-validator> </field> - <field name="resultLabel"> + <field name="model.resultLabel"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.resultLabel.required"/> </field-validator> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeVoyage-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeVoyage-validation.xml 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeVoyage-validation.xml 2012-03-27 20:35:57 UTC (rev 419) @@ -34,7 +34,8 @@ <field name="lengthAgeKeyFile"> <field-validator type="nfieldexpression"> <param name="expression">model.lengthAgeKeyFile.file!=null || - model.lengthWeightKeyFile.file!=null || model.echotypeFile.file!=null </param> + model.lengthWeightKeyFile.file!=null || model.echotypeFile.file!=null + </param> <message key="echobase.error.import.resultImportFile.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-27 20:35:57 UTC (rev 419) @@ -85,6 +85,8 @@ echobase.error.export.sqlQuery.wrongformat=La requêtes n'est pas valide echobase.error.import.acousticByEchotypeAndSpeciesCategoryFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.acousticByEchotypeFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.acousticBySpeciesAndAgeCategoryFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.acousticBySpeciesAndSizeCategoryFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -100,7 +102,7 @@ echobase.error.import.lengthWeightKeyFile.required=La sélection d'un fichier lengthWeightKey est obligatoire echobase.error.import.loggedDataDatatype.required=loggedDataDatatype non renseigné echobase.error.import.loggedDataFormat.required=loggedDataFormat non renseigné -echobase.error.import.mapResultFile.required=La sélection d'un fichier de résultat de Carte est obligatoire +echobase.error.import.mapResultFile.required=La sélection d'un fichier de résultats de Carte est obligatoire echobase.error.import.mapsFile.required=La sélection d'un fichier Carte est obligatoire echobase.error.import.mission.required=La sélection d'une mission est obligatoire echobase.error.import.missionAbstract.required=Le résumé de la mission est obligatoire @@ -113,9 +115,9 @@ echobase.error.import.processingDescription.required=processingDescription non renseigné echobase.error.import.processingTemplate.required=processingTemplate non renseigné echobase.error.import.regionAssociationFile.required=La sélection d'un fichier d'association de Région est obligatoire -echobase.error.import.regionResultFile.required=La sélection d'un fichier de résultat de Région est obligatoire +echobase.error.import.regionResultFile.required=La sélection d'un fichier de résultats de Région est obligatoire echobase.error.import.regionsFile.required=La sélection d'un fichier Region est obligatoire -echobase.error.import.resultImportFile.required=Veuillez donner au moins un fichier à importer +echobase.error.import.resultImportFile.required=Veuillez sélectionner au moins un fichier à importer echobase.error.import.resultLabel.required=Le champs ResultLabel est obligatoire echobase.error.import.soundSpeedCalculationsER60.required=soundSpeedCalculationsER60 non renseigné echobase.error.import.soundSpeedCalculationsME70.required=soundSpeedCalculationsME70 non renseigné Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp 2012-03-27 20:09:43 UTC (rev 418) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp 2012-03-27 20:35:57 UTC (rev 419) @@ -87,7 +87,7 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="ACOUSTIC" label=''/> + <s:hidden key="model.importMode" value="ACOUSTIC_BY_ECHOTYPE" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -113,7 +113,8 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="ACOUSTIC" label=''/> + <s:hidden key="model.importMode" + value="ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -139,7 +140,8 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="ACOUSTIC" label=''/> + <s:hidden key="model.importMode" + value="ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -165,7 +167,8 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="ACOUSTIC" label=''/> + <s:hidden key="model.importMode" + value="ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}'

1 0

r418 - trunk/echobase-services/src/test/resources/import-data/result
by tchemit＠users.forge.codelutin.com March 27, 2012

March 27, 2012

Author: tchemit Date: 2012-03-27 22:09:43 +0200 (Tue, 27 Mar 2012) New Revision: 418 Url: http://forge.codelutin.com/repositories/revision/echobase/418 Log: add regions data for test Added: trunk/echobase-services/src/test/resources/import-data/result/regions.csv.gz Added: trunk/echobase-services/src/test/resources/import-data/result/regions.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/regions.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r417 - in trunk/echobase-services/src: main/java/fr/ifremer/echobase/services/csv main/java/fr/ifremer/echobase/services/importdata test/java/fr/ifremer/echobase/services/importdata test/resources/import-data test/resources/import-data/acousticData test/resources/import-data/catchesData test/resources/import-data/commonData test/resources/import-data/operation test/resources/import-data/result
by tchemit＠users.forge.codelutin.com March 27, 2012

March 27, 2012

Author: tchemit Date: 2012-03-27 22:08:13 +0200 (Tue, 27 Mar 2012) New Revision: 417 Url: http://forge.codelutin.com/repositories/revision/echobase/417 Log: svn properties import of region cells Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java trunk/echobase-services/src/test/resources/import-data/acousticData/movies.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv.gz trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv.gz trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv.gz trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotypeAndSpeciesCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndAgeCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndSizeCategory.csv.gz trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModel.java 2012-03-27 20:08:13 UTC (rev 417) @@ -24,23 +24,44 @@ package fr.ifremer.echobase.services.csv; import fr.ifremer.echobase.csv.AbstractImportModel; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.CellImpl; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DepthStratum; +import java.util.Map; + /** * Model to import cells (with type "region"). * * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ -public class RegionCellImportModel extends AbstractImportModel<Cell> { +public class RegionCellImportModel extends AbstractImportModel<RegionCellImportModelRow> { - public RegionCellImportModel(char separator) { + protected final CellType cellType; + + public RegionCellImportModel(char separator, + CellType cellType, + Map<String, Voyage> voyageMap, + Map<String, DepthStratum> depthStramMap) { super(separator); + this.cellType = cellType; + + newForeignKeyColumn(RegionCellImportModelRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + newForeignKeyColumn(RegionCellImportModelRow.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStramMap); + + newMandatoryColumn(RegionCellImportModelRow.PROPERTY_NAME); + newMandatoryColumn("x", RegionCellImportModelRow.PROPERTY_DATA_X, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("y", RegionCellImportModelRow.PROPERTY_DATA_Y, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("z", RegionCellImportModelRow.PROPERTY_DATA_Z, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn("surface", RegionCellImportModelRow.PROPERTY_DATA_SURFACE, EchobaseCsvUtil.PRIMITIVE_FLOAT); } @Override - public Cell newEmptyInstance() { - return new CellImpl(); + public RegionCellImportModelRow newEmptyInstance() { + RegionCellImportModelRow row = new RegionCellImportModelRow(); + row.getCell().setCellType(cellType); + return row; } } Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java 2012-03-27 20:08:13 UTC (rev 417) @@ -0,0 +1,126 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.csv; + +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.CellImpl; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DepthStratum; + +/** + * A row when import region cells using model {@link RegionCellImportModel}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class RegionCellImportModelRow { + + public static final String PROPERTY_NAME = "name"; + + public static final String PROPERTY_VOYAGE = "voyage"; + + public static final String PROPERTY_DEPTH_STRATUM = "depthStratum"; + + public static final String PROPERTY_DATA_X = "dataX"; + + public static final String PROPERTY_DATA_Y = "dataY"; + + public static final String PROPERTY_DATA_Z = "dataZ"; + + public static final String PROPERTY_DATA_SURFACE = "dataSurface"; + + protected Voyage voyage; + + protected DepthStratum depthStratum; + + protected final Cell cell; + + protected float dataX; + + protected float dataY; + + protected float dataZ; + + protected float dataSurface; + + public RegionCellImportModelRow() { + this.cell = new CellImpl(); + } + + public Cell getCell() { + return cell; + } + + public Voyage getVoyage() { + return voyage; + } + + public DepthStratum getDepthStratum() { + return depthStratum; + } + + public float getDataX() { + return dataX; + } + + public float getDataY() { + return dataY; + } + + public float getDataZ() { + return dataZ; + } + + public float getDataSurface() { + return dataSurface; + } + + public void setName(String name) { + getCell().setName(name); + } + + public void setVoyage(Voyage voyage) { + this.voyage = voyage; + } + + public void setDepthStratum(DepthStratum depthStratum) { + this.depthStratum = depthStratum; + } + + public void setDataX(float dataX) { + this.dataX = dataX; + } + + public void setDataY(float dataY) { + this.dataY = dataY; + } + + public void setDataZ(float dataZ) { + this.dataZ = dataZ; + } + + public void setDataSurface(float dataSurface) { + this.dataSurface = dataSurface; + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellImportModelRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-03-27 20:08:13 UTC (rev 417) @@ -79,7 +79,8 @@ } catch (ImportException e) { throw e; } catch (Exception e) { - throw new ImportException("Could not do import " + e.getMessage(), e); + throw new ImportException( + "Could not do import " + e.getMessage(), e); } } @@ -109,10 +110,14 @@ int numberCreated = importResult.getNumberCreated(entityType); int numberUpdated = importResult.getNumberUpdated(entityType); if (numberCreated > 0) { - description.append(" [ nombre de création : ").append(numberCreated).append("]"); + description.append(" [ nombre de création : "); + description.append(numberCreated); + description.append("]"); } if (numberUpdated > 0) { - description.append(" [ nombre de mises à jour : ").append(numberUpdated).append("]"); + description.append(" [ nombre de mises à jour : "); + description.append(numberUpdated); + description.append("]"); } create(dao, @@ -162,7 +167,8 @@ E result = dao.newInstance(); return result; } catch (TopiaException e) { - throw new EchoBaseTechnicalException("Could not create new instance of entity", e); + throw new EchoBaseTechnicalException( + "Could not create new instance of entity", e); } } Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-27 20:08:13 UTC (rev 417) @@ -23,7 +23,10 @@ */ package fr.ifremer.echobase.services.importdata; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.csv.CsvFileImportResult; import fr.ifremer.echobase.csv.EchoBaseImport; @@ -31,19 +34,28 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Data; +import fr.ifremer.echobase.entities.data.DataDAO; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.DepthStratum; import fr.ifremer.echobase.services.ImportException; import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; import fr.ifremer.echobase.services.csv.MapImportModel; import fr.ifremer.echobase.services.csv.MapImportModelRow; import fr.ifremer.echobase.services.csv.MapResultImportModel; import fr.ifremer.echobase.services.csv.MapResultImportModelRow; +import fr.ifremer.echobase.services.csv.RegionCellImportModel; +import fr.ifremer.echobase.services.csv.RegionCellImportModelRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.ImportRuntimeException; import java.io.Reader; +import java.util.Arrays; import java.util.List; +import java.util.Map; import static org.nuiton.i18n.I18n.l_; @@ -73,18 +85,26 @@ // get selected voyage Voyage voyage = getEntityById(Voyage.class, configuration.getVoyageId()); - InputFile inputFile = configuration.getMapsFile(); + InputFile inputFile = configuration.getRegionsFile(); + CsvFileImportResult importResult = importRegionFile( + configuration, + inputFile, voyage); + + addResultAndLog(result, inputFile, + importResult, user); + + inputFile = configuration.getRegionAssociationFile(); if (inputFile.hasFile()) { - CsvFileImportResult importResult = importMapFile( + importResult = importRegionAssociationFile( configuration, - inputFile, voyage); + inputFile, + voyage); + addResultAndLog(result, inputFile, importResult, user); + } - addResultAndLog(result, inputFile, - importResult, user); - } - inputFile = configuration.getMapResultFile(); + inputFile = configuration.getRegionResultFile(); if (inputFile.hasFile()) { - CsvFileImportResult importResult = importMapResultFile( + importResult = importRegionResultFile( configuration, inputFile, voyage); @@ -94,9 +114,149 @@ return result; } - protected CsvFileImportResult importMapFile(ResultsImportConfiguration configuration, - InputFile inputFile, - Voyage voyage) throws ImportException { + protected CsvFileImportResult importRegionFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { + + + CellType cellType = getEntityByProperty( + CellType.class, CellType.PROPERTY_ID, "Region"); + Preconditions.checkNotNull(cellType); + + DataMetadata dataXMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "LongitudeEnd"); + Preconditions.checkNotNull(dataXMeta); + + DataMetadata dataYMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "LatitudeEnd"); + Preconditions.checkNotNull(dataYMeta); + + DataMetadata dataDepthSurfaceMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefSurfaceEnd"); + Preconditions.checkNotNull(dataDepthSurfaceMeta); + + DataMetadata dataDepthBottomMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefBottomEnd"); + Preconditions.checkNotNull(dataDepthBottomMeta); + + DataMetadata dataSurfaceMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "Surface"); + Preconditions.checkNotNull(dataSurfaceMeta); + + // authorize only the selected voyage to be imported + Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( + voyage), EchoBaseFunctions.VOYAGE_NAME); + + Map<String, DepthStratum> depthStratumMap = getEntitiesMap( + DepthStratum.class, + EchoBaseFunctions.DEPTH_STRATUM_ID); + + RegionCellImportModel csvModel = new RegionCellImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + cellType, + voyageMap, + depthStratumMap + ); + + if (log.isInfoEnabled()) { + log.info("Starts import of Region cells from file " + + inputFile.getFileName()); + } + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + CellDAO dao = getDAO(Cell.class, CellDAO.class); + DataDAO dataDao = getDAO(Data.class, DataDAO.class); + + Reader reader = getInputFileReader(inputFile); + try { + EchoBaseImport<RegionCellImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + int rowNumber = 0; + + configuration.incrementsProgression(); + for (RegionCellImportModelRow row : importer) { + + rowNumber++; + configuration.incrementsProgression(); + + Cell cell = create(dao, row.getCell()); + + voyage.addPostCell(cell); + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Cell); + + createCellData(dataDao, + cell, + dataXMeta, + String.valueOf(row.getDataX()), + importResult + ); + + createCellData(dataDao, + cell, + dataYMeta, + String.valueOf(row.getDataY()), + importResult + ); + + String depthStratumId = row.getDepthStratum().getId(); + + DataMetadata depth = null; + + if ("SURF".equals(depthStratumId)) { + + depth = dataDepthSurfaceMeta; + } else if ("CLAS".equals(depthStratumId)) { + depth = dataDepthBottomMeta; + + } else { + throw new ImportException( + "[Line " + rowNumber + + "] Depth stratum should be 'SURF' or 'CLAS', " + + "but was " + depthStratumId); + } + + createCellData(dataDao, + cell, + depth, + String.valueOf(row.getDataZ()), + importResult + ); + + createCellData(dataDao, + cell, + dataSurfaceMeta, + String.valueOf(row.getDataSurface()), + importResult + ); + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + private void createCellData(DataDAO dao, + Cell cell, + DataMetadata dataMetaData, + String dataValue, + CsvFileImportResult importResult) { + + Data data = create(dao); + data.setDataMetadata(dataMetaData); + data.setDataValue(dataValue); + cell.addData(data); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Data); + } + + protected CsvFileImportResult importRegionAssociationFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { MapImportModel csvModel = new MapImportModel( serviceContext.getConfiguration().getCsvSeparator()); @@ -132,9 +292,9 @@ } } - protected CsvFileImportResult importMapResultFile(ResultsImportConfiguration configuration, - InputFile inputFile, - Voyage voyage) throws ImportException { + protected CsvFileImportResult importRegionResultFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { MapResultImportModel csvModel = new MapResultImportModel( serviceContext.getConfiguration().getCsvSeparator()); Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-27 20:08:13 UTC (rev 417) @@ -138,6 +138,10 @@ public static final int NB_ESDU_RESULT_BY_SPECIES_AND_AGE_CATEGORY = 10021; + public static final int NB_REGION_CELLS = 228; + + public static final int NB_REGION_DATAS = NB_REGION_CELLS * 4; + public void assertImportCommonData() throws TopiaException { assertNbEntities(Voyage.class, NB_VOYAGE); assertNbEntities(Transit.class, NB_TRANSIT); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 20:08:13 UTC (rev 417) @@ -1,3 +1,26 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 20:08:13 UTC (rev 417) @@ -1,11 +1,35 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; import fr.ifremer.echobase.services.configurations.ResultsImportMode; -import org.junit.Ignore; import org.junit.Test; import java.util.List; @@ -27,7 +51,6 @@ return new String[]{"/import-data", "result", filename}; } - @Ignore @Test public void doImportRegion() throws Exception { @@ -49,15 +72,17 @@ prepareInputFile(conf.getRegionsFile(), getImportPath("regions.csv.gz")); - prepareInputFile(conf.getRegionAssociationFile(), - getImportPath("regionAssociations.csv.gz")); - prepareInputFile(conf.getRegionsFile(), - getImportPath("regionResults.csv.gz")); + //TODO Use this +// prepareInputFile(conf.getRegionAssociationFile(), +// getImportPath("regionAssociations.csv.gz")); +// prepareInputFile(conf.getRegionsFile(), +// getImportPath("regionResults.csv.gz")); List<CsvFileImportResult> result = doImport( conf, ResultsRegionCellImportService.class, 1); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); + assertCsvImportResult(result.get(0), Cell.class, NB_REGION_CELLS); + assertCsvImportResult(result.get(0), Data.class, NB_REGION_DATAS); } } \ No newline at end of file Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 20:08:13 UTC (rev 417) @@ -1,3 +1,26 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-services/src/test/resources/import-data/acousticData/movies.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotype.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/acousticResultByEchotypeAndSpeciesCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndAgeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/acousticResultBySpeciesAndSizeCategory.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r416 - in trunk/echobase-services: . src/main/java/fr/ifremer/echobase src/main/java/fr/ifremer/echobase/services/configurations src/main/java/fr/ifremer/echobase/services/importdata src/main/resources/i18n src/test/java/fr/ifremer/echobase/services src/test/java/fr/ifremer/echobase/services/importdata src/test/resources/import-data/catchesData src/test/resources/import-data/commonData src/test/resources/import-data/operation src/test/resources/import-data/result
by tchemit＠users.forge.codelutin.com March 27, 2012

March 27, 2012

Author: tchemit Date: 2012-03-27 19:39:50 +0200 (Tue, 27 Mar 2012) New Revision: 416 Url: http://forge.codelutin.com/repositories/revision/echobase/416 Log: - use gz for all test datas - add progression in imports (counting all number of lines to import) - split ResultsImportService (too much imports in same service :() Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv.gz trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv.gz trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv.gz trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv.gz trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv.gz trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz Removed: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsImportServiceIT.java trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv trunk/echobase-services/src/test/resources/import-data/operation/operation.csv trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv trunk/echobase-services/src/test/resources/import-data/result/echotype.csv trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv trunk/echobase-services/src/test/resources/import-data/result/missingEsdu.txt Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseIOUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java trunk/echobase-services/update-import-data-db.sh Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseIOUtil.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseIOUtil.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/EchoBaseIOUtil.java 2012-03-27 17:39:50 UTC (rev 416) @@ -25,6 +25,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.nuiton.util.ZipUtil; import java.io.BufferedReader; @@ -33,6 +34,8 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.InputStreamReader; +import java.io.LineNumberReader; import java.util.Collection; /** @@ -43,7 +46,6 @@ */ public class EchoBaseIOUtil { - public static void compressZipFile(File zipFile, File directory) throws IOException { compressZipFile(zipFile, directory, true); } @@ -63,19 +65,17 @@ public static void copyFile(File destinationFile, Collection<File> filesToMerge) throws IOException { - if (CollectionUtils.isEmpty(filesToMerge)) { + if (!CollectionUtils.isEmpty(filesToMerge)) { - // nothing to copy - return; - } - if (filesToMerge.size() == 1) { + if (filesToMerge.size() == 1) { - // simple copy - FileUtils.copyFile(filesToMerge.iterator().next(), destinationFile); - } else { + // simple copy + FileUtils.copyFile(filesToMerge.iterator().next(), destinationFile); + } else { - // must merge all files - mergeFiles(destinationFile, filesToMerge); + // must merge all files + mergeFiles(destinationFile, filesToMerge); + } } } @@ -111,6 +111,30 @@ } } + public static int countLines(File file) { + int result = 0; + + LineNumberReader reader = null; + try { + reader = new LineNumberReader( + new InputStreamReader(FileUtils.openInputStream(file)) + ); + while (reader.readLine() != null) { + } + result = reader.getLineNumber(); + reader.close(); + + } catch (IOException e) { + throw new EchoBaseTechnicalException( + "Could not count lines of file " + file, e); + } finally { + if (reader != null) { + IOUtils.closeQuietly(reader); + } + } + return result; + } + protected EchoBaseIOUtil() { } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractImportConfiguration.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractImportConfiguration.java 2012-03-27 17:39:50 UTC (rev 416) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services.configurations; +import fr.ifremer.echobase.EchoBaseIOUtil; import fr.ifremer.echobase.InputFile; import java.io.File; @@ -48,4 +49,18 @@ } public abstract InputFile[] getInputFiles(); + + public long computeNbSteps() { + long result = 0; + for (InputFile inputFile : getInputFiles()) { + + if (inputFile.hasFile()) { + int currentLines = EchoBaseIOUtil.countLines( + inputFile.getFile()); + result += currentLines; + } + } + setNbSteps(result); + return result; + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportMode.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ResultsImportMode.java 2012-03-27 17:39:50 UTC (rev 416) @@ -54,7 +54,7 @@ ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY(n_("echobase.common.resultsImportMode.acoustic.bySpeciesAndSizeCategory")), /** Import acoustic results by species and age category. */ - ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY(n_("echobase.common.resultsImportMode.acoustic.bySpeciesAndSizeCategory")); + ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY(n_("echobase.common.resultsImportMode.acoustic.bySpeciesAndAgeCategory")); private final String i18nKey; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticDataImportService.java 2012-03-27 17:39:50 UTC (rev 416) @@ -110,11 +110,11 @@ InputFile inputFile = configuration.getMoviesFile(); - CsvFileImportResult importResult = importMoviesFile(voyage, + CsvFileImportResult importResult = importMoviesFile(configuration, + voyage, vessel, esduCellType, elementaryCellType, - configuration, inputFile); addResultAndLog(result, inputFile, importResult, user); @@ -140,7 +140,7 @@ if (instrument.equals(acquisition.getAcousticInstrument())) { - // found a matching data acquisiotn from his acoustic instrument + // found a matching dataAcquisition from his acoustic instrument result = acquisition; break; } @@ -149,11 +149,11 @@ return result; } - private CsvFileImportResult importMoviesFile(Voyage voyage, + private CsvFileImportResult importMoviesFile(AcousticDataImportConfiguration configuration, + Voyage voyage, Vessel vessel, CellType esduCellType, CellType elementaryCellType, - AcousticDataImportConfiguration configuration, InputFile inputFile ) throws ImportException { @@ -195,10 +195,18 @@ Cell elementaryCell; int rowNumber = 0; + + configuration.incrementsProgression(); for (AcousticDataImportModelRow row : importer) { + configuration.incrementsProgression(); rowNumber++; + if (rowNumber % 100 == 0) { + if (log.isInfoEnabled()) { + log.info("Doing line " + rowNumber); + } + } if (dataProcessingId == null) { // compute once for all the common dataprocessing id used @@ -289,7 +297,10 @@ importResult.incrementsNumberCreated(EchoBaseEntityEnum.DataAcquisition); if (log.isDebugEnabled()) { - log.debug("[row " + rowNumber + "] New dataAquisition to use (number: " + importResult.getNumberCreated(EchoBaseEntityEnum.DataAcquisition) + ")"); + log.debug("[row " + rowNumber + + "] New dataAquisition to use (number: " + + importResult.getNumberCreated( + EchoBaseEntityEnum.DataAcquisition) + ")"); } // create data processing @@ -303,10 +314,13 @@ ); if (log.isDebugEnabled()) { - log.debug("[row " + rowNumber + "] New dataProcessing to use (" + dataProcessing.getId() + ")"); + log.debug("[row " + rowNumber + + "] New dataProcessing to use (" + + dataProcessing.getId() + ")"); } - importResult.incrementsNumberCreated(EchoBaseEntityEnum.DataProcessing); + importResult.incrementsNumberCreated( + EchoBaseEntityEnum.DataProcessing); // add it to data acquisition dataAcquisition.addDataProcessing(dataProcessing); @@ -329,8 +343,10 @@ if (cellType == 4) { if (log.isDebugEnabled()) { - log.debug("[row " + rowNumber + "] Esdu cell (" + esduCellId + ")"); + log.debug("[row " + rowNumber + "] Esdu cell (" + + esduCellId + ")"); } + // this is a esdu cell row // create esdu cell @@ -368,7 +384,8 @@ String elementaryCellId = cellNum + (surface ? "S" : "B"); if (log.isDebugEnabled()) { - log.debug("[row " + rowNumber + "] elementary cell (" + elementaryCellId + ")"); + log.debug("[row " + rowNumber + "] elementary cell (" + + elementaryCellId + ")"); } // create the elementary cell @@ -410,19 +427,6 @@ String dataValue; - /* - "Latitude", OK - "Longitude", OK - "depth", OK - "timeStart" OK - "timeEnd", OK - "NASC", OK - Volume, OK - Surface», OK - NumberOfSamplesRecorded OK - NumberOfSamplesEchoIntegrated OK - - */ // create Latitude data dataValue = String.valueOf(row.getCellLatitude()); createCellData(dao, cell, dataMetadatas, "Latitude" + suffix, @@ -440,7 +444,6 @@ // create Time Start data dataValue = cellDateFormat.format(row.getCellDateStart()); -// createCellData(dao, cell, dataMetadatas, "Time" + suffix, createCellData(dao, cell, dataMetadatas, "TimeStart", dataValue, importResult); @@ -489,19 +492,6 @@ DataDAO dao, CsvFileImportResult importResult) { - /* -Latitude OK -Longitude OK -depthStart (surface ou bottom) OK -depthEnd (surface ou bottom) OK -timeStart OK -timeEnd OK -NASC OK -Volume OK -Surface OK -NumberOfSamplesRecorded OK -NumberOfSamplesEchoIntegrated OK - */ String dataValue; String startMeta; String endMeta; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportService.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesDataImportService.java 2012-03-27 17:39:50 UTC (rev 416) @@ -113,6 +113,7 @@ if (configuration.getTotalSampleFile().hasFile()) { CsvFileImportResult totalSampleResult = importTotalSampleFile( + configuration, configuration.getTotalSampleFile(), operationMap, speciesMap, @@ -124,6 +125,7 @@ if (configuration.getSubSampleFile().hasFile()) { CsvFileImportResult subSampleResult = importSubSampleFile( + configuration, configuration.getSubSampleFile(), operationMap, speciesMap, @@ -136,6 +138,7 @@ if (configuration.getBiometrySampleFile().hasFile()) { CsvFileImportResult biometrySampleResult = importBiometrySampleFile( + configuration, configuration.getBiometrySampleFile(), operationMap, speciesMap); @@ -147,7 +150,8 @@ return result; } - private CsvFileImportResult importTotalSampleFile(InputFile inputFile, + private CsvFileImportResult importTotalSampleFile(CatchesDataImportConfiguration configuration, + InputFile inputFile, Map<String, Operation> operationMap, Map<String, Species> speciesMap, Map<String, SizeCategory> sizeCategoryMap) throws ImportException { @@ -192,8 +196,10 @@ Import<TotalSampleImportModelRow> importer = EchoBaseImport.newImport(csvModel, reader); + configuration.incrementsProgression(); for (TotalSampleImportModelRow row : importer) { + configuration.incrementsProgression(); Operation operation = row.getOperation(); Species species = row.getSpecies(); @@ -306,7 +312,8 @@ } } - private CsvFileImportResult importSubSampleFile(InputFile inputFile, + private CsvFileImportResult importSubSampleFile(CatchesDataImportConfiguration configuration, + InputFile inputFile, Map<String, Operation> operationMap, Map<String, Species> speciesMap, Map<String, SizeCategory> sizeCategoryMap @@ -350,8 +357,10 @@ Import<SubSampleImportModelRow> importer = EchoBaseImport.newImport(csvModel, reader); + configuration.incrementsProgression(); for (SubSampleImportModelRow row : importer) { + configuration.incrementsProgression(); Operation operation = row.getOperation(); Species species = row.getSpecies(); @@ -413,7 +422,8 @@ } } - private CsvFileImportResult importBiometrySampleFile(InputFile inputFile, + private CsvFileImportResult importBiometrySampleFile(CatchesDataImportConfiguration configuration, + InputFile inputFile, Map<String, Operation> operationMap, Map<String, Species> speciesMap ) throws ImportException { @@ -451,8 +461,10 @@ Import<BiometrySampleImportModelRow> importer = EchoBaseImport.newImport(csvModel, reader); + configuration.incrementsProgression(); for (BiometrySampleImportModelRow row : importer) { + configuration.incrementsProgression(); Operation operation = row.getOperation(); Species species = row.getSpecies(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java 2012-03-27 17:39:50 UTC (rev 416) @@ -169,13 +169,17 @@ ImportModel<Voyage> csvModel = new VoyageImportModel(getCsvSeparator()); - Reader reader = getInputFileReader(inputFile); - Import<Voyage> importer = EchoBaseImport.newImport(csvModel, reader); Voyage newVoyage = null; Locale locale = getLocale(); + Reader reader = getInputFileReader(inputFile); try { + Import<Voyage> importer = EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); for (Voyage voyage : importer) { + configuration.incrementsProgression(); + voyage.setMission(mission); voyage.setAreaOfOperation(areaOfOperation); voyage.setDescription(voyageDescription); @@ -236,8 +240,11 @@ try { Import<TransitImportModelRow> importer = EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); for (TransitImportModelRow row : importer) { + configuration.incrementsProgression(); Transit transit = row.getTransit(); transit.setRelatedActivity(relatedActivity); @@ -289,8 +296,11 @@ try { Import<TransectImportModelRow> importer = EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); for (TransectImportModelRow row : importer) { + configuration.incrementsProgression(); Transect transect = row.getTransect(); Date timeCoverageStart = transect.getTimeCoverageStart(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-03-27 17:39:50 UTC (rev 416) @@ -104,6 +104,7 @@ InputFile operationFile = configuration.getOperationFile(); CsvFileImportResult nbOperations = importOperationFile( + configuration, operationFile, voyage, vesselMap, @@ -118,12 +119,14 @@ InputFile operationMetadataFile = configuration.getOperationMetadataFile(); CsvFileImportResult nbOperationMetas = importOperationMetadataFile( + configuration, operationMetadataFile, vesselMap, operationMap); InputFile gearMetadataFile = configuration.getGearMetadataFile(); CsvFileImportResult nbGearMetas = importGearMetadataFile( + configuration, gearMetadataFile, vesselMap, gearMap, @@ -139,6 +142,7 @@ } protected CsvFileImportResult importOperationFile( + OperationImportConfiguration configuration, InputFile inputFile, Voyage voyage, Map<String, Vessel> vesselMap, @@ -168,8 +172,10 @@ Import<OperationImportModelRow> importer = EchoBaseImport.newImport(csvModel, reader); + configuration.incrementsProgression(); for (OperationImportModelRow row : importer) { + configuration.incrementsProgression(); Vessel vessel = row.getVessel(); Operation operation = row.getOperation(); @@ -197,6 +203,7 @@ } protected CsvFileImportResult importOperationMetadataFile( + OperationImportConfiguration configuration, InputFile inputFile, Map<String, Vessel> vesselMap, Map<String, Operation> operationMap) throws ImportException { @@ -228,8 +235,10 @@ Import<OperationMetadataValueImportModelRow> importer = EchoBaseImport.newImport(csvModel, reader); + configuration.incrementsProgression(); for (OperationMetadataValueImportModelRow row : importer) { + configuration.incrementsProgression(); Operation operation = row.getOperation(); OperationMetadataValue operationMetadataValueToCreate = @@ -249,6 +258,7 @@ } protected CsvFileImportResult importGearMetadataFile( + OperationImportConfiguration configuration, InputFile inputFile, Map<String, Vessel> vesselMap, Map<String, Gear> gearMap, @@ -281,8 +291,10 @@ Import<GearMetadataValueImportModelRow> importer = EchoBaseImport.newImport(csvModel, reader); + configuration.incrementsProgression(); for (GearMetadataValueImportModelRow row : importer) { + configuration.incrementsProgression(); Operation operation = row.getOperation(); GearMetadataValue gearMetadataValuetoCreate = Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-03-27 17:39:50 UTC (rev 416) @@ -0,0 +1,690 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.csv.EchoBaseImport; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.data.Category; +import fr.ifremer.echobase.entities.data.CategoryDAO; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.AgeCategory; +import fr.ifremer.echobase.entities.references.AgeCategoryDAO; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.SizeCategoryDAO; +import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.SpeciesCategory; +import fr.ifremer.echobase.entities.references.SpeciesCategoryDAO; +import fr.ifremer.echobase.services.DecoratorService; +import fr.ifremer.echobase.services.ImportException; +import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; +import fr.ifremer.echobase.services.configurations.ResultsImportMode; +import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeAndSpeciesCategoryImportModel; +import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeAndSpeciesCategoryImportModelRow; +import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeImportModel; +import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeImportModelRow; +import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndAgeCategoryImportModel; +import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndAgeCategoryImportModelRow; +import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndSizeCategoryImportModel; +import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndSizeCategoryImportModelRow; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.util.csv.Import; +import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.util.decorator.Decorator; + +import java.io.Reader; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static org.nuiton.i18n.I18n.l_; + +/** + * To import results attached to a voyage (but not cells). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ResultsEsduCellImportService extends AbstractImportDataService<ResultsImportConfiguration> { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ResultsEsduCellImportService.class); + + public static final Pattern REMOVE_DOUBLE_QUOTES_PATTERN = Pattern.compile("\"(.+)\""); + + @Override + protected String getImportLabel() { + return l_(getLocale(), ImportDataMode.Results.getI18nKey()); + } + + @Override + public List<CsvFileImportResult> startImport( + ResultsImportConfiguration configuration, + EchoBaseUser user) throws ImportException { + + ResultsImportMode importMode = configuration.getImportMode(); + + Map<String, Species> speciesMap = getEntitiesMap( + Species.class, + EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + + Map<String, SizeCategory> sizeCategoryMap = Maps.newTreeMap(); + sizeCategoryMap.putAll(getEntitiesMap( + SizeCategory.class, + EchoBaseFunctions.SIZE_CATEGORY_NAME)); + + Map<String, AgeCategory> ageCategoryMap = Maps.newTreeMap(); + ageCategoryMap.putAll(getEntitiesMap( + AgeCategory.class, + EchoBaseFunctions.AGE_CATEGORY_NAME)); + + Map<String, DataMetadata> dataMetadataMap = getEntitiesMap( + DataMetadata.class, + EchoBaseFunctions.DATA_METADATA_NAME); + + // get selected voyage + Voyage voyage = getEntityById(Voyage.class, + configuration.getVoyageId()); + + // index all echotypes of thi voyage + Map<String, Echotype> echotypeMap = Maps.uniqueIndex( + voyage.getEchotype(), + EchoBaseFunctions.ECHOTYPE_NAME); + + InputFile inputFile; + CsvFileImportResult importResult; + + switch (importMode) { + + case ACOUSTIC_BY_ECHOTYPE: { + + inputFile = configuration.getAcousticByEchotypeFile(); + + importResult = importAcousticByEchotypeFile( + configuration, + inputFile, + voyage, + echotypeMap, + dataMetadataMap + ); + + } + break; + + case ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY: { + + inputFile = + configuration.getAcousticByEchotypeAndSpeciesCategoryFile(); + importResult = importAcousticByEchotypeAndSpeciesCategoryFile( + configuration, + inputFile, + voyage, + echotypeMap, + dataMetadataMap, + speciesMap, + sizeCategoryMap + ); + } + break; + + case ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY: { + + inputFile = + configuration.getAcousticBySpeciesAndSizeCategoryFile(); + importResult = importAcousticBySpeciesAndSizeCategoryFile( + configuration, + inputFile, + voyage, + dataMetadataMap, + speciesMap, + sizeCategoryMap + ); + } + break; + + case ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY: { + + inputFile = + configuration.getAcousticBySpeciesAndAgeCategoryFile(); + + importResult = importAcousticBySpeciesAndAgeCategoryFile( + configuration, + inputFile, + voyage, + dataMetadataMap, + speciesMap, + ageCategoryMap + ); + + } + break; + default: + throw new EchoBaseTechnicalException( + "Can not use this importMode " + importMode + + " for this service " + this); + } + + List<CsvFileImportResult> result = Lists.newLinkedList(); + addResultAndLog(result, inputFile, importResult, user); + return result; + } + + private CsvFileImportResult importAcousticByEchotypeFile( + ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage, + Map<String, Echotype> echotypeMap, + Map<String, DataMetadata> dataMetadataMap) throws ImportException { + + if (log.isInfoEnabled()) { + log.info("Starts import of acoustic result by echotype from file " + + inputFile.getFileName()); + } + + // first get header of file to detect which results to import + String[] header = EchoBaseImport.getHeader(inputFile.getFile(), + getCsvSeparator()); + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + List<DataMetadata> metas = getMetas( + AcousticResultByEchotypeImportModel.COLUMN_NAMES_TO_EXCLUDE, + dataMetadataMap, + header); + + CellDAO cellDAO = (CellDAO) getDAO(Cell.class); + + AcousticResultByEchotypeImportModel csvModel = new AcousticResultByEchotypeImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + echotypeMap, + voyage, + cellDAO, + metas); + + CategoryDAO categoryDAO = (CategoryDAO) getDAO(Category.class); + SpeciesCategoryDAO speciesCategoryDAO = + getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); + + String resultLabel = configuration.getResultLabel(); + + DecoratorService decoratorService = getService(DecoratorService.class); + Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); + Reader reader = getInputFileReader(inputFile); + try { + Import<AcousticResultByEchotypeImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + int rowNumber = 0; + + configuration.incrementsProgression(); + for (AcousticResultByEchotypeImportModelRow row : importer) { + + configuration.incrementsProgression(); + rowNumber++; + + Cell cell = row.getCell(); + + Category category = getResultCategory(categoryDAO, + speciesCategoryDAO, + row.getEchotype(), + null, + null, + null, + importResult); + + if (rowNumber % 100 == 0) { + if (log.isInfoEnabled()) { + log.info("Treate row " + rowNumber + " for esdu cell " + + cell.getName() + " and category " + + categoryDecorator.toString(category)); + } + } + List<Result> results = row.getResult(); + + TopiaDAO<Result> dao = getDAO(Result.class); + + for (Result result : results) { + + result.setCategory(category); + result.setResultLabel(resultLabel); + + Result resultCreated = create(dao, result); + + cell.addResult(resultCreated); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Result); + } + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + private CsvFileImportResult importAcousticByEchotypeAndSpeciesCategoryFile( + ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage, + Map<String, Echotype> echotypeMap, + Map<String, DataMetadata> dataMetadataMap, + Map<String, Species> speciesMap, + Map<String, SizeCategory> sizeCategoryMap) throws ImportException { + + if (log.isInfoEnabled()) { + log.info("Starts import of acoustic result by echotype " + + "and species category from file " + + inputFile.getFileName()); + } + + // first get header of file to detect which results to import + String[] header = EchoBaseImport.getHeader(inputFile.getFile(), + getCsvSeparator()); + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + List<DataMetadata> metas = + getMetas( + AcousticResultByEchotypeAndSpeciesCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, + dataMetadataMap, + header); + + CellDAO cellDAO = (CellDAO) getDAO(Cell.class); + + SpeciesCategoryDAO speciesCategoryDAO = + getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); + + AcousticResultByEchotypeAndSpeciesCategoryImportModel csvModel = new AcousticResultByEchotypeAndSpeciesCategoryImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + echotypeMap, + speciesMap, + sizeCategoryMap, + voyage, + cellDAO, + metas); + + CategoryDAO categoryDAO = (CategoryDAO) getDAO(Category.class); + + DecoratorService decoratorService = getService(DecoratorService.class); + Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); + + String resultLabel = configuration.getResultLabel(); + + Reader reader = getInputFileReader(inputFile); + try { + EchoBaseImport<AcousticResultByEchotypeAndSpeciesCategoryImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + int rowNumber = 0; + + configuration.incrementsProgression(); + for (AcousticResultByEchotypeAndSpeciesCategoryImportModelRow row : importer) { + + configuration.incrementsProgression(); + rowNumber++; + + Cell cell = row.getCell(); + + Category category = getResultCategory(categoryDAO, + speciesCategoryDAO, + row.getEchotype(), + row.getSpecies(), + row.getSizeCategory(), + null, + importResult); + + if (rowNumber % 100 == 0) { + if (log.isInfoEnabled()) { + log.info("Treate row " + rowNumber + " for esdu cell " + + cell.getName() + " and category " + + categoryDecorator.toString(category)); + } + } + + List<Result> results = row.getResult(); + + TopiaDAO<Result> dao = getDAO(Result.class); + + for (Result result : results) { + + result.setCategory(category); + result.setResultLabel(resultLabel); + + Result resultCreated = create(dao, result); + + cell.addResult(resultCreated); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Result); + } + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + private CsvFileImportResult importAcousticBySpeciesAndSizeCategoryFile( + ResultsImportConfiguration configuration, InputFile inputFile, + Voyage voyage, + Map<String, DataMetadata> dataMetadataMap, + Map<String, Species> speciesMap, + Map<String, SizeCategory> sizeCategoryMap) throws ImportException { + + if (log.isInfoEnabled()) { + log.info("Starts import of acoustic result by speices and size category from file " + + inputFile.getFileName()); + } + + // first get header of file to detect which results to import + String[] header = EchoBaseImport.getHeader(inputFile.getFile(), + getCsvSeparator()); + + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + List<DataMetadata> metas = + getMetas( + AcousticResultBySpeciesAndSizeCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, + dataMetadataMap, + header); + + CellDAO cellDAO = (CellDAO) getDAO(Cell.class); + + SpeciesCategoryDAO speciesCategoryDAO = + getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); + + SizeCategoryDAO sizeCategoryDAO = + getDAO(SizeCategory.class, SizeCategoryDAO.class); + + AcousticResultBySpeciesAndSizeCategoryImportModel csvModel = new AcousticResultBySpeciesAndSizeCategoryImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + speciesMap, + voyage, + cellDAO, + metas); + + CategoryDAO categoryDAO = (CategoryDAO) getDAO(Category.class); + + DecoratorService decoratorService = getService(DecoratorService.class); + Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); + + String resultLabel = configuration.getResultLabel(); + + Reader reader = getInputFileReader(inputFile); + try { + EchoBaseImport<AcousticResultBySpeciesAndSizeCategoryImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + int rowNumber = 0; + + configuration.incrementsProgression(); + for (AcousticResultBySpeciesAndSizeCategoryImportModelRow row : importer) { + + configuration.incrementsProgression(); + rowNumber++; + + Cell cell = row.getCell(); + + String sizeCategoryName = row.getSizeCategory(); + + SizeCategory sizeCategory = + sizeCategoryMap.get(sizeCategoryName); + + if (sizeCategory == null) { + + // create a new sizeCategory + sizeCategory = create(sizeCategoryDAO); + sizeCategory.setName(sizeCategoryName); + sizeCategory.setMeaning(row.getSizeCategoryMeaning()); + importResult.incrementsNumberCreated( + EchoBaseEntityEnum.SizeCategory); + if (log.isInfoEnabled()) { + log.info("Creates a new SizeCategory " + sizeCategoryName); + } + sizeCategoryMap.put(sizeCategoryName, sizeCategory); + } + + Category category = getResultCategory(categoryDAO, + speciesCategoryDAO, + null, + row.getSpecies(), + sizeCategory, + null, + importResult); + + if (rowNumber % 100 == 0) { + if (log.isInfoEnabled()) { + log.info("Treate row " + rowNumber + " for esdu cell " + + cell.getName() + " and category " + + categoryDecorator.toString(category)); + } + } + + List<Result> results = row.getResult(); + + TopiaDAO<Result> dao = getDAO(Result.class); + + for (Result result : results) { + + result.setCategory(category); + result.setResultLabel(resultLabel); + + Result resultCreated = create(dao, result); + + cell.addResult(resultCreated); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Result); + } + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + private CsvFileImportResult importAcousticBySpeciesAndAgeCategoryFile( + ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage, + Map<String, DataMetadata> dataMetadataMap, + Map<String, Species> speciesMap, + Map<String, AgeCategory> ageCategoryMap) throws ImportException { + + if (log.isInfoEnabled()) { + log.info("Starts import of acoustic result by species and age category from file " + + inputFile.getFileName()); + } + + // first get header of file to detect which results to import + String[] header = EchoBaseImport.getHeader(inputFile.getFile(), + getCsvSeparator()); + + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + List<DataMetadata> metas = + getMetas( + AcousticResultBySpeciesAndAgeCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, + dataMetadataMap, + header); + + CellDAO cellDAO = (CellDAO) getDAO(Cell.class); + + SpeciesCategoryDAO speciesCategoryDAO = + getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); + + AgeCategoryDAO ageCategoryDAO = + getDAO(AgeCategory.class, AgeCategoryDAO.class); + + + AcousticResultBySpeciesAndAgeCategoryImportModel csvModel = new AcousticResultBySpeciesAndAgeCategoryImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + speciesMap, + voyage, + cellDAO, + metas); + + CategoryDAO categoryDAO = (CategoryDAO) getDAO(Category.class); + + DecoratorService decoratorService = getService(DecoratorService.class); + Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); + + String resultLabel = configuration.getResultLabel(); + + Reader reader = getInputFileReader(inputFile); + try { + EchoBaseImport<AcousticResultBySpeciesAndAgeCategoryImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + int rowNumber = 0; + + configuration.incrementsProgression(); + for (AcousticResultBySpeciesAndAgeCategoryImportModelRow row : importer) { + + configuration.incrementsProgression(); + rowNumber++; + + Cell cell = row.getCell(); + + String ageCategoryName = row.getAgeCategory(); + + AgeCategory ageCategory = + ageCategoryMap.get(ageCategoryName); + + if (ageCategory == null) { + + // create a new sizeCategory + ageCategory = create(ageCategoryDAO); + ageCategory.setName(row.getAgeCategory()); + ageCategory.setMeaning(row.getAgeCategoryMeaning()); + importResult.incrementsNumberCreated( + EchoBaseEntityEnum.AgeCategory); + if (log.isInfoEnabled()) { + log.info("Creates a new AgeCategory " + ageCategoryName); + } + ageCategoryMap.put(ageCategoryName, ageCategory); + } + + Category category = getResultCategory(categoryDAO, + speciesCategoryDAO, + null, + row.getSpecies(), + null, + ageCategory, + importResult); + + if (rowNumber % 100 == 0) { + if (log.isInfoEnabled()) { + log.info("Treate row " + rowNumber + " for esdu cell " + + cell.getName() + " and category " + + categoryDecorator.toString(category)); + } + } + + List<Result> results = row.getResult(); + + TopiaDAO<Result> dao = getDAO(Result.class); + + for (Result result : results) { + + result.setCategory(category); + result.setResultLabel(resultLabel); + + Result resultCreated = create(dao, result); + + cell.addResult(resultCreated); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Result); + } + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + protected List<DataMetadata> getMetas(String[] columnNamesToExclude, + Map<String, DataMetadata> dataMetadataMap, + String... headers) { + + List<String> metadataNames = Lists.newArrayList(headers); + for (String columnToExclude : columnNamesToExclude) { + metadataNames.remove(columnToExclude); + metadataNames.remove("\"" + columnToExclude + "\""); + } + + List<DataMetadata> result = Lists.newArrayList(); + + Locale locale = getLocale(); + + for (String metadataName : metadataNames) { + + Matcher matcher = REMOVE_DOUBLE_QUOTES_PATTERN.matcher(metadataName); + if (matcher.matches()) { + metadataName = matcher.group(1); + } + DataMetadata dataMetadata = dataMetadataMap.get(metadataName); + if (dataMetadata == null) { + throw new ImportRuntimeException( + l_(locale, "echobase.importError.dataMetadata.notFound", + metadataName, + dataMetadataMap.keySet())); + } + result.add(dataMetadata); + } + return result; + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java 2012-03-27 17:39:50 UTC (rev 416) @@ -23,79 +23,14 @@ */ package fr.ifremer.echobase.services.importdata; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; -import fr.ifremer.echobase.EchoBasePredicates; -import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.csv.CsvFileImportResult; -import fr.ifremer.echobase.csv.EchoBaseImport; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.data.Category; -import fr.ifremer.echobase.entities.data.CategoryDAO; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.CellDAO; -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.data.Result; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.AgeCategory; -import fr.ifremer.echobase.entities.references.AgeCategoryDAO; -import fr.ifremer.echobase.entities.references.DataMetadata; -import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.SizeCategoryDAO; -import fr.ifremer.echobase.entities.references.Species; -import fr.ifremer.echobase.entities.references.SpeciesCategory; -import fr.ifremer.echobase.entities.references.SpeciesCategoryDAO; -import fr.ifremer.echobase.entities.references.Strata; -import fr.ifremer.echobase.services.DecoratorService; import fr.ifremer.echobase.services.ImportException; import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; import fr.ifremer.echobase.services.configurations.ResultsImportMode; -import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeAndSpeciesCategoryImportModel; -import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeAndSpeciesCategoryImportModelRow; -import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeImportModel; -import fr.ifremer.echobase.services.csv.AcousticResultByEchotypeImportModelRow; -import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndAgeCategoryImportModel; -import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndAgeCategoryImportModelRow; -import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndSizeCategoryImportModel; -import fr.ifremer.echobase.services.csv.AcousticResultBySpeciesAndSizeCategoryImportModelRow; -import fr.ifremer.echobase.services.csv.EchotypeImportModel; -import fr.ifremer.echobase.services.csv.EchotypeImportModelRow; -import fr.ifremer.echobase.services.csv.LengthAgeKeyImportModel; -import fr.ifremer.echobase.services.csv.LengthAgeKeyImportModelRow; -import fr.ifremer.echobase.services.csv.LengthWeightKeyImportModel; -import fr.ifremer.echobase.services.csv.LengthWeightKeyImportModelRow; -import fr.ifremer.echobase.services.csv.MapImportModel; -import fr.ifremer.echobase.services.csv.MapImportModelRow; -import fr.ifremer.echobase.services.csv.MapResultImportModel; -import fr.ifremer.echobase.services.csv.MapResultImportModelRow; -import fr.ifremer.echobase.services.csv.RegionCellAssociationImportModel; -import fr.ifremer.echobase.services.csv.RegionCellAssociationImportModelRow; -import fr.ifremer.echobase.services.csv.RegionCellImportModel; -import fr.ifremer.echobase.services.csv.RegionResultImportModel; -import fr.ifremer.echobase.services.csv.RegionResultImportModelRow; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportRuntimeException; -import org.nuiton.util.decorator.Decorator; -import java.io.Reader; -import java.util.Arrays; -import java.util.Collection; import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static org.nuiton.i18n.I18n.l_; @@ -107,10 +42,6 @@ */ public class ResultsImportService extends AbstractImportDataService<ResultsImportConfiguration> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(ResultsImportService.class); - @Override protected String getImportLabel() { return l_(getLocale(), ImportDataMode.Results.getI18nKey()); @@ -120,1070 +51,42 @@ public List<CsvFileImportResult> startImport(ResultsImportConfiguration configuration, EchoBaseUser user) throws ImportException { - List<CsvFileImportResult> result = Lists.newLinkedList(); - ResultsImportMode importMode = configuration.getImportMode(); - Map<String, Species> speciesMap = getEntitiesMap( - Species.class, - EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + AbstractImportDataService<ResultsImportConfiguration> service; - Map<String, SizeCategory> sizeCategoryMap = getEntitiesMap( - SizeCategory.class, - EchoBaseFunctions.SIZE_CATEGORY_NAME); - - Map<String, AgeCategory> ageCategoryMap = getEntitiesMap( - AgeCategory.class, - EchoBaseFunctions.AGE_CATEGORY_NAME); - - Map<String, DataMetadata> dataMetadataMap = getEntitiesMap( - DataMetadata.class, - EchoBaseFunctions.DATA_METADATA_NAME); - - switch (importMode) { - case VOYAGE: { - // get selected voyage - Voyage voyage = getEntityById(Voyage.class, - configuration.getVoyageId()); + case VOYAGE: + service = getService(ResultsVoyageImportService.class); + break; - // authorize only the selected voyage to be imported - Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( - voyage), EchoBaseFunctions.VOYAGE_NAME); + case ACOUSTIC_BY_ECHOTYPE: + case ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY: + case ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY: + case ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY: - InputFile inputFile = configuration.getLengthAgeKeyFile(); + service = getService(ResultsEsduCellImportService.class); + break; - if (inputFile.hasFile()) { + case REGION: - CsvFileImportResult importResult = importLenthAgeKey( - inputFile, - voyageMap, - speciesMap - ); - addResultAndLog(result, inputFile, importResult, user); - } + service = getService(ResultsEsduCellImportService.class); + break; - inputFile = configuration.getLengthWeightKeyFile(); - if (inputFile.hasFile()) { + case MAP: - CsvFileImportResult importResult = importLenghtWeightKey( - inputFile, - voyageMap, - speciesMap - ); - addResultAndLog(result, inputFile, importResult, user); - } - - inputFile = configuration.getEchotypeFile(); - if (inputFile.hasFile()) { - - CsvFileImportResult importResult = importEchotypeFile( - inputFile, - voyageMap, - speciesMap - ); - addResultAndLog(result, inputFile, importResult, user); - } - } - break; - - case ACOUSTIC_BY_ECHOTYPE: { - - // get selected voyage - Voyage voyage = getEntityById(Voyage.class, - configuration.getVoyageId()); - - InputFile inputFile = configuration.getAcousticByEchotypeFile(); - - if (inputFile.hasFile()) { - - CsvFileImportResult importResult = importAcousticByEchotypeFile( - inputFile, - voyage, - dataMetadataMap, - configuration.getResultLabel() - ); - addResultAndLog(result, inputFile, importResult, user); - } - } - break; - - case ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY: { - - // get selected voyage - Voyage voyage = getEntityById(Voyage.class, - configuration.getVoyageId()); - - InputFile inputFile = - configuration.getAcousticByEchotypeAndSpeciesCategoryFile(); - - if (inputFile.hasFile()) { - - CsvFileImportResult importResult = importAcousticByEchotypeAndSpeciesCategoryFile( - inputFile, - voyage, - dataMetadataMap, - speciesMap, - sizeCategoryMap, - configuration.getResultLabel() - ); - addResultAndLog(result, inputFile, importResult, user); - } - } - break; - - case ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY: { - - // get selected voyage - Voyage voyage = getEntityById(Voyage.class, - configuration.getVoyageId()); - - InputFile inputFile = - configuration.getAcousticBySpeciesAndSizeCategoryFile(); - - if (inputFile.hasFile()) { - - CsvFileImportResult importResult = importAcousticBySpeciesAndSizeCategoryFile( - inputFile, - voyage, - dataMetadataMap, - speciesMap, - sizeCategoryMap, - configuration.getResultLabel() - ); - addResultAndLog(result, inputFile, importResult, user); - } - } - break; - - case ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY: { - - // get selected voyage - Voyage voyage = getEntityById(Voyage.class, - configuration.getVoyageId()); - - InputFile inputFile = - configuration.getAcousticBySpeciesAndAgeCategoryFile(); - - if (inputFile.hasFile()) { - - CsvFileImportResult importResult = importAcousticBySpeciesAndAgeCategoryFile( - inputFile, - voyage, - dataMetadataMap, - speciesMap, - ageCategoryMap, - configuration.getResultLabel() - ); - addResultAndLog(result, inputFile, importResult, user); - } - } - break; - - case REGION: { - - // get selected voyage - Voyage voyage = getEntityById(Voyage.class, - configuration.getVoyageId()); - - - InputFile inputFile = configuration.getRegionsFile(); - - if (inputFile.hasFile()) { - CsvFileImportResult importResult = importRegionsFile( - inputFile, voyage); - - addResultAndLog(result, inputFile, importResult, user); - } - inputFile = configuration.getRegionAssociationFile(); - if (inputFile.hasFile()) { - CsvFileImportResult importResult = importRegionAssociationFile( - inputFile, voyage); - - addResultAndLog(result, inputFile, importResult, user); - } - - inputFile = configuration.getRegionResultFile(); - if (inputFile.hasFile()) { - CsvFileImportResult importResult = importRegionResultFile( - inputFile, voyage, configuration.getResultLabel()); - - addResultAndLog(result, inputFile, importResult, user); - } - } - break; - case MAP: { - - // get selected voyage - Voyage voyage = getEntityById(Voyage.class, - configuration.getVoyageId()); - - InputFile inputFile = configuration.getMapsFile(); - if (inputFile.hasFile()) { - CsvFileImportResult importResult = importMapFile( - inputFile, voyage); - - addResultAndLog(result, inputFile, - importResult, user); - } - inputFile = configuration.getMapResultFile(); - if (inputFile.hasFile()) { - CsvFileImportResult importResult = importMapResultFile( - inputFile, voyage, configuration.getResultLabel()); - - addResultAndLog(result, inputFile, importResult, user); - } - } - break; + service = getService(ResultsEsduCellImportService.class); + break; + default: + throw new EchoBaseTechnicalException( + "Can not treate import result of type " + importMode); } - return result; - } - protected CsvFileImportResult importRegionsFile(InputFile inputFile, Voyage voyage) throws ImportException { + List<CsvFileImportResult> result = service.startImport(configuration, + user); - if (log.isInfoEnabled()) { - log.info("Starts import of region from file " + - inputFile.getFileName()); - } - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - RegionCellImportModel csvModel = new RegionCellImportModel( - serviceContext.getConfiguration().getCsvSeparator()); - - CellDAO dao = getDAO(Cell.class, CellDAO.class); - - Reader reader = getInputFileReader(inputFile); - try { - Import<Cell> importer = - EchoBaseImport.newImport(csvModel, reader); - - for (Cell row : importer) { - - //TODO - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.Cell); - } - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - protected CsvFileImportResult importRegionAssociationFile(InputFile inputFile, - Voyage voyage) throws ImportException { - RegionCellAssociationImportModel csvModel = new RegionCellAssociationImportModel( - serviceContext.getConfiguration().getCsvSeparator()); - - if (log.isInfoEnabled()) { - log.info("Starts import of region cell association from file " + - inputFile.getFileName()); - } - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - CellDAO dao = getDAO(Cell.class, CellDAO.class); - - Reader reader = getInputFileReader(inputFile); - try { - Import<RegionCellAssociationImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - for (RegionCellAssociationImportModelRow row : importer) { - - //TODO - - importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - protected CsvFileImportResult importRegionResultFile(InputFile inputFile, - Voyage voyage, - String resultLabel) throws ImportException { - RegionResultImportModel csvModel = new RegionResultImportModel( - serviceContext.getConfiguration().getCsvSeparator()); - - if (log.isInfoEnabled()) { - log.info("Starts import of region cell results from file " + - inputFile.getFileName()); - } - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - CellDAO dao = getDAO(Cell.class, CellDAO.class); - - Reader reader = getInputFileReader(inputFile); - try { - Import<RegionResultImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - for (RegionResultImportModelRow row : importer) { - - //TODO - - importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - protected CsvFileImportResult importMapFile(InputFile inputFile, - Voyage voyage) throws ImportException { - MapImportModel csvModel = new MapImportModel( - serviceContext.getConfiguration().getCsvSeparator()); - - if (log.isInfoEnabled()) { - log.info("Starts import of Map cells from file " + - inputFile.getFileName()); - } - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - CellDAO dao = getDAO(Cell.class, CellDAO.class); - - Reader reader = getInputFileReader(inputFile); - try { - EchoBaseImport<MapImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - for (MapImportModelRow row : importer) { - - //TODO - - importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - protected CsvFileImportResult importMapResultFile(InputFile inputFile, - Voyage voyage, - String resultLabel) throws ImportException { - MapResultImportModel csvModel = new MapResultImportModel( - serviceContext.getConfiguration().getCsvSeparator()); - - if (log.isInfoEnabled()) { - log.info("Starts import of Map cell results from file " + - inputFile.getFileName()); - } - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - CellDAO dao = getDAO(Cell.class, CellDAO.class); - - Reader reader = getInputFileReader(inputFile); - try { - EchoBaseImport<MapResultImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - for (MapResultImportModelRow row : importer) { - - //TODO - - importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - protected CsvFileImportResult importLenghtWeightKey(InputFile inputFile, - Map<String, Voyage> voyageMap, - Map<String, Species> speciesMap) throws ImportException { - - if (log.isInfoEnabled()) { - log.info("Starts import of lenthWeightKey from file " + - inputFile.getFileName()); - } - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - Map<String, SizeCategory> sizeCategoryMap = getEntitiesMap( - SizeCategory.class, - EchoBaseFunctions.SIZE_CATEGORY_NAME); - - LengthWeightKeyImportModel csvModel = new LengthWeightKeyImportModel( - serviceContext.getConfiguration().getCsvSeparator(), - voyageMap, - sizeCategoryMap, - speciesMap); - - LengthWeightKeyDAO dao = getDAO(LengthWeightKey.class, - LengthWeightKeyDAO.class); - - SpeciesCategoryDAO speciesCategoryDAO = - getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); - - Reader reader = getInputFileReader(inputFile); - try { - Import<LengthWeightKeyImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - for (LengthWeightKeyImportModelRow row : importer) { - - Voyage voyage = row.getVoyage(); - - LengthWeightKey lengthWeightKeyToCreate = - row.getLengthWeightKey(); - LengthWeightKey lengthWeightKey = create( - dao, lengthWeightKeyToCreate); - - //TODO should we import it ? - //lengthWeightKey.setMetadata(row.getMetadata()); - - Species species = row.getSpecies(); - SizeCategory sizeCategory = row.getSizeCategory(); - - // find speciesCategory - SpeciesCategory speciesCategory = getSpeciesCategory( - speciesCategoryDAO, - species, - sizeCategory, - null, - null, - importResult - ); - - lengthWeightKey.setSpeciesCategory(speciesCategory); - - // attach it to voyage - voyage.addLengthWeightKey(lengthWeightKey); - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.LengthWeightKey); - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - protected CsvFileImportResult importLenthAgeKey(InputFile inputFile, - Map<String, Voyage> voyageMap, - Map<String, Species> speciesMap) throws ImportException { - - if (log.isInfoEnabled()) { - log.info("Starts import of lenthAgeKey from file " + - inputFile.getFileName()); - } - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - Map<String, Strata> strataMap = getEntitiesMap( - Strata.class, EchoBaseFunctions.STRATA_BY_NAME); - - LengthAgeKeyImportModel csvModel = new LengthAgeKeyImportModel( - serviceContext.getConfiguration().getCsvSeparator(), - voyageMap, - strataMap, - speciesMap); - - TopiaDAO<LengthAgeKey> dao = getDAO(LengthAgeKey.class); - - Reader reader = getInputFileReader(inputFile); - try { - Import<LengthAgeKeyImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - for (LengthAgeKeyImportModelRow row : importer) { - - Voyage voyage = row.getVoyage(); - - LengthAgeKey lengthAgeKeyToCreate = row.getLengthAgeKey(); - LengthAgeKey lengthAgeKey = create(dao, lengthAgeKeyToCreate); - - // attach it to voyage - voyage.addLengthAgeKey(lengthAgeKey); - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.LengthAgeKey); - } - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - private CsvFileImportResult importEchotypeFile(InputFile inputFile, - Map<String, Voyage> voyageMap, - Map<String, Species> speciesMap) throws ImportException { - - if (log.isInfoEnabled()) { - log.info("Starts import of echotype from file " + - inputFile.getFileName()); - } - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - Map<String, DepthStratum> depthStratumMap = getEntitiesMap( - DepthStratum.class, - EchoBaseFunctions.DEPTH_STRATUM_ID); - - EchotypeImportModel csvModel = new EchotypeImportModel( - serviceContext.getConfiguration().getCsvSeparator(), - voyageMap, - depthStratumMap, - speciesMap); - - TopiaDAO<Echotype> dao = getDAO(Echotype.class); - - Reader reader = getInputFileReader(inputFile); - try { - Import<EchotypeImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - for (EchotypeImportModelRow row : importer) { - - Voyage voyage = row.getVoyage(); - - Echotype rowEchotype = row.getEchotype(); - - String echotypeName = rowEchotype.getName(); - - // check if there is a echotype for the voyage and this name - Echotype echotype = null; - - if (!voyage.isEchotypeEmpty()) { - - Collection<Echotype> echotypes = voyage.getEchotype(); - Predicate<Echotype> predicate = - EchoBasePredicates.newEchotypeByNamePredicate( - echotypeName); - echotype = Iterables.find(echotypes, predicate, null); - - } - - if (echotype == null) { - - // creates it - echotype = create(dao, rowEchotype); - - // attach it to voyage - voyage.addEchotype(echotype); - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.Echotype); - - } else { - - Species species = rowEchotype.getSpecies().iterator().next(); - Species existingSpecie = - echotype.getSpeciesByTopiaId(species.getTopiaId()); - - if (existingSpecie == null) { - - // add this species - echotype.addSpecies(species); - } - } - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - private CsvFileImportResult importAcousticByEchotypeFile(InputFile inputFile, - Voyage voyage, - Map<String, DataMetadata> dataMetadataMap, - String resultLabel) throws ImportException { - - if (log.isInfoEnabled()) { - log.info("Starts import of acoustic result by echotype from file " + - inputFile.getFileName()); - } - - // first get header of file to detect which results to import - String[] header = EchoBaseImport.getHeader(inputFile.getFile(), - getCsvSeparator()); - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - Map<String, Echotype> echotypeMap = Maps.uniqueIndex( - voyage.getEchotype(), - EchoBaseFunctions.ECHOTYPE_NAME); - - List<DataMetadata> metas = getMetas( - AcousticResultByEchotypeImportModel.COLUMN_NAMES_TO_EXCLUDE, - dataMetadataMap, - header); - - CellDAO cellDAO = (CellDAO) getDAO(Cell.class); - - AcousticResultByEchotypeImportModel csvModel = new AcousticResultByEchotypeImportModel( - serviceContext.getConfiguration().getCsvSeparator(), - echotypeMap, - voyage, - cellDAO, - metas); - - CategoryDAO categoryDAO = (CategoryDAO) getDAO(Category.class); - SpeciesCategoryDAO speciesCategoryDAO = - getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); - - DecoratorService decoratorService = getService(DecoratorService.class); - Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); - Reader reader = getInputFileReader(inputFile); - try { - Import<AcousticResultByEchotypeImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - int rowNumber = 0; - - for (AcousticResultByEchotypeImportModelRow row : importer) { - - rowNumber++; - - Cell cell = row.getCell(); - - Category category = getResultCategory(categoryDAO, - speciesCategoryDAO, - row.getEchotype(), - null, - null, - null, - importResult); - - if (rowNumber % 100 == 0) { - if (log.isInfoEnabled()) { - log.info("Treate row " + rowNumber + " for esdu cell " + - cell.getName() + " and category " + - categoryDecorator.toString(category)); - } - } - List<Result> results = row.getResult(); - - TopiaDAO<Result> dao = getDAO(Result.class); - - for (Result result : results) { - - result.setCategory(category); - result.setResultLabel(resultLabel); - - Result resultCreated = create(dao, result); - - cell.addResult(resultCreated); - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.Result); - } - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - private CsvFileImportResult importAcousticByEchotypeAndSpeciesCategoryFile(InputFile inputFile, - Voyage voyage, - Map<String, DataMetadata> dataMetadataMap, - Map<String, Species> speciesMap, - Map<String, SizeCategory> sizeCategoryMap, - String resultLabel) throws ImportException { - - if (log.isInfoEnabled()) { - log.info("Starts import of acoustic result by echotype " + - "and species category from file " + - inputFile.getFileName()); - } - - // first get header of file to detect which results to import - String[] header = EchoBaseImport.getHeader(inputFile.getFile(), - getCsvSeparator()); - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - Map<String, Echotype> echotypeMap = Maps.uniqueIndex( - voyage.getEchotype(), - EchoBaseFunctions.ECHOTYPE_NAME); - - - List<DataMetadata> metas = - getMetas( - AcousticResultByEchotypeAndSpeciesCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, - dataMetadataMap, - header); - - CellDAO cellDAO = (CellDAO) getDAO(Cell.class); - - SpeciesCategoryDAO speciesCategoryDAO = - getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); - - AcousticResultByEchotypeAndSpeciesCategoryImportModel csvModel = new AcousticResultByEchotypeAndSpeciesCategoryImportModel( - serviceContext.getConfiguration().getCsvSeparator(), - echotypeMap, - speciesMap, - sizeCategoryMap, - voyage, - cellDAO, - metas); - - CategoryDAO categoryDAO = (CategoryDAO) getDAO(Category.class); - - DecoratorService decoratorService = getService(DecoratorService.class); - Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); - - - Reader reader = getInputFileReader(inputFile); - try { - EchoBaseImport<AcousticResultByEchotypeAndSpeciesCategoryImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - int rowNumber = 0; - - for (AcousticResultByEchotypeAndSpeciesCategoryImportModelRow row : importer) { - - rowNumber++; - - Cell cell = row.getCell(); - - Category category = getResultCategory(categoryDAO, - speciesCategoryDAO, - row.getEchotype(), - row.getSpecies(), - row.getSizeCategory(), - null, - importResult); - - if (rowNumber % 100 == 0) { - if (log.isInfoEnabled()) { - log.info("Treate row " + rowNumber + " for esdu cell " + - cell.getName() + " and category " + - categoryDecorator.toString(category)); - } - } - - List<Result> results = row.getResult(); - - TopiaDAO<Result> dao = getDAO(Result.class); - - for (Result result : results) { - - result.setCategory(category); - result.setResultLabel(resultLabel); - - Result resultCreated = create(dao, result); - - cell.addResult(resultCreated); - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.Result); - } - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - private CsvFileImportResult importAcousticBySpeciesAndSizeCategoryFile(InputFile inputFile, - Voyage voyage, - Map<String, DataMetadata> dataMetadataMap, - Map<String, Species> speciesMap, - Map<String, SizeCategory> sizeCategoryMap, - String resultLabel) throws ImportException { - - if (log.isInfoEnabled()) { - log.info("Starts import of acoustic result by echotype from file " + - inputFile.getFileName()); - } - - // first get header of file to detect which results to import - String[] header = EchoBaseImport.getHeader(inputFile.getFile(), - getCsvSeparator()); - - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - List<DataMetadata> metas = - getMetas( - AcousticResultBySpeciesAndSizeCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, - dataMetadataMap, - header); - - CellDAO cellDAO = (CellDAO) getDAO(Cell.class); - - SpeciesCategoryDAO speciesCategoryDAO = - getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); - - SizeCategoryDAO sizeCategoryDAO = - getDAO(SizeCategory.class, SizeCategoryDAO.class); - - - AcousticResultBySpeciesAndSizeCategoryImportModel csvModel = new AcousticResultBySpeciesAndSizeCategoryImportModel( - serviceContext.getConfiguration().getCsvSeparator(), - speciesMap, - voyage, - cellDAO, - metas); - - CategoryDAO categoryDAO = (CategoryDAO) getDAO(Category.class); - - DecoratorService decoratorService = getService(DecoratorService.class); - Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); - - - Reader reader = getInputFileReader(inputFile); - try { - EchoBaseImport<AcousticResultBySpeciesAndSizeCategoryImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - int rowNumber = 0; - - for (AcousticResultBySpeciesAndSizeCategoryImportModelRow row : importer) { - - rowNumber++; - - Cell cell = row.getCell(); - - String sizeCategoryName = row.getSizeCategory(); - - SizeCategory sizeCategory = - sizeCategoryMap.get(sizeCategoryName); - - if (sizeCategory == null) { - - // create a new sizeCategory - sizeCategory = create(sizeCategoryDAO); - sizeCategory.setName(row.getSizeCategory()); - sizeCategory.setMeaning(row.getSizeCategoryMeaning()); - importResult.incrementsNumberCreated( - EchoBaseEntityEnum.SizeCategory); - } - - Category category = getResultCategory(categoryDAO, - speciesCategoryDAO, - null, - row.getSpecies(), - sizeCategory, - null, - importResult); - - if (rowNumber % 100 == 0) { - if (log.isInfoEnabled()) { - log.info("Treate row " + rowNumber + " for esdu cell " + - cell.getName() + " and category " + - categoryDecorator.toString(category)); - } - } - - List<Result> results = row.getResult(); - - TopiaDAO<Result> dao = getDAO(Result.class); - - for (Result result : results) { - - result.setCategory(category); - result.setResultLabel(resultLabel); - - Result resultCreated = create(dao, result); - - cell.addResult(resultCreated); - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.Result); - } - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - private CsvFileImportResult importAcousticBySpeciesAndAgeCategoryFile(InputFile inputFile, - Voyage voyage, - Map<String, DataMetadata> dataMetadataMap, - Map<String, Species> speciesMap, - Map<String, AgeCategory> ageCategoryMap, - String resultLabel) throws ImportException { - - if (log.isInfoEnabled()) { - log.info("Starts import of acoustic result by echotype from file " + - inputFile.getFileName()); - } - - // first get header of file to detect which results to import - String[] header = EchoBaseImport.getHeader(inputFile.getFile(), - getCsvSeparator()); - - - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); - - List<DataMetadata> metas = - getMetas( - AcousticResultBySpeciesAndAgeCategoryImportModel.COLUMN_NAMES_TO_EXCLUDE, - dataMetadataMap, - header); - - CellDAO cellDAO = (CellDAO) getDAO(Cell.class); - - SpeciesCategoryDAO speciesCategoryDAO = - getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); - - AgeCategoryDAO ageCategoryDAO = - getDAO(AgeCategory.class, AgeCategoryDAO.class); - - - AcousticResultBySpeciesAndAgeCategoryImportModel csvModel = new AcousticResultBySpeciesAndAgeCategoryImportModel( - serviceContext.getConfiguration().getCsvSeparator(), - speciesMap, - voyage, - cellDAO, - metas); - - CategoryDAO categoryDAO = (CategoryDAO) getDAO(Category.class); - - DecoratorService decoratorService = getService(DecoratorService.class); - Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); - - - Reader reader = getInputFileReader(inputFile); - try { - EchoBaseImport<AcousticResultBySpeciesAndAgeCategoryImportModelRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - int rowNumber = 0; - - for (AcousticResultBySpeciesAndAgeCategoryImportModelRow row : importer) { - - rowNumber++; - - Cell cell = row.getCell(); - - String sizeCategoryName = row.getAgeCategory(); - - AgeCategory ageCategory = - ageCategoryMap.get(sizeCategoryName); - - if (ageCategory == null) { - - // create a new sizeCategory - ageCategory = create(ageCategoryDAO); - ageCategory.setName(row.getAgeCategory()); - ageCategory.setMeaning(row.getAgeCategoryMeaning()); - importResult.incrementsNumberCreated( - EchoBaseEntityEnum.AgeCategory); - } - - Category category = getResultCategory(categoryDAO, - speciesCategoryDAO, - null, - row.getSpecies(), - null, - ageCategory, - importResult); - - if (rowNumber % 100 == 0) { - if (log.isInfoEnabled()) { - log.info("Treate row " + rowNumber + " for esdu cell " + - cell.getName() + " and category " + - categoryDecorator.toString(category)); - } - } - - List<Result> results = row.getResult(); - - TopiaDAO<Result> dao = getDAO(Result.class); - - for (Result result : results) { - - result.setCategory(category); - result.setResultLabel(resultLabel); - - Result resultCreated = create(dao, result); - - cell.addResult(resultCreated); - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.Result); - } - } - - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } - - protected List<DataMetadata> getMetas(String[] columnNamesToExclude, - Map<String, DataMetadata> dataMetadataMap, - String... headers) { - - List<String> metadataNames = Lists.newArrayList(headers); - for (String columnToExclude : columnNamesToExclude) { - metadataNames.remove(columnToExclude); - metadataNames.remove("\"" + columnToExclude + "\""); - } - - List<DataMetadata> result = Lists.newArrayList(); - - Pattern removeDoubleQuotesPattern = Pattern.compile("\"(.+)\""); - - Locale locale = getLocale(); - - for (String metadataName : metadataNames) { - - Matcher matcher = removeDoubleQuotesPattern.matcher(metadataName); - if (matcher.matches()) { - metadataName = matcher.group(1); - } - DataMetadata dataMetadata = dataMetadataMap.get(metadataName); - if (dataMetadata == null) { - throw new ImportRuntimeException( - l_(locale, "echobase.importError.dataMetadata.notFound", - metadataName, - dataMetadataMap.keySet())); - } - result.add(dataMetadata); - } return result; } + } Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-03-27 17:39:50 UTC (rev 416) @@ -0,0 +1,177 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import com.google.common.collect.Lists; +import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.csv.EchoBaseImport; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.ImportException; +import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; +import fr.ifremer.echobase.services.csv.MapImportModel; +import fr.ifremer.echobase.services.csv.MapImportModelRow; +import fr.ifremer.echobase.services.csv.MapResultImportModel; +import fr.ifremer.echobase.services.csv.MapResultImportModelRow; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.csv.ImportRuntimeException; + +import java.io.Reader; +import java.util.List; + +import static org.nuiton.i18n.I18n.l_; + +/** + * To import map results attached to a voyage. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ResultsMapCellImportService extends AbstractImportDataService<ResultsImportConfiguration> { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ResultsMapCellImportService.class); + + @Override + protected String getImportLabel() { + return l_(getLocale(), ImportDataMode.Results.getI18nKey()); + } + + @Override + public List<CsvFileImportResult> startImport(ResultsImportConfiguration configuration, + EchoBaseUser user) throws ImportException { + + List<CsvFileImportResult> result = Lists.newLinkedList(); + + // get selected voyage + Voyage voyage = getEntityById(Voyage.class, + configuration.getVoyageId()); + + InputFile inputFile = configuration.getMapsFile(); + if (inputFile.hasFile()) { + CsvFileImportResult importResult = importMapFile( + configuration, + inputFile, voyage); + + addResultAndLog(result, inputFile, + importResult, user); + } + inputFile = configuration.getMapResultFile(); + if (inputFile.hasFile()) { + CsvFileImportResult importResult = importMapResultFile( + configuration, + inputFile, voyage); + + addResultAndLog(result, inputFile, importResult, user); + } + + return result; + } + + protected CsvFileImportResult importMapFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { + MapImportModel csvModel = new MapImportModel( + serviceContext.getConfiguration().getCsvSeparator()); + + if (log.isInfoEnabled()) { + log.info("Starts import of Map cells from file " + + inputFile.getFileName()); + } + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + CellDAO dao = getDAO(Cell.class, CellDAO.class); + + Reader reader = getInputFileReader(inputFile); + try { + EchoBaseImport<MapImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); + for (MapImportModelRow row : importer) { + + configuration.incrementsProgression(); + //TODO + + importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + protected CsvFileImportResult importMapResultFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { + MapResultImportModel csvModel = new MapResultImportModel( + serviceContext.getConfiguration().getCsvSeparator()); + + if (log.isInfoEnabled()) { + log.info("Starts import of Map cell results from file " + + inputFile.getFileName()); + } + + String resultLabel = configuration.getResultLabel(); + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + CellDAO dao = getDAO(Cell.class, CellDAO.class); + + Reader reader = getInputFileReader(inputFile); + try { + EchoBaseImport<MapResultImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); + for (MapResultImportModelRow row : importer) { + + configuration.incrementsProgression(); + //TODO + + importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-27 17:39:50 UTC (rev 416) @@ -0,0 +1,175 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import com.google.common.collect.Lists; +import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.csv.EchoBaseImport; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.ImportException; +import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; +import fr.ifremer.echobase.services.csv.MapImportModel; +import fr.ifremer.echobase.services.csv.MapImportModelRow; +import fr.ifremer.echobase.services.csv.MapResultImportModel; +import fr.ifremer.echobase.services.csv.MapResultImportModelRow; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.csv.ImportRuntimeException; + +import java.io.Reader; +import java.util.List; + +import static org.nuiton.i18n.I18n.l_; + +/** + * To import regions results attached to a voyage. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ResultsRegionCellImportService extends AbstractImportDataService<ResultsImportConfiguration> { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ResultsRegionCellImportService.class); + + @Override + protected String getImportLabel() { + return l_(getLocale(), ImportDataMode.Results.getI18nKey()); + } + + @Override + public List<CsvFileImportResult> startImport(ResultsImportConfiguration configuration, + EchoBaseUser user) throws ImportException { + + List<CsvFileImportResult> result = Lists.newLinkedList(); + + // get selected voyage + Voyage voyage = getEntityById(Voyage.class, configuration.getVoyageId()); + + InputFile inputFile = configuration.getMapsFile(); + if (inputFile.hasFile()) { + CsvFileImportResult importResult = importMapFile( + configuration, + inputFile, voyage); + + addResultAndLog(result, inputFile, + importResult, user); + } + inputFile = configuration.getMapResultFile(); + if (inputFile.hasFile()) { + CsvFileImportResult importResult = importMapResultFile( + configuration, + inputFile, voyage); + + addResultAndLog(result, inputFile, importResult, user); + } + + return result; + } + + protected CsvFileImportResult importMapFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { + MapImportModel csvModel = new MapImportModel( + serviceContext.getConfiguration().getCsvSeparator()); + + if (log.isInfoEnabled()) { + log.info("Starts import of Map cells from file " + + inputFile.getFileName()); + } + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + CellDAO dao = getDAO(Cell.class, CellDAO.class); + + Reader reader = getInputFileReader(inputFile); + try { + EchoBaseImport<MapImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); + for (MapImportModelRow row : importer) { + + configuration.incrementsProgression(); + //TODO + + importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + protected CsvFileImportResult importMapResultFile(ResultsImportConfiguration configuration, + InputFile inputFile, + Voyage voyage) throws ImportException { + MapResultImportModel csvModel = new MapResultImportModel( + serviceContext.getConfiguration().getCsvSeparator()); + + if (log.isInfoEnabled()) { + log.info("Starts import of Map cell results from file " + + inputFile.getFileName()); + } + String resultLabel = configuration.getResultLabel(); + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + CellDAO dao = getDAO(Cell.class, CellDAO.class); + + Reader reader = getInputFileReader(inputFile); + try { + EchoBaseImport<MapResultImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); + for (MapResultImportModelRow row : importer) { + + configuration.incrementsProgression(); + //TODO + + importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-03-27 17:39:50 UTC (rev 416) @@ -0,0 +1,366 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.EchoBasePredicates; +import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.csv.EchoBaseImport; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.EchoBaseUser; +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.data.Voyage; +import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.SpeciesCategory; +import fr.ifremer.echobase.entities.references.SpeciesCategoryDAO; +import fr.ifremer.echobase.entities.references.Strata; +import fr.ifremer.echobase.services.ImportException; +import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; +import fr.ifremer.echobase.services.csv.EchotypeImportModel; +import fr.ifremer.echobase.services.csv.EchotypeImportModelRow; +import fr.ifremer.echobase.services.csv.LengthAgeKeyImportModel; +import fr.ifremer.echobase.services.csv.LengthAgeKeyImportModelRow; +import fr.ifremer.echobase.services.csv.LengthWeightKeyImportModel; +import fr.ifremer.echobase.services.csv.LengthWeightKeyImportModelRow; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.util.csv.Import; +import org.nuiton.util.csv.ImportRuntimeException; + +import java.io.Reader; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import static org.nuiton.i18n.I18n.l_; + +/** + * To import results attached to a voyage (but not cells). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ResultsVoyageImportService extends AbstractImportDataService<ResultsImportConfiguration> { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ResultsVoyageImportService.class); + + @Override + protected String getImportLabel() { + return l_(getLocale(), ImportDataMode.Results.getI18nKey()); + } + + @Override + public List<CsvFileImportResult> startImport(ResultsImportConfiguration configuration, + EchoBaseUser user) throws ImportException { + + List<CsvFileImportResult> result = Lists.newLinkedList(); + + Map<String, Species> speciesMap = getEntitiesMap( + Species.class, + EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + + // get selected voyage + Voyage voyage = getEntityById(Voyage.class, + configuration.getVoyageId()); + + // authorize only the selected voyage to be imported + Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( + voyage), EchoBaseFunctions.VOYAGE_NAME); + + InputFile inputFile = configuration.getLengthAgeKeyFile(); + + if (inputFile.hasFile()) { + + CsvFileImportResult importResult = importLenthAgeKey( + configuration, + inputFile, + voyageMap, + speciesMap + ); + addResultAndLog(result, inputFile, importResult, user); + } + + inputFile = configuration.getLengthWeightKeyFile(); + if (inputFile.hasFile()) { + + CsvFileImportResult importResult = importLenghtWeightKey( + configuration, + inputFile, + voyageMap, + speciesMap + ); + addResultAndLog(result, inputFile, importResult, user); + } + + inputFile = configuration.getEchotypeFile(); + if (inputFile.hasFile()) { + + CsvFileImportResult importResult = importEchotypeFile( + configuration, + inputFile, + voyageMap, + speciesMap + ); + addResultAndLog(result, inputFile, importResult, user); + } + + return result; + } + + protected CsvFileImportResult importLenghtWeightKey( + ResultsImportConfiguration configuration, + InputFile inputFile, + Map<String, Voyage> voyageMap, + Map<String, Species> speciesMap) throws ImportException { + + if (log.isInfoEnabled()) { + log.info("Starts import of lenthWeightKey from file " + + inputFile.getFileName()); + } + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + Map<String, SizeCategory> sizeCategoryMap = getEntitiesMap( + SizeCategory.class, + EchoBaseFunctions.SIZE_CATEGORY_NAME); + + LengthWeightKeyImportModel csvModel = new LengthWeightKeyImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + voyageMap, + sizeCategoryMap, + speciesMap); + + LengthWeightKeyDAO dao = getDAO(LengthWeightKey.class, + LengthWeightKeyDAO.class); + + SpeciesCategoryDAO speciesCategoryDAO = + getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); + + Reader reader = getInputFileReader(inputFile); + + try { + Import<LengthWeightKeyImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); + for (LengthWeightKeyImportModelRow row : importer) { + + configuration.incrementsProgression(); + Voyage voyage = row.getVoyage(); + + LengthWeightKey lengthWeightKeyToCreate = + row.getLengthWeightKey(); + LengthWeightKey lengthWeightKey = create( + dao, lengthWeightKeyToCreate); + + //TODO should we import it ? + //lengthWeightKey.setMetadata(row.getMetadata()); + + Species species = row.getSpecies(); + SizeCategory sizeCategory = row.getSizeCategory(); + + // find speciesCategory + SpeciesCategory speciesCategory = getSpeciesCategory( + speciesCategoryDAO, + species, + sizeCategory, + null, + null, + importResult + ); + + lengthWeightKey.setSpeciesCategory(speciesCategory); + + // attach it to voyage + voyage.addLengthWeightKey(lengthWeightKey); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.LengthWeightKey); + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + protected CsvFileImportResult importLenthAgeKey( + ResultsImportConfiguration configuration, + InputFile inputFile, + Map<String, Voyage> voyageMap, + Map<String, Species> speciesMap) throws ImportException { + + if (log.isInfoEnabled()) { + log.info("Starts import of lenthAgeKey from file " + + inputFile.getFileName()); + } + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + Map<String, Strata> strataMap = getEntitiesMap( + Strata.class, EchoBaseFunctions.STRATA_BY_NAME); + + LengthAgeKeyImportModel csvModel = new LengthAgeKeyImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + voyageMap, + strataMap, + speciesMap); + + TopiaDAO<LengthAgeKey> dao = getDAO(LengthAgeKey.class); + + Reader reader = getInputFileReader(inputFile); + try { + Import<LengthAgeKeyImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); + + for (LengthAgeKeyImportModelRow row : importer) { + + configuration.incrementsProgression(); + + Voyage voyage = row.getVoyage(); + + LengthAgeKey lengthAgeKeyToCreate = row.getLengthAgeKey(); + LengthAgeKey lengthAgeKey = create(dao, lengthAgeKeyToCreate); + + // attach it to voyage + voyage.addLengthAgeKey(lengthAgeKey); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.LengthAgeKey); + } + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + + private CsvFileImportResult importEchotypeFile( + ResultsImportConfiguration configuration, + InputFile inputFile, + Map<String, Voyage> voyageMap, + Map<String, Species> speciesMap) throws ImportException { + + if (log.isInfoEnabled()) { + log.info("Starts import of echotype from file " + + inputFile.getFileName()); + } + + CsvFileImportResult importResult = new CsvFileImportResult( + inputFile.getFileName()); + + Map<String, DepthStratum> depthStratumMap = getEntitiesMap( + DepthStratum.class, + EchoBaseFunctions.DEPTH_STRATUM_ID); + + EchotypeImportModel csvModel = new EchotypeImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + voyageMap, + depthStratumMap, + speciesMap); + + TopiaDAO<Echotype> dao = getDAO(Echotype.class); + + Reader reader = getInputFileReader(inputFile); + try { + Import<EchotypeImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + configuration.incrementsProgression(); + + for (EchotypeImportModelRow row : importer) { + + configuration.incrementsProgression(); + + Voyage voyage = row.getVoyage(); + + Echotype rowEchotype = row.getEchotype(); + + String echotypeName = rowEchotype.getName(); + + // check if there is a echotype for the voyage and this name + Echotype echotype = null; + + if (!voyage.isEchotypeEmpty()) { + + Collection<Echotype> echotypes = voyage.getEchotype(); + Predicate<Echotype> predicate = + EchoBasePredicates.newEchotypeByNamePredicate( + echotypeName); + echotype = Iterables.find(echotypes, predicate, null); + + } + + if (echotype == null) { + + // creates it + echotype = create(dao, rowEchotype); + + // attach it to voyage + voyage.addEchotype(echotype); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Echotype); + + } else { + + Species species = rowEchotype.getSpecies().iterator().next(); + Species existingSpecie = + echotype.getSpeciesByTopiaId(species.getTopiaId()); + + if (existingSpecie == null) { + + // add this species + echotype.addSpecies(species); + } + } + } + + return importResult; + } catch (ImportRuntimeException e) { + throw new ImportException(getLocale(), inputFile, e); + } finally { + closeReader(reader, inputFile); + } + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-03-27 17:39:50 UTC (rev 416) @@ -1,5 +1,3 @@ -csv.import.error.missingMandatoryHeaders= -csv.import.error.unrecognizedHeaders= echobase.common.acousticByEchotypeAndSpeciesCategoryFile= echobase.common.acousticByEchotypeFile= echobase.common.acousticBySpeciesAndAgeCategoryFile= @@ -30,6 +28,7 @@ echobase.common.operationMetadataFile= echobase.common.resultsImportMode.acoustic.byEchotype= echobase.common.resultsImportMode.acoustic.byEchotypeAndSpeciesCategory= +echobase.common.resultsImportMode.acoustic.bySpeciesAndAgeCategory= echobase.common.resultsImportMode.acoustic.bySpeciesAndSizeCategory= echobase.common.resultsImportMode.map= echobase.common.resultsImportMode.region= Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-03-27 17:39:50 UTC (rev 416) @@ -1,9 +1,7 @@ -csv.import.error.missingMandatoryHeaders= -csv.import.error.unrecognizedHeaders= echobase.common.acousticByEchotypeAndSpeciesCategoryFile=Fichier d'import echobase.common.acousticByEchotypeFile=Fichier d'import -echobase.common.acousticBySpeciesAndAgeCategoryFile= -echobase.common.acousticBySpeciesAndSizeCategoryFile= +echobase.common.acousticBySpeciesAndAgeCategoryFile=Fichier d'import +echobase.common.acousticBySpeciesAndSizeCategoryFile=Fichier d'import echobase.common.biometrySampleFile=Fichier BiometrySample echobase.common.cellMapResultFile=Fichier de résultats de cellules Carte echobase.common.cellMapsFile=Fichier des cellules Cartes @@ -30,7 +28,8 @@ echobase.common.operationMetadataFile=Fichier Méta-données opération echobase.common.resultsImportMode.acoustic.byEchotype=Import des résultats acoustiques par echotype echobase.common.resultsImportMode.acoustic.byEchotypeAndSpeciesCategory=Import des résultats acoustiques par echotype et catégorie d'espèce -echobase.common.resultsImportMode.acoustic.bySpeciesAndSizeCategory= +echobase.common.resultsImportMode.acoustic.bySpeciesAndAgeCategory=Import des résultats acoustiques par espèce et catégorie d'age +echobase.common.resultsImportMode.acoustic.bySpeciesAndSizeCategory=Import des résultats acoustiques par espèce et catégorie de taille echobase.common.resultsImportMode.map=Import des cellules de type Carte echobase.common.resultsImportMode.region=Import des cellules de type Région echobase.common.resultsImportMode.voyage=Import des résultats du voyage Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-03-27 17:39:50 UTC (rev 416) @@ -30,7 +30,9 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserImpl; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.configurations.ProgressionModel; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -41,10 +43,12 @@ import org.nuiton.util.StringUtil; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; import java.util.Set; +import java.util.zip.GZIPInputStream; /** * Nice test service support. @@ -79,24 +83,56 @@ return fakeServiceContext.getTestDir(); } + public void assertConfProgressionToEnd(ProgressionModel conf) { + Assert.assertEquals(100f, conf.getProgression(), 1); + } + protected void prepareInputFile(InputFile inputFile, String... path) throws IOException { String filename = path[path.length - 1]; String resourcePath = StringUtil.join(Arrays.asList(path), "/", true); - InputStream inputStream = - getClass().getResourceAsStream(resourcePath); - Preconditions.checkNotNull(inputStream, "Could not find resource at " + resourcePath); - File testDir = getTestDir(); - File newFile = new File(testDir, filename); - FileUtils.copyInputStreamToFile( - inputStream, - newFile - ); - inputFile.setFileName(filename); - inputFile.setFile(newFile); + InputStream inputStream = getClass().getResourceAsStream(resourcePath); + try { + Preconditions.checkNotNull(inputStream, + "Could not find resource at " + resourcePath); + File testDir = getTestDir(); - if (log.isDebugEnabled()) { - log.debug("Copy file to " + newFile); + File newFile; + + if (filename.endsWith(".gz")) { + + // gzipped file + + filename = filename.substring(0, filename.length() - 3); + newFile = new File(testDir, filename); + + FileOutputStream outputStream = FileUtils.openOutputStream(newFile); + try { + IOUtils.copy(new GZIPInputStream(inputStream), outputStream); + } finally { + outputStream.close(); + } + + } else { + + // non gzipped file + + newFile = new File(testDir, filename); + + FileUtils.copyInputStreamToFile( + inputStream, + newFile + ); + } + + inputFile.setFileName(filename); + inputFile.setFile(newFile); + + if (log.isDebugEnabled()) { + log.debug("Copy file to " + newFile); + } + } finally { + inputStream.close(); } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -23,6 +23,9 @@ */ package fr.ifremer.echobase.services.importdata; +import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.DataAcquisition; @@ -39,8 +42,18 @@ import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; +import fr.ifremer.echobase.services.ImportException; +import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.TimeLog; +import java.util.List; + /** * Abstrac import data test. * @@ -49,6 +62,12 @@ */ public abstract class AbstractImportDataServiceIT extends EchoBaseTestServiceSupport { + /** Logger. */ + private static final Log log = + LogFactory.getLog(AbstractImportDataServiceIT.class); + + public static final TimeLog TIME_LOG = new TimeLog(AbstractImportDataServiceIT.class); + public static final String IMPORT_DATA_ECHOBASE_NO_DATA = "/import-data/echobase-0.3-nodata.h2.db.gz"; public static final String IMPORT_DATA_ECHOBASE_COMMON_DATA = "/import-data/echobase-0.3-commonData.h2.db.gz"; @@ -57,10 +76,12 @@ public static final String IMPORT_DATA_ECHOBASE_CATCHES = "/import-data/echobase-0.3-catches.h2.db.gz"; - public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC = "/import-data/echobase-0.3-catches-and-acoustic.h2.db.gz"; + public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT = "/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz"; - public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT = "/import-data/echobase-0.3-catches-and-acoustic-and-voyage-result.h2.db.gz"; +// public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC = "/import-data/echobase-0.3-catches-and-acoustic.h2.db.gz"; +// public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT = "/import-data/echobase-0.3-catches-and-acoustic-and-voyage-result.h2.db.gz"; + public static final String VESSEL_ID = "fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855"; public static final String MISSION_ID = "fr.ifremer.echobase.entities.references.Mission#1323127544274#0.7939481378378231"; @@ -113,9 +134,9 @@ public static final int NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES = 396990; - public static final int NB_ESDU_RESULT_BY_SPECIES_AND_SIZE_CATEGORY = 8; + public static final int NB_ESDU_RESULT_BY_SPECIES_AND_SIZE_CATEGORY = 68108; - public static final int NB_ESDU_RESULT_BY_SPECIES_AND_AGE_CATEGORY = 8; + public static final int NB_ESDU_RESULT_BY_SPECIES_AND_AGE_CATEGORY = 10021; public void assertImportCommonData() throws TopiaException { assertNbEntities(Voyage.class, NB_VOYAGE); @@ -141,10 +162,49 @@ assertNbEntities(Data.class, NB_DATA); } - public void assertImportVoyageResult() throws TopiaException { assertNbEntities(LengthAgeKey.class, NB_LENGTH_AGE_KEY); assertNbEntities(LengthWeightKey.class, NB_LENGTH_WEIGHT_KEY); assertNbEntities(Echotype.class, NB_ECHOTYPE); } + + protected <M extends AbstractImportConfiguration, S extends AbstractImportDataService<M>> + List<CsvFileImportResult> doImport(M conf, Class<S> serviceType, int nbResults) throws ImportException { + + long s0 = TimeLog.getTime(); + + long nbSteps = conf.computeNbSteps(); + + if (log.isInfoEnabled()) { + log.info("Nb lines to import " + nbSteps); + } + + TIME_LOG.log(s0, "prepareConfigurationSteps"); + + s0 = TimeLog.getTime(); + + S service = getService(serviceType); + + EchoBaseUser fakeUser = createFakeUser(); + + List<CsvFileImportResult> result = service.doImport(conf, fakeUser); + + TIME_LOG.log(s0, "doImport"); + + Assert.assertNotNull(result); + Assert.assertEquals(nbResults, result.size()); + assertConfProgressionToEnd(conf); + + return result; + } + + protected <E extends TopiaEntity> E create(TopiaDAO<E> dao, + Object... properties) { + try { + E result = dao.create(properties); + return result; + } catch (TopiaException e) { + throw new EchoBaseTechnicalException("Could not create entity", e); + } + } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AcousticDataImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -24,11 +24,14 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.data.Cell; 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.services.FakeEchoBaseServiceContext; +import fr.ifremer.echobase.services.ImportException; +import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; import fr.ifremer.echobase.services.configurations.AcousticDataImportConfiguration; import fr.ifremer.echobase.services.configurations.CellPositionReference; import org.junit.Assert; @@ -84,16 +87,11 @@ conf.setSoundSpeedCalculationsME70("soundSpeedCalculationsME70"); conf.setTransceiverAcquisitionAbsorptionDescription("transceiverAcquisitionAbsorptionDescription"); - prepareInputFile(conf.getMoviesFile(), getImportPath("movies.csv")); + prepareInputFile(conf.getMoviesFile(), getImportPath("movies.csv.gz")); - AcousticDataImportService service = - getService(AcousticDataImportService.class); + List<CsvFileImportResult> result = doImport( + conf, AcousticDataImportService.class, 1); - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); CsvFileImportResult importResult = result.get(0); assertCsvImportResult(importResult, DataAcquisition.class, NB_DATA_ACQUISITION); assertCsvImportResult(importResult, DataProcessing.class, NB_DATA_PROCESSING); @@ -103,4 +101,6 @@ assertImportAcousticDatas(); } + + } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesDataImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -28,7 +28,6 @@ import fr.ifremer.echobase.entities.data.SampleData; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; -import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -64,20 +63,16 @@ conf.setVoyageId(getVoyageId()); prepareInputFile(conf.getTotalSampleFile(), - getImportPath("totalsample.csv")); + getImportPath("totalsample.csv.gz")); prepareInputFile(conf.getSubSampleFile(), - getImportPath("subsample.csv")); + getImportPath("subsample.csv.gz")); prepareInputFile(conf.getBiometrySampleFile(), - getImportPath("biometrysample.csv")); + getImportPath("biometrysample.csv.gz")); - CatchesDataImportService service = - getService(CatchesDataImportService.class); - List<CsvFileImportResult> result = service.doImport(conf, - createFakeUser()); + List<CsvFileImportResult> result = doImport( + conf, CatchesDataImportService.class, 3); - Assert.assertNotNull(result); - Assert.assertEquals(3, result.size()); Iterator<CsvFileImportResult> iterator = result.iterator(); CsvFileImportResult importResult; @@ -108,16 +103,11 @@ conf.setVoyageId(getVoyageId()); prepareInputFile(conf.getTotalSampleFile(), - getImportPath("totalsample.csv")); + getImportPath("totalsample.csv.gz")); - CatchesDataImportService service = - getService(CatchesDataImportService.class); + List<CsvFileImportResult> result = doImport( + conf, CatchesDataImportService.class, 1); - List<CsvFileImportResult> result = service.doImport(conf, - createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); CsvFileImportResult importResult = result.get(0); assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_TOTAL); assertCsvImportResult(importResult, SampleData.class, NB_SAMPLE_DATA_TOTAL); @@ -137,16 +127,11 @@ conf.setVoyageId(getVoyageId()); prepareInputFile(conf.getSubSampleFile(), - getImportPath("subsample.csv")); + getImportPath("subsample.csv.gz")); - CatchesDataImportService service = - getService(CatchesDataImportService.class); + List<CsvFileImportResult> result = doImport( + conf, CatchesDataImportService.class, 1); - List<CsvFileImportResult> result = service.doImport(conf, - createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); Iterator<CsvFileImportResult> iterator = result.iterator(); CsvFileImportResult importResult = iterator.next(); assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_UNSORTED); @@ -167,15 +152,11 @@ conf.setVoyageId(getVoyageId()); prepareInputFile(conf.getBiometrySampleFile(), - getImportPath("biometrysample.csv")); + getImportPath("biometrysample.csv.gz")); - CatchesDataImportService service = - getService(CatchesDataImportService.class); - List<CsvFileImportResult> result = service.doImport(conf, - createFakeUser()); + List<CsvFileImportResult> result = doImport( + conf, CatchesDataImportService.class, 1); - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); Iterator<CsvFileImportResult> iterator = result.iterator(); CsvFileImportResult importResult = iterator.next(); assertCsvImportResult(importResult, Sample.class, NB_SAMPLE_BIOMETRY); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonData2ImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -29,7 +29,6 @@ import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.configurations.CommonDataImportConfiguration; import fr.ifremer.echobase.services.configurations.CommonDataImportMode; -import org.junit.Assert; import org.junit.Test; import java.util.Iterator; @@ -47,6 +46,10 @@ return new FakeEchoBaseServiceContext(IMPORT_DATA_ECHOBASE_COMMON_DATA); } + protected String[] getImportPath(String filename) { + return new String[]{"/import-data", "commonData", filename}; + } + @Test public void doImport() throws Exception { @@ -64,20 +67,18 @@ conf.setTransectGeospatialVerticalPositive("transectGeospatialVerticalPositive"); conf.setTransectLicence("transectLicence"); - prepareInputFile(conf.getTransectFile(), getImportPath("transect.csv")); + prepareInputFile(conf.getTransectFile(), getImportPath("transect.csv.gz")); conf.setImportMode(CommonDataImportMode.TRANSECT); - CommonDataImportService service = - getService(CommonDataImportService.class); - // let's delete every transects for (Transit transit : getEntities(Transit.class)) { transit.clearTransect(); } - List<CsvFileImportResult> result = service.doImport(conf, createFakeUser()); - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); + + List<CsvFileImportResult> result = doImport( + conf, CommonDataImportService.class, 1); + Iterator<CsvFileImportResult> iterator = result.iterator(); assertCsvImportResult(iterator.next(), Transect.class, NB_TRANSECT); @@ -85,8 +86,4 @@ assertImportCommonData(); } - protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "commonData", filename}; - } - } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonDataImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -30,7 +30,6 @@ import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.configurations.CommonDataImportConfiguration; import fr.ifremer.echobase.services.configurations.CommonDataImportMode; -import org.junit.Assert; import org.junit.Test; import java.util.Iterator; @@ -50,6 +49,10 @@ IMPORT_DATA_ECHOBASE_NO_DATA); } + protected String[] getImportPath(String filename) { + return new String[]{"/import-data", "commonData", filename}; + } + @Test public void doImport() throws Exception { @@ -71,20 +74,15 @@ conf.setTransitRelatedActivity("transitRelatedActivity"); conf.setVoyageDescription("voyageDescription"); - prepareInputFile(conf.getVoyageFile(), getImportPath("voyage.csv")); - prepareInputFile(conf.getTransitFile(), getImportPath("transit.csv")); - prepareInputFile(conf.getTransectFile(), getImportPath("transect.csv")); + prepareInputFile(conf.getVoyageFile(), getImportPath("voyage.csv.gz")); + prepareInputFile(conf.getTransitFile(), getImportPath("transit.csv.gz")); + prepareInputFile(conf.getTransectFile(), getImportPath("transect.csv.gz")); conf.setImportMode(CommonDataImportMode.ALL); - CommonDataImportService service = - getService(CommonDataImportService.class); + List<CsvFileImportResult> result = doImport( + conf, CommonDataImportService.class, 3); - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(3, result.size()); Iterator<CsvFileImportResult> iterator = result.iterator(); assertCsvImportResult(iterator.next(), Voyage.class, NB_VOYAGE); assertCsvImportResult(iterator.next(), Transit.class, NB_TRANSIT); @@ -93,8 +91,4 @@ assertImportCommonData(); } - protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "commonData", filename}; - } - } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/OperationImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -29,7 +29,6 @@ import fr.ifremer.echobase.entities.data.OperationMetadataValue; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import fr.ifremer.echobase.services.configurations.OperationImportConfiguration; -import org.junit.Assert; import org.junit.Test; import java.util.Iterator; @@ -66,19 +65,15 @@ conf.setVoyageId(getVoyageId()); prepareInputFile(conf.getOperationFile(), - getImportPath("operation.csv")); + getImportPath("operation.csv.gz")); prepareInputFile(conf.getOperationMetadataFile(), - getImportPath("operationmetadatavalue.csv")); + getImportPath("operationmetadatavalue.csv.gz")); prepareInputFile(conf.getGearMetadataFile(), - getImportPath("gearmetadatavalue.csv")); + getImportPath("gearmetadatavalue.csv.gz")); - OperationImportService service = - getService(OperationImportService.class); + List<CsvFileImportResult> result = doImport( + conf, OperationImportService.class, 3); - List<CsvFileImportResult> result = service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(3, result.size()); Iterator<CsvFileImportResult> iterator = result.iterator(); assertCsvImportResult(iterator.next(), Operation.class, NB_OPERATION); assertCsvImportResult(iterator.next(), OperationMetadataValue.class, NB_OPERATION_METADATAVALUE); Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java (from rev 410, trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -0,0 +1,346 @@ +/* + * #%L + * EchoBase :: Services + * + * $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.services.importdata; + +import com.google.common.collect.Collections2; +import com.google.common.collect.Sets; +import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.csv.AbstractImportModel; +import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.csv.EchoBaseImport; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.CellDAO; +import fr.ifremer.echobase.entities.data.DataAcquisition; +import fr.ifremer.echobase.entities.data.DataProcessing; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.AgeCategory; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; +import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; +import fr.ifremer.echobase.services.configurations.ResultsImportMode; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; +import org.nuiton.topia.TopiaException; + +import java.io.File; +import java.io.Reader; +import java.util.List; +import java.util.Set; +import java.util.regex.Matcher; + +/** + * Test import of esdu results. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ResultsEsduCellImportServiceIT extends AbstractImportDataServiceIT { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ResultsEsduCellImportServiceIT.class); + + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext( + IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT); + } + + protected String[] getImportPath(String filename) { + return new String[]{"/import-data", "result", filename}; + } + + @Test + public void doImportEsduResultByEchotype() throws Exception { + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + assertImportVoyageResult(); + + assertNoEntities(Result.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setResultLabel("resultLabel"); + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_ECHOTYPE); + + prepareInputFile(conf.getAcousticByEchotypeFile(), + getImportPath("acousticResultByEchotype.csv.gz")); + + addMissingEsduCells(conf.getVoyageId(), + conf.getAcousticByEchotypeAndSpeciesCategoryFile() + ); + + List<CsvFileImportResult> result = doImport( + conf, ResultsEsduCellImportService.class, 1); + + assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE); + } + + @Test + public void doImportEsduResultByEchotypeAndSpecies() throws Exception { + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + assertImportVoyageResult(); + + assertNoEntities(Result.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setResultLabel("resultLabel"); + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY); + + prepareInputFile(conf.getAcousticByEchotypeAndSpeciesCategoryFile(), + getImportPath("acousticResultByEchotypeAndSpeciesCategory.csv.gz")); + + addMissingEsduCells(conf.getVoyageId(), + conf.getAcousticByEchotypeAndSpeciesCategoryFile() + ); + + //TODO Remove this when referentiel is ok + create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "SigmaSp"); + create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "RegionID"); + create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondBiomass"); + create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondAbundance"); + + + List<CsvFileImportResult> result = doImport( + conf, ResultsEsduCellImportService.class, 1); + + assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); + } + + @Test + public void doImportEsduResultBySpeciesAndSizeCategory() throws Exception { + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + assertImportVoyageResult(); + + assertNoEntities(Result.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setResultLabel("resultLabel"); + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY); + + prepareInputFile(conf.getAcousticBySpeciesAndSizeCategoryFile(), + getImportPath("acousticResultBySpeciesAndSizeCategory.csv.gz")); + + addMissingEsduCells(conf.getVoyageId(), + conf.getAcousticBySpeciesAndSizeCategoryFile() + ); + + List<CsvFileImportResult> result = doImport( + conf, ResultsEsduCellImportService.class, 1); + + assertCsvImportResult(result.get(0), Result.class, + NB_ESDU_RESULT_BY_SPECIES_AND_SIZE_CATEGORY); + } + + @Test + public void doImportEsduResultBySpeciesAndAgeCategory() throws Exception { + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + assertImportVoyageResult(); + + assertNoEntities(Result.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setResultLabel("resultLabel"); + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY); + + prepareInputFile(conf.getAcousticBySpeciesAndAgeCategoryFile(), + getImportPath("acousticResultBySpeciesAndAgeCategory.csv.gz")); + + addMissingEsduCells(conf.getVoyageId(), + conf.getAcousticBySpeciesAndSizeCategoryFile() + ); + + //TODO Remove this when referentiel is ok + create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "N"); + + List<CsvFileImportResult> result = doImport( + conf, ResultsEsduCellImportService.class, 1); + + CsvFileImportResult actual = result.get(0); + assertCsvImportResult(actual, Result.class, NB_ESDU_RESULT_BY_SPECIES_AND_AGE_CATEGORY); + assertCsvImportResult(actual, AgeCategory.class, 10); + } + + protected void addMissingEsduCells(String voyageId, + InputFile inputFile) throws TopiaException { + + ResultsImportService service = + getService(ResultsImportService.class); + Voyage voyage = getEntityById(Voyage.class, voyageId); + Transit transit; + Transect transect; + DataAcquisition dataAcquisition; + DataProcessing dataProcessing; + + if (voyage.isTransitEmpty()) { + + // create a fake transit + transit = create(getDAO(Transit.class)); + voyage.addTransit(transit); + } else { + transit = voyage.getTransit().get(0); + } + + if (transit.isTransectEmpty()) { + + // create a fake transect + transect = create(getDAO(Transect.class)); + transit.addTransect(transect); + } else { + transect = transit.getTransect().get(0); + } + + if (transect.isDataAcquisitionEmpty()) { + + // create a fake dataAcquisition + dataAcquisition = create(getDAO(DataAcquisition.class)); + transect.addDataAcquisition(dataAcquisition); + } else { + dataAcquisition = transect.getDataAcquisition().iterator().next(); + } + + if (dataAcquisition.isDataProcessingEmpty()) { + + // creates a fake dataProcessing + dataProcessing = create(getDAO(DataProcessing.class)); + dataAcquisition.addDataProcessing(dataProcessing); + } else { + dataProcessing = dataAcquisition.getDataProcessing().iterator().next(); + } + + CellDAO dao = (CellDAO) getDAO(Cell.class); + + Set<String> cellsNames; + + if (dataProcessing.isCellEmpty()) { + cellsNames = Sets.newHashSet(); + } else { + cellsNames = Sets.newHashSet(Collections2.transform( + dataProcessing.getCell(), EchoBaseFunctions.CELL_BY_NAME)); + } + + ResultEdsuImportMockImportModel csvModel = new ResultEdsuImportMockImportModel( + serviceContext.getConfiguration().getCsvSeparator(), + inputFile.getFile()); + + Reader reader = service.getInputFileReader(inputFile); + try { + EchoBaseImport<ResultEdsuImportMockImportModelRow> importer = + EchoBaseImport.newImport(csvModel, reader); + + for (ResultEdsuImportMockImportModelRow row : importer) { + + String esduCellId = row.getName(); + + if (!cellsNames.contains(esduCellId)) { + + if (log.isDebugEnabled()) { + log.debug("Adding missing esdu cell with name " + + esduCellId); + } + + Cell cell = dao.create(Cell.PROPERTY_NAME, esduCellId); + dataProcessing.addCell(cell); + cellsNames.add(esduCellId); + } + } + + flushTransaction(); + } finally { + + + service.closeReader(reader, inputFile); + } + } + + public static class ResultEdsuImportMockImportModel extends AbstractImportModel<ResultEdsuImportMockImportModelRow> { + + public ResultEdsuImportMockImportModel(char separator, File file) { + super(separator); + + newMandatoryColumn("name"); + + String[] header = EchoBaseImport.getHeader(file, separator); + + for (String columnHeader : header) { + + if (!"name".equals(columnHeader) && + !"\"name\"".equals(columnHeader)) { + Matcher matcher = ResultsEsduCellImportService.REMOVE_DOUBLE_QUOTES_PATTERN.matcher(columnHeader); + if (matcher.matches()) { + newIgnoredColumn(matcher.group(1)); + } else { + newIgnoredColumn(columnHeader); + } + } + } + } + + @Override + public ResultEdsuImportMockImportModelRow newEmptyInstance() { + return new ResultEdsuImportMockImportModelRow(); + } + + } + + public static class ResultEdsuImportMockImportModelRow { + + protected String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -1,336 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.importdata; - -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; -import fr.ifremer.echobase.csv.CellValueParser; -import fr.ifremer.echobase.csv.CsvFileImportResult; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.CellDAO; -import fr.ifremer.echobase.entities.data.DataAcquisition; -import fr.ifremer.echobase.entities.data.DataProcessing; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.data.Transit; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DataMetadata; -import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.configurations.ResultsImportMode; -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.nuiton.topia.TopiaException; -import org.nuiton.util.StringUtil; - -import java.io.IOException; -import java.io.InputStream; -import java.text.ParseException; -import java.util.Arrays; -import java.util.List; - -/** - * Test import of esdu results. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ResultsEsduImportServiceIT extends AbstractImportDataServiceIT { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(ResultsEsduImportServiceIT.class); - - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext( - IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT); - } - - protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "result", filename}; - } - - @Test - public void doImportEsduResultByEchotype() throws Exception { - - assertImportCommonData(); - assertImportOperations(); - assertImportAcousticDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setResultLabel("resultLabel"); - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_ECHOTYPE); - - prepareInputFile(conf.getAcousticByEchotypeFile(), - getImportPath("acousticResultByEchotype.csv")); - - //TODO Remove this when acoustic data will be ok - addMissingEsduCells(conf); - - ResultsImportService service = - getService(ResultsImportService.class); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE); - } - - @Ignore - @Test - public void doImportEsduResultByEchotypeAndSpecies() throws Exception { - - assertImportCommonData(); - assertImportOperations(); - assertImportAcousticDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setResultLabel("resultLabel"); - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_ECHOTYPE_AND_SPECIES_CATEGORY); - - prepareInputFile(conf.getAcousticByEchotypeAndSpeciesCategoryFile(), - getImportPath("acousticResultByEchotypeAndSpeciesCategory.csv")); - - //TODO Remove this when acoustic data will be ok - addMissingEsduCells(conf); - - ResultsImportService service = - getService(ResultsImportService.class); - - service.create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "SigmaSp"); - service.create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "RegionID"); - service.create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondBiomass"); - service.create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondAbundance"); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); - } - - @Ignore - @Test - public void doImportEsduResultBySpeciesAndsizeCategory() throws Exception { - - assertImportCommonData(); - assertImportOperations(); - assertImportAcousticDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setResultLabel("resultLabel"); - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_SPECIES_AND_SIZE_CATEGORY); - - prepareInputFile(conf.getAcousticBySpeciesAndSizeCategoryFile(), - getImportPath("acousticResultBySpeciesAndSizeCategory.csv")); - - //TODO Remove this when acoustic data will be ok - addMissingEsduCells(conf); - - ResultsImportService service = - getService(ResultsImportService.class); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_SPECIES_AND_SIZE_CATEGORY); - } - - @Ignore - @Test - public void doImportEsduResultBySpeciesAndAgeCategory() throws Exception { - - assertImportCommonData(); - assertImportOperations(); - assertImportAcousticDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setResultLabel("resultLabel"); - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ACOUSTIC_BY_SPECIES_AND_AGE_CATEGORY); - - prepareInputFile(conf.getAcousticBySpeciesAndAgeCategoryFile(), - getImportPath("acousticResultBySpeciesAndAgeCategory.csv")); - - //TODO Remove this when acoustic data will be ok - addMissingEsduCells(conf); - - ResultsImportService service = - getService(ResultsImportService.class); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_SPECIES_AND_AGE_CATEGORY); - } - - @Ignore - @Test - public void doImportRegion() throws Exception { - - //TODO - - assertImportCommonData(); - assertImportOperations(); - assertImportAcousticDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setResultLabel("resultLabel"); - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.REGION); - - prepareInputFile(conf.getRegionsFile(), - getImportPath("regions.csv")); - prepareInputFile(conf.getRegionAssociationFile(), - getImportPath("regionAssociations.csv")); - prepareInputFile(conf.getRegionsFile(), - getImportPath("regionResults.csv")); - - - ResultsImportService service = - getService(ResultsImportService.class); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); - } - - @Ignore - @Test - public void doImportMap() throws Exception { - - //TODO - - assertImportCommonData(); - assertImportOperations(); - assertImportAcousticDatas(); - assertImportVoyageResult(); - - assertNoEntities(Result.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setResultLabel("resultLabel"); - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.MAP); - - prepareInputFile(conf.getAcousticByEchotypeFile(), - getImportPath("acousticResultByEchotypeAndSpecies.csv")); - - ResultsImportService service = - getService(ResultsImportService.class); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); - } - - protected void addMissingEsduCells(ResultsImportConfiguration conf) throws IOException, ParseException, TopiaException { - - String resourcePath = StringUtil.join(Arrays.asList(getImportPath("missingEsdu.txt")), "/", true); - List<String> lines; - InputStream inputStream = getClass().getResourceAsStream(resourcePath); - try { - Preconditions.checkNotNull(inputStream, "Could not find resource at " + resourcePath); - lines = IOUtils.readLines(inputStream); - } finally { - inputStream.close(); - } - - Voyage voyage = getEntityById(Voyage.class, conf.getVoyageId()); - Transit transit = voyage.getTransit().get(0); - Transect transect = transit.getTransect().get(0); - DataAcquisition dataAcquisition = transect.getDataAcquisition().iterator().next(); - DataProcessing dataProcessing = dataAcquisition.getDataProcessing().iterator().next(); - - CellDAO dao = (CellDAO) getDAO(Cell.class); - - ImmutableMap<String, Cell> cellsMap = - Maps.uniqueIndex(dataProcessing.getCell(), - EchoBaseFunctions.CELL_BY_NAME); - - for (String line : lines) { - String esduCellId = CellValueParser.reformatDate(line); - if (!cellsMap.containsKey(esduCellId)) { - - if (log.isWarnEnabled()) { - log.warn("Adding missing esdu cell with name " + esduCellId); - } - } - Cell cell = dao.create(Cell.PROPERTY_NAME, esduCellId); - dataProcessing.addCell(cell); - } - - flushTransaction(); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsImportServiceIT.java 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -1,176 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $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.services.importdata; - -import fr.ifremer.echobase.csv.CsvFileImportResult; -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.FakeEchoBaseServiceContext; -import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; -import fr.ifremer.echobase.services.configurations.ResultsImportMode; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -import java.util.List; - -/** - * Tests {@link ResultsImportService}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public class ResultsImportServiceIT extends AbstractImportDataServiceIT { - - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext( - IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC); - } - - protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "result", filename}; - } - - @Test - public void doImportResultByVoyage() throws Exception { - assertImportCommonData(); - assertNoEntities(LengthAgeKey.class); - assertNoEntities(LengthWeightKey.class); - assertNoEntities(Echotype.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.VOYAGE); - - prepareInputFile(conf.getLengthAgeKeyFile(), - getImportPath("lengthAgeKey.csv")); - prepareInputFile(conf.getLengthWeightKeyFile(), - getImportPath("lengthWeightKey.csv")); - prepareInputFile(conf.getEchotypeFile(), getImportPath("echotype.csv")); - - - ResultsImportService service = - getService(ResultsImportService.class); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(3, result.size()); - assertCsvImportResult(result.get(0), LengthAgeKey.class, - NB_LENGTH_AGE_KEY); - assertCsvImportResult(result.get(1), LengthWeightKey.class, - NB_LENGTH_WEIGHT_KEY); - assertCsvImportResult(result.get(2), Echotype.class, - NB_ECHOTYPE); - - } - - @Ignore - @Test - public void doImportLengthAgeKey() throws Exception { - - assertImportCommonData(); - assertNoEntities(LengthAgeKey.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.VOYAGE); - - prepareInputFile(conf.getLengthAgeKeyFile(), - getImportPath("lengthAgeKey.csv")); - - ResultsImportService service = - getService(ResultsImportService.class); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - assertCsvImportResult(result.get(0), LengthAgeKey.class, - NB_LENGTH_AGE_KEY); - } - - @Ignore - @Test - public void doImportLengthWeightKey() throws Exception { - - assertImportCommonData(); - assertNoEntities(LengthWeightKey.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.VOYAGE); - - prepareInputFile(conf.getLengthWeightKeyFile(), - getImportPath("lengthWeightKey.csv")); - - ResultsImportService service = - getService(ResultsImportService.class); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - assertCsvImportResult(result.get(0), LengthWeightKey.class, - NB_LENGTH_WEIGHT_KEY); - } - - @Ignore - @Test - public void doImportEchotype() throws Exception { - - assertImportCommonData(); - assertNoEntities(Echotype.class); - - ResultsImportConfiguration conf = - new ResultsImportConfiguration(getLocale()); - - conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.VOYAGE); - - prepareInputFile(conf.getEchotypeFile(), getImportPath("echotype.csv")); - - ResultsImportService service = - getService(ResultsImportService.class); - - List<CsvFileImportResult> result = - service.doImport(conf, createFakeUser()); - - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - assertCsvImportResult(result.get(0), Echotype.class, - NB_ECHOTYPE); - } - -} Added: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -0,0 +1,59 @@ +package fr.ifremer.echobase.services.importdata; + +import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; +import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; +import fr.ifremer.echobase.services.configurations.ResultsImportMode; +import org.junit.Ignore; +import org.junit.Test; + +import java.util.List; + +/** + * To test the {@link ResultsMapCellImportService} service. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ResultsMapCellImportServiceIT extends AbstractImportDataServiceIT { + + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext( + IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT); + } + + protected String[] getImportPath(String filename) { + return new String[]{"/import-data", "result", filename}; + } + + @Ignore + @Test + public void doImportMap() throws Exception { + + //TODO + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + assertImportVoyageResult(); + + assertNoEntities(Result.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setResultLabel("resultLabel"); + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.MAP); + + prepareInputFile(conf.getMapsFile(), getImportPath("maps.csv.gz")); + prepareInputFile(conf.getMapResultFile(), getImportPath("mapResult.csv.gz")); + + List<CsvFileImportResult> result = doImport( + conf, ResultsMapCellImportService.class, 1); + + assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); + } + +} \ No newline at end of file Added: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -0,0 +1,63 @@ +package fr.ifremer.echobase.services.importdata; + +import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; +import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; +import fr.ifremer.echobase.services.configurations.ResultsImportMode; +import org.junit.Ignore; +import org.junit.Test; + +import java.util.List; + +/** + * To test the {@link ResultsRegionCellImportService} service. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ResultsRegionCellImportServiceIT extends AbstractImportDataServiceIT { + + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext( + IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT); + } + + protected String[] getImportPath(String filename) { + return new String[]{"/import-data", "result", filename}; + } + + @Ignore + @Test + public void doImportRegion() throws Exception { + + //TODO + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + assertImportVoyageResult(); + + assertNoEntities(Result.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setResultLabel("resultLabel"); + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.REGION); + + prepareInputFile(conf.getRegionsFile(), + getImportPath("regions.csv.gz")); + prepareInputFile(conf.getRegionAssociationFile(), + getImportPath("regionAssociations.csv.gz")); + prepareInputFile(conf.getRegionsFile(), + getImportPath("regionResults.csv.gz")); + + List<CsvFileImportResult> result = doImport( + conf, ResultsRegionCellImportService.class, 1); + + assertCsvImportResult(result.get(0), Result.class, NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES); + } + +} \ No newline at end of file Added: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-03-27 17:39:50 UTC (rev 416) @@ -0,0 +1,144 @@ +package fr.ifremer.echobase.services.importdata; + +import fr.ifremer.echobase.csv.CsvFileImportResult; +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.FakeEchoBaseServiceContext; +import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; +import fr.ifremer.echobase.services.configurations.ResultsImportMode; +import org.junit.Ignore; +import org.junit.Test; + +import java.util.List; + +/** + * To test the {@link ResultsVoyageImportService} service. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ResultsVoyageImportServiceIT extends AbstractImportDataServiceIT { + + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext(IMPORT_DATA_ECHOBASE_CATCHES); + } + + protected String[] getImportPath(String filename) { + return new String[]{"/import-data", "result", filename}; + } + + @Test + public void doImportResultByVoyage() throws Exception { + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + + assertNoEntities(LengthAgeKey.class); + assertNoEntities(LengthWeightKey.class); + assertNoEntities(Echotype.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.VOYAGE); + + prepareInputFile(conf.getLengthAgeKeyFile(), + getImportPath("lengthAgeKey.csv.gz")); + prepareInputFile(conf.getLengthWeightKeyFile(), + getImportPath("lengthWeightKey.csv.gz")); + prepareInputFile(conf.getEchotypeFile(), getImportPath("echotype.csv.gz")); + + List<CsvFileImportResult> result = doImport( + conf, ResultsVoyageImportService.class, 3); + + assertCsvImportResult(result.get(0), LengthAgeKey.class, + NB_LENGTH_AGE_KEY); + assertCsvImportResult(result.get(1), LengthWeightKey.class, + NB_LENGTH_WEIGHT_KEY); + assertCsvImportResult(result.get(2), Echotype.class, + NB_ECHOTYPE); + + } + + @Ignore + @Test + public void doImportLengthAgeKey() throws Exception { + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + + assertNoEntities(LengthAgeKey.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.VOYAGE); + + prepareInputFile(conf.getLengthAgeKeyFile(), + getImportPath("lengthAgeKey.csv.gz")); + + List<CsvFileImportResult> result = doImport( + conf, ResultsVoyageImportService.class, 1); + + assertCsvImportResult(result.get(0), LengthAgeKey.class, + NB_LENGTH_AGE_KEY); + } + + @Ignore + @Test + public void doImportLengthWeightKey() throws Exception { + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + + assertNoEntities(LengthWeightKey.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.VOYAGE); + + prepareInputFile(conf.getLengthWeightKeyFile(), + getImportPath("lengthWeightKey.csv.gz")); + + + List<CsvFileImportResult> result = doImport( + conf, ResultsVoyageImportService.class, 1); + + assertCsvImportResult(result.get(0), LengthWeightKey.class, + NB_LENGTH_WEIGHT_KEY); + } + + @Ignore + @Test + public void doImportEchotype() throws Exception { + + assertImportCommonData(); + assertImportOperations(); + assertImportSampleDatas(); + + assertNoEntities(Echotype.class); + + ResultsImportConfiguration conf = + new ResultsImportConfiguration(getLocale()); + + conf.setVoyageId(getVoyageId()); + conf.setImportMode(ResultsImportMode.VOYAGE); + + prepareInputFile(conf.getEchotypeFile(), getImportPath("echotype.csv.gz")); + + + List<CsvFileImportResult> result = doImport( + conf, ResultsVoyageImportService.class, 1); + + assertCsvImportResult(result.get(0), Echotype.class, NB_ECHOTYPE); + } + +} \ No newline at end of file Deleted: trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,44 +0,0 @@ -"operationID";"baracoudacode";"numFish";"dataLabel";"dataValue";"name" -"P0372";"ENGR-ENC";1;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";2;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";3;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";4;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";5;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";6;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";7;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";8;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";9;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";10;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";11;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";12;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";13;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";14;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";15;"facile à lire";0;"Fiability" -"P0372";"ENGR-ENC";1;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";2;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";3;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";4;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";5;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";6;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";7;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";8;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";9;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";10;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";11;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";12;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";13;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";14;"AZTI + (PP)";3;"Laboratory" -"P0372";"ENGR-ENC";1;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";2;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";3;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";4;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";5;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";6;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";7;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";8;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";9;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";10;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";11;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";12;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";13;"clé Taille/Age : VALIDE";1;"TA" -"P0372";"ENGR-ENC";14;"clé Taille/Age : VALIDE";1;"TA" Added: trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/biometrysample.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,101 +0,0 @@ -"operationID";"baracoudacode";"sizeCategory";"sexCategory";"sampleWeight";"numberSampled";"lengthClass";"numberAtLength";"weightAtLength";"units";"round" -"P0372";"ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;12.5;18;0.24;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;13;36;0.52;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;13.5;42;0.67;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;14;43;0.74;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;14.5;32;0.64;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;15;16;0.37;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;15.5;4;0.09;0;5 -"P0372";"LOPH-BUD";0;"N";0.004;2;5;1;0.00222042663011981;1;1 -"P0372";"LOPH-BUD";0;"N";0.004;2;6;1;0.002;1;1 -"P0372";"MOLA-MOL";0;"N";12.12;3;39;1;0;1;1 -"P0372";"MOLA-MOL";0;"N";12.12;3;40;2;0;1;1 -"P0377";"BOOP-BOO";0;"N";0.52;3;23;1;0.11;1;1 -"P0377";"BOOP-BOO";0;"N";0.52;3;24;1;0.13;1;1 -"P0377";"BOOP-BOO";0;"N";0.52;3;29;1;0.25;1;1 -"P0377";"ENGR-ENC";0;"N";2.07;208;10.5;3;0.03;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;11;24;0.21;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;11.5;62;0.53;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;12;75;0.75;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;12.5;28;0.33;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;13;8;0.08;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;13.5;4;0.06;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;14;3;0.04;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;15;1;0.02;0;5 -"P0377";"ILLE-COI";0;"N";0.29;1;18;1;0;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;16;2;0.05;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;17;1;0.03;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;18;3;0.11;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;19;2;0.08;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;24;2;0.17;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;26;2;0.22;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;27;1;0.12;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;29;5;0.8;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;30;2;0.35;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;31;3;0.59;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;32;1;0.21;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;33;3;0.71;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;34;1;0.26;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;35;5;1.43;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;36;2;0.62;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;37;4;1.35;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;40;2;0.86;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;44;1;0.57;1;1 -"P0378";"ENGR-ENC";0;"N";2.98;249;10.5;2;0.01;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;11;29;0.31;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;11.5;106;1.06;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;12;73;0.96;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;12.5;28;0.4;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;13;5;0.09;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;13.5;3;0.05;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;14;1;0.01;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;14.5;1;0.02;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;15;0;0;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;15.5;1;0.02;0;5 -"P0378";"MERL-MCC";0;"N";5.98;58;15;1;0.02;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;16;0;0;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;17;1;0.03;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;18;4;0.14;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;19;6;0.26;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;20;3;0.15;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;21;9;0.53;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;22;7;0.48;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;23;6;0.47;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;24;5;0.44;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;25;2;0.2;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;47;1;0.7;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;49;2;1.6;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;50;1;0.85;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;52;1;0.96;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;53;1;1.02;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;54;1;1.08;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;67;1;2.1;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;17;1;0.02;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;18;2;0.05;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;19;4;0.13;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;20;6;0.23;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;21;1;0.04;1;1 -"P0377";"SARD-PIL";0;"N";0.86;14;18.5;1;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;19;2;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;20;3;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;20.5;4;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;21;2;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;22.5;1;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;25;1;0;0;5 -"P0377";"SCOM-JAP";0;"N";31.05;100;29;1;0.21;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;30;7;1.56;1;1 -"P0389";"ENGR-ENC";0;"N";3.96;256;11.5;2;0.02;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;12;24;0.27;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;12.5;47;0.6;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;13;65;0.91;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;13.5;49;0.76;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;14;25;0.47;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;14.5;27;0.51;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;15;10;0.22;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;15.5;4;0.1;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;16;2;0.05;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;16.5;0;0;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;17;1;0.03;0;5 -"P0389";"MERL-MCC";0;"N";1.01;9;19;1;0.04;1;1 -"P0389";"MERL-MCC";0;"N";1.01;9;23;1;0.07;1;1 \ No newline at end of file Added: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,4062 +0,0 @@ -"operationID";"baracoudacode";"sizeCategory";"sexCategory";"sampleWeight";"numberSampled";"lengthClass";"numberAtLength";"weightAtLength";"units";"round" -"P0372";"ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;12.5;18;0.24;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;13;36;0.52;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;13.5;42;0.67;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;14;43;0.74;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;14.5;32;0.64;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;15;16;0.37;0;5 -"P0372";"ENGR-ENC";0;"N";3.37;198;15.5;4;0.09;0;5 -"P0372";"LOPH-BUD";0;"N";0.004;2;5;1;0.00222042663011981;1;1 -"P0372";"LOPH-BUD";0;"N";0.004;2;6;1;0.002;1;1 -"P0372";"MOLA-MOL";0;"N";12.12;3;39;1;0;1;1 -"P0372";"MOLA-MOL";0;"N";12.12;3;40;2;0;1;1 -"P0377";"BOOP-BOO";0;"N";0.52;3;23;1;0.11;1;1 -"P0377";"BOOP-BOO";0;"N";0.52;3;24;1;0.13;1;1 -"P0377";"BOOP-BOO";0;"N";0.52;3;29;1;0.25;1;1 -"P0377";"ENGR-ENC";0;"N";2.07;208;10.5;3;0.03;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;11;24;0.21;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;11.5;62;0.53;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;12;75;0.75;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;12.5;28;0.33;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;13;8;0.08;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;13.5;4;0.06;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;14;3;0.04;0;5 -"P0377";"ENGR-ENC";0;"N";2.07;208;15;1;0.02;0;5 -"P0377";"ILLE-COI";0;"N";0.29;1;18;1;0;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;16;2;0.05;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;17;1;0.03;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;18;3;0.11;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;19;2;0.08;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;24;2;0.17;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;26;2;0.22;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;27;1;0.12;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;29;5;0.8;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;30;2;0.35;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;31;3;0.59;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;32;1;0.21;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;33;3;0.71;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;34;1;0.26;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;35;5;1.43;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;36;2;0.62;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;37;4;1.35;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;40;2;0.86;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;44;1;0.57;1;1 -"P0378";"ENGR-ENC";0;"N";2.98;249;10.5;2;0.01;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;11;29;0.31;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;11.5;106;1.06;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;12;73;0.96;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;12.5;28;0.4;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;13;5;0.09;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;13.5;3;0.05;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;14;1;0.01;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;14.5;1;0.02;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;15;0;0;0;5 -"P0378";"ENGR-ENC";0;"N";2.98;249;15.5;1;0.02;0;5 -"P0378";"MERL-MCC";0;"N";5.98;58;15;1;0.02;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;16;0;0;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;17;1;0.03;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;18;4;0.14;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;19;6;0.26;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;20;3;0.15;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;21;9;0.53;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;22;7;0.48;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;23;6;0.47;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;24;5;0.44;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;25;2;0.2;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;47;1;0.7;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;49;2;1.6;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;50;1;0.85;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;52;1;0.96;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;53;1;1.02;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;54;1;1.08;1;1 -"P0377";"MERL-MCC";0;"N";17.2;50;67;1;2.1;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;17;1;0.02;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;18;2;0.05;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;19;4;0.13;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;20;6;0.23;1;1 -"P0377";"MICR-POU";0;"N";0.58;14;21;1;0.04;1;1 -"P0377";"SARD-PIL";0;"N";0.86;14;18.5;1;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;19;2;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;20;3;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;20.5;4;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;21;2;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;22.5;1;0;0;5 -"P0377";"SARD-PIL";0;"N";0.86;14;25;1;0;0;5 -"P0377";"SCOM-JAP";0;"N";31.05;100;29;1;0.21;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;30;7;1.56;1;1 -"P0389";"ENGR-ENC";0;"N";3.96;256;11.5;2;0.02;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;12;24;0.27;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;12.5;47;0.6;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;13;65;0.91;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;13.5;49;0.76;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;14;25;0.47;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;14.5;27;0.51;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;15;10;0.22;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;15.5;4;0.1;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;16;2;0.05;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;16.5;0;0;0;5 -"P0389";"ENGR-ENC";0;"N";3.96;256;17;1;0.03;0;5 -"P0389";"MERL-MCC";0;"N";1.01;9;19;1;0.04;1;1 -"P0389";"MERL-MCC";0;"N";1.01;9;23;1;0.07;1;1 -"P0389";"MERL-MCC";0;"N";1.01;9;24;5;0.44;1;1 -"P0390";"ENGR-ENC";0;"N";4.19;231;11.5;1;0.01;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;12;8;0.1;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;12.5;9;0.12;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;13;54;0.82;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;13.5;45;0.74;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;14;57;1.1;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;14.5;31;0.64;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;15;17;0.38;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;15.5;3;0.07;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;16;5;0.14;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;17;1;0.03;0;5 -"P0390";"ENGR-ENC";0;"N";4.19;231;18;0;NA;0;5 -"P0390";"EUTR-GUR";0;"N";0.73;16;17;1;0.03;1;1 -"P0390";"EUTR-GUR";0;"N";0.52;16;17;1;0.03;1;1 -"P0390";"EUTR-GUR";0;"N";0.73;16;21;1;0.07;1;1 -"P0390";"EUTR-GUR";0;"N";0.52;16;21;1;0.07;1;1 -"P0390";"EUTR-GUR";0;"N";0.73;16;22;3;0.25;1;1 -"P0390";"EUTR-GUR";0;"N";0.52;16;22;3;0.25;1;1 -"P0390";"EUTR-GUR";0;"N";0.73;16;23;1;0.09;1;1 -"P0390";"EUTR-GUR";0;"N";0.52;16;23;1;0.09;1;1 -"P0390";"EUTR-GUR";0;"N";0.73;16;24;1;0.11;1;1 -"P0390";"EUTR-GUR";0;"N";0.52;16;24;1;0.11;1;1 -"P0390";"EUTR-GUR";0;"N";0.73;16;46;1;0.87;1;1 -"P0390";"EUTR-GUR";0;"N";0.52;16;46;1;0.87;1;1 -"P0390";"MERL-MCC";0;"N";0.35;4;20;1;0.05;1;1 -"P0390";"MERL-MCC";0;"N";0.35;4;22;1;0.06;1;1 -"P0390";"MERL-MCC";0;"N";0.35;4;24;1;0.08;1;1 -"P0390";"MERL-MCC";0;"N";0.35;4;25;1;0.1;1;1 -"P0390";"MOLA-MOL";0;"N";6.66;2;38;1;3.52;1;1 -"P0390";"MOLA-MOL";0;"N";6.66;2;39;1;3.14;1;1 -"P0390";"MUST-AST";0;"F";1.27;2;66;1;0;1;1 -"P0390";"MUST-AST";0;"M";1.35;2;69;1;0;1;1 -"P0390";"MUST-AST";0;"M";1.35;2;68;0;NA;1;1 -"P0390";"SARD-PIL";0;"N";6;105;15.5;1;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;16;3;0;0;5 -"P0379";"ENGR-ENC";0;"N";2.28;142;11;1;0.01;0;5 -"P0379";"ENGR-ENC";0;"N";2.28;142;11.5;2;0.02;0;5 -"P0379";"ENGR-ENC";0;"N";2.28;142;12;10;0.12;0;5 -"P0379";"ENGR-ENC";0;"N";2.28;142;12.5;27;0.34;0;5 -"P0379";"ENGR-ENC";0;"N";2.28;142;13;44;0.69;0;5 -"P0379";"ENGR-ENC";0;"N";2.28;142;13.5;26;0.44;0;5 -"P0379";"ENGR-ENC";0;"N";2.28;142;14;18;0.34;0;5 -"P0379";"ENGR-ENC";0;"N";2.28;142;14.5;8;0.16;0;5 -"P0379";"ENGR-ENC";0;"N";2.28;142;15;6;0.14;0;5 -"P0379";"EUTR-GUR";0;"N";0.34;3;23;1;0.09;1;1 -"P0379";"EUTR-GUR";0;"N";0.34;3;24;0;0;1;1 -"P0379";"EUTR-GUR";0;"N";0.34;3;25;1;0.12;1;1 -"P0379";"EUTR-GUR";0;"N";0.34;3;28;1;0.18;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;18;1;0.03;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;22;1;0.06;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;23;2;0.15;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;24;1;0.08;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;27;1;0.12;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;30;3;0.53;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;32;1;0.21;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;35;1;0.28;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;38;1;0.36;1;1 -"P0379";"MERL-MCC";0;"N";2.54;13;42;1;0.5;1;1 -"P0379";"SARD-PIL";0;"N";5.96;83;19;3;0.16;0;5 -"P0379";"SARD-PIL";0;"N";5.96;83;19.5;8;0.45;0;5 -"P0379";"SARD-PIL";0;"N";5.96;83;20;9;0.55;0;5 -"P0384";"CAPR-APE";0;"N";0.62;29;8;1;0.01;1;1 -"P0384";"CAPR-APE";0;"N";0.62;29;9;23;0.32;1;1 -"P0384";"CAPR-APE";0;"N";0.62;29;10;5;0;1;1 -"P0384";"ENGR-ENC";0;"N";2.05;127;12;3;0.03;0;5 -"P0384";"ENGR-ENC";0;"N";2.05;127;12.5;15;0.19;0;5 -"P0384";"ENGR-ENC";0;"N";2.05;127;13;38;0.56;0;5 -"P0384";"ENGR-ENC";0;"N";2.05;127;13.5;25;0.32;0;5 -"P0383";"DIVE-RS2";0;"N";0.02;12;0;12;NA;1;1 -"P0383";"MICR-POU";0;"N";0.03;50;4;25;0.00672270806092048;1;1 -"P0383";"MICR-POU";0;"N";0.03;50;5;25;0.01;1;1 -"P0383";"MOLA-MOL";0;"N";4.92;1;42;1;0;1;1 -"P0383";"MYCT-OPX";0;"N";0.001;1;5;1;NA;1;1 -"P0383";"SCOM-SCO";0;"N";0.006;8;3;3;0.000473394945202868;1;1 -"P0383";"SCOM-SCO";0;"N";0.006;8;4;1;0.000383173912848224;1;1 -"P0383";"SCOM-SCO";0;"N";0.006;8;5;2;0.00152504564444427;1;1 -"P0383";"SCOM-SCO";0;"N";0.006;8;6;1;0.00133794026533763;1;1 -"P0383";"SCOM-SCO";0;"N";0.006;8;7;1;0.00215224273596492;1;1 -"P0399";"ENGR-ENC";0;"N";4.57;211;12;3;0.03;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;12.5;5;0.06;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;13;13;0.19;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;13.5;16;0.25;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;14;32;0.57;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;14.5;38;0.79;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;15;41;0.95;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;15.5;29;0.72;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;16;20;0.56;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;16.5;6;0.17;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;17;5;0.16;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;17.5;2;0.07;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;18;0;0;0;5 -"P0399";"ENGR-ENC";0;"N";4.57;211;18.5;1;0.04;0;5 -"P0399";"EUTR-GUR";0;"N";0.1;1;24;1;0.1;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;16;3;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;17;3;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;18;2;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;19;3;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;20;0;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;21;1;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;22;5;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;23;0;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;24;3;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;25;3;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;26;6;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;27;4;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;28;1;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;29;1;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;30;1;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;31;1;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;32;3;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;33;0;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;34;1;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;35;1;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;36;2;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;37;3;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;38;0;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;39;2;0;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;43;2;0;1;1 -"P0389";"MERL-MCC";0;"N";1.01;9;29;1;0.16;1;1 -"P0389";"MERL-MCC";0;"N";1.01;9;30;1;0.17;1;1 -"P0389";"MOLA-MOL";0;"N";21.32;5;37;1;0;1;1 -"P0389";"MOLA-MOL";0;"N";21.32;5;40;2;0;1;1 -"P0389";"MOLA-MOL";0;"N";21.32;5;42;1;0;1;1 -"P0389";"MOLA-MOL";0;"N";21.32;5;43;1;0;1;1 -"P0389";"POLL-POL";0;"N";3.14;1;83;1;5.98;1;1 -"P0389";"SARD-PIL";0;"N";8.13;121;18.5;3;0.15;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;19;8;0.42;0;5 -"P0390";"SARD-PIL";0;"N";6;105;16.5;7;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;17;13;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;17.5;7;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;18;4;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;18.5;2;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;19;10;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;19.5;6;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;20;18;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;20.5;19;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;21;4;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;21.5;5;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;22;4;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;22.5;1;0;0;5 -"P0390";"SARD-PIL";0;"N";6;105;23;1;0;0;5 -"P0390";"SCOM-JAP";0;"N";3.72;49;17;1;0.03;1;1 -"P0390";"SCOM-JAP";0;"N";3.72;49;18;2;0.08;1;1 -"P0390";"SCOM-JAP";0;"N";3.72;49;19;14;0.71;1;1 -"P0390";"SCOM-JAP";0;"N";3.72;49;20;16;0.96;1;1 -"P0390";"SCOM-JAP";0;"N";3.72;49;21;6;0.42;1;1 -"P0390";"SCOM-JAP";0;"N";3.72;49;22;4;0.32;1;1 -"P0390";"SCOM-JAP";0;"N";3.72;49;23;4;0.38;1;1 -"P0390";"SCOM-JAP";0;"N";3.72;49;24;1;0.1;1;1 -"P0390";"SCOM-JAP";0;"N";3.72;49;28;1;0.17;1;1 -"P0390";"SCOM-SCO";0;"N";1.5;6;31;3;0.63;1;1 -"P0390";"SCOM-SCO";0;"N";1.5;6;32;1;0.23;1;1 -"P0390";"SCOM-SCO";0;"N";1.5;6;34;1;0.28;1;1 -"P0390";"SCOM-SCO";0;"N";1.5;6;36;1;0.33;1;1 -"P0390";"TRAC-TRU";0;"N";0.41;22;11;1;0.01;1;1 -"P0390";"TRAC-TRU";0;"N";0.41;22;12;12;0.16;1;1 -"P0390";"TRAC-TRU";0;"N";0.41;22;13;5;0.08;1;1 -"P0390";"TRAC-TRU";0;"N";0.41;22;14;2;0.04;1;1 -"P0390";"TRAC-TRU";0;"N";0.41;22;15;0;0;1;1 -"P0390";"TRAC-TRU";0;"N";0.41;22;16;1;0.03;1;1 -"P0390";"TRAC-TRU";0;"N";0.41;22;17;0;0;1;1 -"P0390";"TRAC-TRU";0;"N";0.41;22;18;0;0;1;1 -"P0400";"DIVE-RS2";0;"N";0.34;104;0;104;NA;1;1 -"P0400";"LOPH-BUD";0;"N";0.02;3;7;3;0;1;1 -"P0400";"MOLA-MOL";0;"N";4.76;1;42;1;0;1;1 -"P0400";"TRAC-TRU";0;"N";0.81;2;35;1;0.34;1;1 -"P0400";"TRAC-TRU";0;"N";0.81;2;37;1;0.4;1;1 -"P0399";"MERL-MCC";0;"N";9.2;52;49;1;0;1;1 -"P0399";"MOLA-MOL";0;"N";8.86;2;43;1;4.86;1;1 -"P0399";"MOLA-MOL";0;"N";8.86;2;41;1;4;1;1 -"P0399";"SARD-PIL";0;"N";7.53;105;19;5;0.28;0;5 -"P0399";"SARD-PIL";0;"N";7.53;105;19.5;8;0.47;0;5 -"P0399";"SARD-PIL";0;"N";7.53;105;20;12;0.77;0;5 -"P0399";"SARD-PIL";0;"N";7.53;105;20.5;15;1.03;0;5 -"P0399";"SARD-PIL";0;"N";7.53;105;21;16;1.11;0;5 -"P0399";"SARD-PIL";0;"N";7.53;105;21.5;30;2.33;0;5 -"P0399";"SARD-PIL";0;"N";7.53;105;22;14;1.13;0;5 -"P0399";"SARD-PIL";0;"N";7.53;105;22.5;3;0.25;0;5 -"P0399";"SARD-PIL";0;"N";7.53;105;23;1;0.09;0;5 -"P0399";"SARD-PIL";0;"N";7.53;105;18.5;1;0.04;0;5 -"P0399";"SARD-SAR";0;"N";5.2;1;76;1;5.2;1;1 -"P0399";"SCOM-JAP";0;"N";0.38;6;21;1;0.07;1;1 -"P0399";"SCOM-JAP";0;"N";0.38;6;22;1;0.08;1;1 -"P0404";"ENGR-ENC";0;"N";4.03;187;13;3;0.04;0;5 -"P0404";"ENGR-ENC";0;"N";4.03;187;13.5;14;0.23;0;5 -"P0404";"ENGR-ENC";0;"N";4.03;187;14;46;0.84;0;5 -"P0404";"ENGR-ENC";0;"N";4.03;187;14.5;49;1.02;0;5 -"P0404";"ENGR-ENC";0;"N";4.03;187;15;39;0.89;0;5 -"P0404";"ENGR-ENC";0;"N";4.03;187;15.5;23;0.57;0;5 -"P0404";"ENGR-ENC";0;"N";4.03;187;16;4;0.12;0;5 -"P0404";"ENGR-ENC";0;"N";4.03;187;16.5;5;0.15;0;5 -"P0404";"ENGR-ENC";0;"N";4.03;187;17;3;0.1;0;5 -"P0404";"ENGR-ENC";0;"N";4.03;187;17.5;1;0.04;0;5 -"P0404";"MERL-MCC";0;"N";0.96;5;23;1;0.07;1;1 -"P0404";"MERL-MCC";0;"N";0.96;5;24;0;0;1;1 -"P0404";"MERL-MCC";0;"N";0.96;5;25;1;0.1;1;1 -"P0404";"MERL-MCC";0;"N";0.96;5;26;0;0;1;1 -"P0404";"MERL-MCC";0;"N";0.96;5;27;1;0.12;1;1 -"P0404";"MERL-MCC";0;"N";0.96;5;33;1;0.23;1;1 -"P0404";"MERL-MCC";0;"N";0.96;5;39;1;0.39;1;1 -"P0404";"MOLA-MOL";0;"N";4.06;1;41;1;0;1;1 -"P0404";"SARD-PIL";0;"N";0.05;1;19;1;0;0;5 -"P0404";"SCOM-JAP";0;"N";0.24;1;32;1;0.27;1;1 -"P0404";"SCOM-SCO";0;"N";1.94;6;32;1;0.23;1;1 -"P0417";"ENGR-ENC";0;"N";0.64;28;13.5;1;0;0;5 -"P0417";"ENGR-ENC";0;"N";0.64;28;14;12;0;0;5 -"P0417";"ENGR-ENC";0;"N";0.64;28;14.5;7;0;0;5 -"P0417";"ENGR-ENC";0;"N";0.64;28;15;7;0;0;5 -"P0417";"ENGR-ENC";0;"N";0.64;28;15.5;1;0;0;5 -"P0417";"MERL-MCC";0;"N";0.83;30;25;1;0.1;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;25;1;0.1;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;30;1;0.17;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;30;1;0.17;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;44;1;0.57;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;44;1;0.57;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;28;1;0.14;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;28;1;0.14;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;32;1;0.21;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;32;1;0.21;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;33;1;0.23;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;33;1;0.23;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;36;1;0.31;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;36;1;0.31;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;37;0;0;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;37;0;0;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;38;1;0.36;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;38;1;0.36;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;40;1;0.43;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;40;1;0.43;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;44;1;0.57;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;44;1;0.57;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;46;2;1.32;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;46;2;1.32;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;48;1;0.75;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;48;1;0.75;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;52;1;0.96;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;52;1;0.96;1;1 -"P0417";"MERL-MCC";0;"N";0.83;30;54;1;1.08;1;1 -"P0417";"MERL-MCC";0;"N";6.9;30;54;1;1.08;1;1 -"P0417";"SARD-PIL";0;"N";7.4;107;18.5;3;0.15;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;19;7;0.38;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;19.5;12;0.71;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;20;20;1.28;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;20.5;20;1.32;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;21;20;1.48;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;21.5;11;0.82;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;22;9;0.78;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;22.5;3;0.25;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;23;0;0;0;5 -"P0417";"SARD-PIL";0;"N";7.4;107;23.5;2;0.21;0;5 -"P0417";"SCOM-JAP";0;"N";15.07;144;18;6;0.25;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;19;23;1.17;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;20;34;2.05;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;21;22;1.55;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;22;11;0.9;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;23;6;0.57;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;24;6;0.65;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;25;3;0.37;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;26;1;0.14;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;27;1;0.15;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;28;0;0;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;29;15;3.02;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;30;5;1.12;1;1 -"P0423";"ENGR-ENC";0;"N";1.92;165;10.5;7;0.04;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;11;12;0.12;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;11.5;21;0.18;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;12;30;0.31;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;12.5;32;0.37;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;13;32;0.42;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;13.5;14;0.21;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;14;6;0.1;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;14.5;2;0.03;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;15;3;0.06;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;15.5;1;0.02;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;9.5;2;0.01;0;5 -"P0423";"ENGR-ENC";0;"N";1.92;165;10;3;0.02;0;5 -"P0423";"MERL-MCC";0;"N";0.46;1;40;1;0;1;1 -"P0423";"SARD-PIL";0;"N";7.21;155;15.5;8;0.21;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;16;21;0.68;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;16.5;21;0.72;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;17;10;0.39;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;17.5;10;0.41;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;18;21;0.99;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;18.5;16;0.79;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;19;10;0.53;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;19.5;12;0.69;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;20;11;0.67;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;20.5;7;0.46;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;21;5;0.39;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;21.5;2;0.16;0;5 -"P0423";"SARD-PIL";0;"N";7.21;155;22;1;0.09;0;5 -"P0423";"SCOM-JAP";0;"N";0.93;13;19;1;0;1;1 -"P0423";"SCOM-JAP";0;"N";0.93;13;20;3;0;1;1 -"P0423";"SCOM-JAP";0;"N";0.93;13;21;7;0;1;1 -"P0423";"SCOM-JAP";0;"N";0.93;13;22;2;0;1;1 -"P0423";"SPRA-SPR";0;"N";0.91;85;10;2;0.02;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;12.5;4;0.06;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;13;23;0.34;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;13.5;54;0.9;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;14;43;0.75;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;14.5;27;0.6;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;15;13;0.28;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;15.5;3;0.07;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;16;1;0.02;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;16.5;8;0.25;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;17;1;0.03;0;5 -"P0435";"ENGR-ENC";0;"N";1.62;219;11.5;22;0.2;0;5 -"P0435";"ENGR-ENC";0;"N";1.62;219;12;13;0.13;0;5 -"P0435";"ENGR-ENC";0;"N";1.62;219;12.5;7;0.08;0;5 -"P0435";"ENGR-ENC";0;"N";1.62;219;13;2;0.03;0;5 -"P0435";"ENGR-ENC";0;"N";1.62;219;13.5;1;0.02;0;5 -"P0435";"ENGR-ENC";0;"N";1.62;219;14;1;0.02;0;5 -"P0435";"SCOM-JAP";0;"N";0.06;2;15;1;0;1;1 -"P0435";"SCOM-JAP";0;"N";0.06;2;16;1;0;1;1 -"P0435";"SPRA-SPR";0;"N";1.21;124;10;5;0.04;0;5 -"P0435";"SPRA-SPR";0;"N";1.21;124;10.5;49;0.44;0;5 -"P0435";"SPRA-SPR";0;"N";1.21;124;11;56;0.58;0;5 -"P0435";"SPRA-SPR";0;"N";1.21;124;11.5;14;0.15;0;5 -"P0435";"TRAC-TRU";0;"N";0.07;8;9;2;0;1;1 -"P0435";"TRAC-TRU";0;"N";0.07;8;10;5;0;1;1 -"P0435";"TRAC-TRU";0;"N";0.07;8;11;1;0;1;1 -"P0436";"ENGR-ENC";0;"N";2.06;130;12.5;9;0.11;0;5 -"P0436";"ENGR-ENC";0;"N";2.06;130;13;30;0.42;0;5 -"P0436";"ENGR-ENC";0;"N";2.06;130;13.5;32;0.51;0;5 -"P0436";"ENGR-ENC";0;"N";2.06;130;14;45;0.75;0;5 -"P0436";"ENGR-ENC";0;"N";2.06;130;14.5;12;0.23;0;5 -"P0436";"ENGR-ENC";0;"N";2.06;130;15;2;0.04;0;5 -"P0436";"EUTR-GUR";0;"N";0.39;2;28;1;0;1;1 -"P0436";"EUTR-GUR";0;"N";0.39;2;32;1;0;1;1 -"P0436";"MERL-MCC";0;"N";1.61;9;20;1;0;1;1 -"P0436";"MERL-MCC";0;"N";1.61;9;23;1;0;1;1 -"P0436";"MERL-MCC";0;"N";1.61;9;27;1;0;1;1 -"P0436";"MERL-MCC";0;"N";1.61;9;29;1;0;1;1 -"P0436";"MERL-MCC";0;"N";1.61;9;31;3;0;1;1 -"P0436";"MERL-MCC";0;"N";1.61;9;34;2;0;1;1 -"P0436";"MOLA-MOL";0;"N";4;1;39;1;0;1;1 -"P0436";"SARD-PIL";0;"N";9.33;145;16.5;5;0.15;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;17;1;0.03;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;17.5;1;0.03;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;18;5;0.22;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;18.5;7;0.4;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;19;9;0.46;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;19.5;21;1.18;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;20;22;1.33;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;20.5;29;1.97;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;21;20;1.46;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;21.5;11;0.85;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;22;9;0.74;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;22.5;0;0;0;5 -"P0443";"ALLO-TEZ";0;"N";0.11;30;0;30;0.11;1;1 -"P0443";"BOOP-BOO";0;"N";0.18;1;27;1;0;1;1 -"P0443";"ENGR-ENC";0;"N";2.11;168;15;0;0;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;15.5;1;0.02;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;16;1;0.03;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;11;4;0.03;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;11.5;25;0.24;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;12;38;0.41;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;12.5;45;0.54;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;13;26;0.36;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;13.5;18;0.28;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;14;8;0.13;0;5 -"P0443";"ENGR-ENC";0;"N";2.11;168;14.5;2;0.04;0;5 -"P0443";"HYPE-LAN";0;"N";0.03;1;26;1;0.03;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;21;1;NA;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;22;0;0;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;23;2;0;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;24;5;0;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;25;3;0;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;26;1;0;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;27;2;0;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;28;0;0;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;29;0;0;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;30;1;0;1;1 -"P0443";"MERL-MNG";0;"N";2.05;16;31;1;0;1;1 -"P0443";"SARD-PIL";0;"N";5.82;127;15;11;0.33;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;15.5;4;0.12;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;16;7;0.22;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;16.5;16;0.57;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;17;19;0.72;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;17.5;13;0.56;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;18;9;0.41;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;18.5;14;0.7;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;19;3;0.16;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;19.5;11;0.63;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;20;8;0.5;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;20.5;5;0.35;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;21;3;0.22;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;21.5;3;0.21;0;5 -"P0443";"SARD-PIL";0;"N";5.82;127;22;1;0.1;0;5 -"P0443";"SCOM-SCO";0;"N";3.02;13;32;3;0;1;1 -"P0443";"SCOM-SCO";0;"N";3.02;13;33;2;0;1;1 -"P0454";"ENGR-ENC";0;"N";1.95;149;12;9;0.09;0;5 -"P0449";"BELO-BEO";0;"N";1.82;2;80;1;0;1;1 -"P0449";"BELO-BEO";0;"N";1.82;2;86;1;0;1;1 -"P0449";"DIVE-RS1";0;"N";3.34;217;0;217;NA;1;1 -"P0450";"ENGR-ENC";0;"N";2.38;130;12.5;3;0.04;0;5 -"P0450";"ENGR-ENC";0;"N";2.38;130;13;8;0.12;0;5 -"P0450";"ENGR-ENC";0;"N";2.38;130;13.5;32;0.53;0;5 -"P0450";"ENGR-ENC";0;"N";2.38;130;14;48;0.88;0;5 -"P0450";"ENGR-ENC";0;"N";2.38;130;14.5;25;0.51;0;5 -"P0450";"ENGR-ENC";0;"N";2.38;130;15;13;0.27;0;5 -"P0450";"ENGR-ENC";0;"N";2.38;130;15.5;1;0.02;0;5 -"P0450";"MERL-MCC";0;"N";1.64;16;17;1;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;20;4;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;21;2;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;22;0;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;23;1;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;24;2;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;25;1;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;26;1;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;27;0;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;28;2;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;32;1;0;1;1 -"P0450";"MERL-MCC";0;"N";1.64;16;33;1;0;1;1 -"P0450";"MICR-POU";0;"N";1.03;11;19;2;0;1;1 -"P0450";"MICR-POU";0;"N";1.03;11;20;1;0;1;1 -"P0450";"MICR-POU";0;"N";1.03;11;21;3;0;1;1 -"P0450";"MICR-POU";0;"N";1.03;11;22;1;0;1;1 -"P0450";"MICR-POU";0;"N";1.03;11;27;1;0;1;1 -"P0450";"MICR-POU";0;"N";1.03;11;28;1;0;1;1 -"P0450";"MICR-POU";0;"N";1.03;11;34;2;0;1;1 -"P0450";"SARD-PIL";0;"N";1.59;26;18.5;1;0;0;5 -"P0450";"SARD-PIL";0;"N";1.59;26;19;5;0;0;5 -"P0450";"SARD-PIL";0;"N";1.59;26;19.5;6;0;0;5 -"P0450";"SARD-PIL";0;"N";1.59;26;20;7;0;0;5 -"P0450";"SARD-PIL";0;"N";1.59;26;20.5;3;0;0;5 -"P0450";"SARD-PIL";0;"N";1.59;26;21;3;0;0;5 -"P0450";"SARD-PIL";0;"N";1.59;26;21.5;0;0;0;5 -"P0450";"SARD-PIL";0;"N";1.59;26;22;1;0;0;5 -"P0450";"TODA-EBL";0;"N";0.13;1;12;1;0;1;1 -"P0450";"TRAC-TRU";0;"N";1.04;18;15;1;0;1;1 -"P0450";"TRAC-TRU";0;"N";1.04;18;16;0;0;1;1 -"P0450";"TRAC-TRU";0;"N";1.04;18;17;1;0;1;1 -"P0450";"TRAC-TRU";0;"N";1.04;18;18;4;0;1;1 -"P0450";"TRAC-TRU";0;"N";1.04;18;19;10;0;1;1 -"P0442";"ALOP-VUL";0;"N";108;1;312;1;NA;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;73;2;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;74;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;79;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;82;2;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;86;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;89;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;50;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;51;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;55;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;57;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;58;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;59;0;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;60;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;61;2;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;62;2;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;63;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;64;0;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;65;3;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;66;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;67;2;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;68;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;69;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;70;0;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;71;1;0;1;1 -"P0442";"BELO-BEO";0;"N";12.62;30;72;2;0;1;1 -"P0442";"DICE-LAB";0;"N";0.69;1;41;1;0;1;1 -"P0442";"DIVE-RS1";0;"N";1.39;7;0;7;NA;1;1 -"P0442";"ENGR-ENC";0;"N";1.87;144;10.5;1;0.005;0;5 -"P0442";"ENGR-ENC";0;"N";1.87;144;11;1;0.01;0;5 -"P0442";"ENGR-ENC";0;"N";1.87;144;11.5;15;0.15;0;5 -"P0442";"ENGR-ENC";0;"N";1.87;144;12;54;0.62;0;5 -"P0442";"ENGR-ENC";0;"N";1.87;144;12.5;44;0.57;0;5 -"P0442";"ENGR-ENC";0;"N";1.87;144;13;21;0.36;0;5 -"P0442";"ENGR-ENC";0;"N";1.87;144;13.5;6;0.09;0;5 -"P0442";"ENGR-ENC";0;"N";1.87;144;14;1;0.02;0;5 -"P0443";"SCOM-SCO";0;"N";3.02;13;34;2;0;1;1 -"P0443";"SCOM-SCO";0;"N";3.02;13;36;0;NA;1;1 -"P0443";"SCOM-SCO";0;"N";3.02;13;28;2;0;1;1 -"P0443";"SCOM-SCO";0;"N";3.02;13;29;2;0;1;1 -"P0443";"SCOM-SCO";0;"N";3.02;13;30;0;0;1;1 -"P0443";"SCOM-SCO";0;"N";3.02;13;31;2;0;1;1 -"P0443";"SPRA-SPR";0;"N";1.07;91;10;1;0;0;5 -"P0378";"MERL-MCC";0;"N";5.98;58;26;4;0.45;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;40;0;0;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;41;1;0.46;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;27;1;0.12;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;28;1;0.14;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;29;1;0.16;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;30;1;0.17;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;31;0;0;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;32;2;0.43;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;33;1;0.23;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;34;0;0;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;35;1;0.28;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;36;0;0;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;37;1;0.33;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;38;0;0;1;1 -"P0378";"MERL-MCC";0;"N";5.98;58;39;0;0;1;1 -"P0378";"MICR-POU";0;"N";0.19;1;31;1;0.19;1;1 -"P0378";"SARD-PIL";0;"N";9.13;148;19;20;1.07;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;19.5;31;1.76;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;20;27;1.64;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;20.5;25;1.65;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;21;25;1.7;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;21.5;6;0.44;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;22;5;0.41;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;22.5;1;0.08;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;17;1;0.04;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;17.5;1;0.04;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;18;2;0.1;0;5 -"P0378";"SARD-PIL";0;"N";9.13;148;18.5;4;0.19;0;5 -"P0378";"SCOM-JAP";0;"N";0.18;2;22;1;0.08;1;1 -"P0378";"SCOM-JAP";0;"N";0.18;2;23;1;0.09;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;29;1;0.17;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;30;3;0.57;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;31;2;0.42;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;32;2;0.46;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;33;1;0.25;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;34;8;1.97;1;1 -"P0379";"SARD-PIL";0;"N";5.96;83;20.5;18;1.18;0;5 -"P0379";"SARD-PIL";0;"N";5.96;83;21;19;1.42;0;5 -"P0379";"SARD-PIL";0;"N";5.96;83;21.5;9;0.64;0;5 -"P0379";"SARD-PIL";0;"N";5.96;83;22;9;0.75;0;5 -"P0379";"SARD-PIL";0;"N";5.96;83;22.5;6;0.61;0;5 -"P0379";"SARD-PIL";0;"N";5.96;83;23;2;0.17;0;5 -"P0379";"SCOM-JAP";0;"N";8.88;91;24;7;0.76;1;1 -"P0454";"ENGR-ENC";0;"N";1.95;149;12.5;41;0.48;0;5 -"P0454";"ENGR-ENC";0;"N";1.95;149;13;51;0.66;0;5 -"P0454";"ENGR-ENC";0;"N";1.95;149;13.5;35;0.49;0;5 -"P0454";"ENGR-ENC";0;"N";1.95;149;14;8;0.13;0;5 -"P0454";"ENGR-ENC";0;"N";1.95;149;14.5;3;0.05;0;5 -"P0454";"ENGR-ENC";0;"N";1.95;149;15;1;0.02;0;5 -"P0454";"ENGR-ENC";0;"N";1.95;149;16.5;1;0.02;0;5 -"P0454";"EUTR-GUR";0;"N";0.96;5;23;1;0;1;1 -"P0454";"EUTR-GUR";0;"N";0.96;5;27;1;0;1;1 -"P0454";"EUTR-GUR";0;"N";0.96;5;28;1;0;1;1 -"P0454";"EUTR-GUR";0;"N";0.96;5;34;1;0;1;1 -"P0454";"EUTR-GUR";0;"N";0.96;5;35;1;0;1;1 -"P0454";"MERL-MCC";0;"N";0.56;4;22;1;0;1;1 -"P0454";"MERL-MCC";0;"N";0.56;4;23;1;0;1;1 -"P0454";"MERL-MCC";0;"N";0.56;4;27;1;0;1;1 -"P0454";"MERL-MCC";0;"N";0.56;4;33;1;0;1;1 -"P0454";"MICR-POU";0;"N";0.46;7;18;2;0;1;1 -"P0454";"MICR-POU";0;"N";0.46;7;19;1;0;1;1 -"P0454";"MICR-POU";0;"N";0.46;7;20;1;0;1;1 -"P0454";"MICR-POU";0;"N";0.46;7;21;1;0;1;1 -"P0454";"MICR-POU";0;"N";0.46;7;28;1;0;1;1 -"P0454";"MICR-POU";0;"N";0.46;7;31;1;0;1;1 -"P0455";"ENGR-ENC";0;"N";2.44;141;12.5;2;0.02;0;5 -"P0455";"ENGR-ENC";0;"N";2.44;141;13;19;0.29;0;5 -"P0455";"ENGR-ENC";0;"N";2.44;141;13.5;56;0.94;0;5 -"P0455";"ENGR-ENC";0;"N";2.44;141;14;45;0.8;0;5 -"P0455";"ENGR-ENC";0;"N";2.44;141;14.5;15;0.29;0;5 -"P0455";"ENGR-ENC";0;"N";2.44;141;15;1;0.01;0;5 -"P0455";"ENGR-ENC";0;"N";2.44;141;15.5;1;0.02;0;5 -"P0455";"ENGR-ENC";0;"N";2.44;141;16;1;0.02;0;5 -"P0455";"ENGR-ENC";0;"N";2.44;141;16.5;1;0.03;0;5 -"P0455";"MERL-MCC";0;"N";1.12;2;27;1;0;1;1 -"P0455";"MERL-MCC";0;"N";1.12;2;52;1;0;1;1 -"P0455";"MICR-POU";0;"N";0.28;6;19;1;0;1;1 -"P0455";"MICR-POU";0;"N";0.28;6;20;3;0;1;1 -"P0455";"MICR-POU";0;"N";0.28;6;21;2;0;1;1 -"P0455";"SARD-PIL";0;"N";4.96;78;16.5;1;0.04;0;5 -"P0455";"SARD-PIL";0;"N";4.96;78;17;1;0.03;0;5 -"P0455";"SARD-PIL";0;"N";4.96;78;19;1;0.05;0;5 -"P0455";"SARD-PIL";0;"N";4.96;78;19.5;6;0.32;0;5 -"P0455";"SARD-PIL";0;"N";4.96;78;20;18;1.07;0;5 -"P0455";"SARD-PIL";0;"N";4.96;78;20.5;14;0.86;0;5 -"P0455";"SARD-PIL";0;"N";4.96;78;21;20;1.3;0;5 -"P0455";"SARD-PIL";0;"N";4.96;78;21.5;9;0.66;0;5 -"P0474";"AMMO-TOB";0;"N";0.1;2;25;1;0;1;1 -"P0474";"AMMO-TOB";0;"N";0.1;2;26;1;0;1;1 -"P0474";"DIVE-RS1";0;"N";0.16;14;0;14;NA;1;1 -"P0474";"ENGR-ENC";0;"N";2.23;157;11.5;11;0.11;0;5 -"P0474";"ENGR-ENC";0;"N";2.23;157;12;27;0.32;0;5 -"P0474";"ENGR-ENC";0;"N";2.23;157;12.5;53;0.69;0;5 -"P0474";"ENGR-ENC";0;"N";2.23;157;13;38;0.56;0;5 -"P0474";"ENGR-ENC";0;"N";2.23;157;13.5;21;0.4;0;5 -"P0474";"ENGR-ENC";0;"N";2.23;157;14;5;0.1;0;5 -"P0474";"ENGR-ENC";0;"N";2.23;157;14.5;2;0.04;0;5 -"P0473";"AMMO-TOB";0;"N";1.35;41;27;1;0;1;1 -"P0473";"AMMO-TOB";0;"N";1.35;41;28;1;0;1;1 -"P0473";"AMMO-TOB";0;"N";1.35;41;19;1;0;1;1 -"P0473";"AMMO-TOB";0;"N";1.35;41;20;2;0;1;1 -"P0473";"AMMO-TOB";0;"N";1.35;41;21;9;0;1;1 -"P0473";"AMMO-TOB";0;"N";1.35;41;22;3;0;1;1 -"P0473";"AMMO-TOB";0;"N";1.35;41;23;7;0;1;1 -"P0473";"AMMO-TOB";0;"N";1.35;41;24;12;0;1;1 -"P0473";"AMMO-TOB";0;"N";1.35;41;25;5;0;1;1 -"P0473";"ENGR-ENC";0;"N";0.57;46;11.5;4;0;0;5 -"P0473";"ENGR-ENC";0;"N";0.57;46;12;9;0;0;5 -"P0473";"ENGR-ENC";0;"N";0.57;46;12.5;19;0;0;5 -"P0473";"ENGR-ENC";0;"N";0.57;46;13;10;0;0;5 -"P0473";"ENGR-ENC";0;"N";0.57;46;13.5;3;0;0;5 -"P0473";"ENGR-ENC";0;"N";0.57;46;14;1;0;0;5 -"P0473";"MOLA-MOL";0;"N";25.02;3;42;1;4.62;1;1 -"P0473";"MOLA-MOL";0;"N";25.02;3;43;1;4.4;1;1 -"P0473";"MOLA-MOL";0;"N";25.02;3;66;1;16;1;1 -"P0473";"SARD-PIL";0;"N";8.12;138;17.5;2;0.09;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;18;9;0.42;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;18.5;15;0.74;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;19;28;1.48;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;19.5;27;1.55;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;20;18;1.09;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;20.5;18;1.2;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;21;15;1.01;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;21.5;2;0.16;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;22;2;0.16;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;22.5;0;0;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;23;1;0.09;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;23.5;0;0;0;5 -"P0473";"SARD-PIL";0;"N";8.12;138;24;1;0.1;0;5 -"P0473";"SCOM-JAP";0;"N";0.08;1;21;1;0;1;1 -"P0461";"ENGR-ENC";0;"N";1.78;91;12.5;1;0.01;0;5 -"P0461";"ENGR-ENC";0;"N";1.78;91;13;8;0.11;0;5 -"P0461";"ENGR-ENC";0;"N";1.78;91;13.5;18;0.29;0;5 -"P0461";"ENGR-ENC";0;"N";1.78;91;14;20;0.36;0;5 -"P0461";"ENGR-ENC";0;"N";1.78;91;14.5;25;0.52;0;5 -"P0455";"SARD-PIL";0;"N";4.96;78;22;5;0.37;0;5 -"P0455";"SARD-PIL";0;"N";4.96;78;22.5;3;0.24;0;5 -"P0455";"SCOM-JAP";0;"N";1.21;5;21;3;0;1;1 -"P0455";"SCOM-JAP";0;"N";1.21;5;35;1;0;1;1 -"P0455";"SCOM-JAP";0;"N";1.21;5;40;1;0;1;1 -"P0455";"SCOM-SCO";0;"N";1.86;6;30;1;0;1;1 -"P0455";"SCOM-SCO";0;"N";1.86;6;34;1;0;1;1 -"P0455";"SCOM-SCO";0;"N";1.86;6;35;1;0;1;1 -"P0455";"SCOM-SCO";0;"N";1.86;6;36;2;0;1;1 -"P0455";"SCOM-SCO";0;"N";1.86;6;37;1;0;1;1 -"P0455";"TRAC-TRU";0;"N";4.1;86;15;2;0;1;1 -"P0455";"TRAC-TRU";0;"N";4.1;86;16;4;0;1;1 -"P0455";"TRAC-TRU";0;"N";4.1;86;17;41;0;1;1 -"P0455";"TRAC-TRU";0;"N";4.1;86;18;32;0;1;1 -"P0460";"ENGR-ENC";0;"N";2.15;150;12;6;0.07;0;5 -"P0460";"ENGR-ENC";0;"N";2.15;150;12.5;39;0.49;0;5 -"P0460";"ENGR-ENC";0;"N";2.15;150;13;57;0.78;0;5 -"P0460";"ENGR-ENC";0;"N";2.15;150;13.5;33;0.5;0;5 -"P0460";"ENGR-ENC";0;"N";2.15;150;14;11;0.2;0;5 -"P0460";"ENGR-ENC";0;"N";2.15;150;14.5;1;0.02;0;5 -"P0460";"ENGR-ENC";0;"N";2.15;150;15;3;0.07;0;5 -"P0460";"ILLE-COI";0;"N";0.25;3;8;1;0;1;1 -"P0460";"ILLE-COI";0;"N";0.25;3;10;1;0;1;1 -"P0460";"ILLE-COI";0;"N";0.25;3;11;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;19;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;20;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;21;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;22;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;23;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;24;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;25;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;27;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;28;1;0;1;1 -"P0460";"MERL-MCC";0;"N";1.02;10;32;1;0;1;1 -"P0460";"MICR-POU";0;"N";0.37;6;19;1;0;1;1 -"P0460";"MICR-POU";0;"N";0.37;6;20;1;0;1;1 -"P0460";"MICR-POU";0;"N";0.37;6;21;3;0;1;1 -"P0460";"MICR-POU";0;"N";0.37;6;25;1;0;1;1 -"P0460";"SARD-PIL";0;"N";0.13;3;16.5;1;0;0;5 -"P0417";"SCOM-JAP";0;"N";15.07;144;31;2;0.5;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;32;6;1.66;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;33;2;0.61;1;1 -"P0417";"SCOM-JAP";0;"N";15.07;144;34;1;0.33;1;1 -"P0417";"TRAC-TRU";0;"N";3.13;89;10;1;0.00775244850909183;1;1 -"P0417";"TRAC-TRU";0;"N";3.13;89;11;2;0.02;1;1 -"P0417";"TRAC-TRU";0;"N";3.13;89;12;2;0.02;1;1 -"P0417";"TRAC-TRU";0;"N";3.13;89;13;6;0.1;1;1 -"P0417";"TRAC-TRU";0;"N";3.13;89;14;5;0.1;1;1 -"P0409";"ENGR-ENC";0;"N";3.92;151;18.5;1;0.04;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;13.5;3;0.06;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;14;7;0.13;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;14.5;17;0.36;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;15;41;0.96;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;15.5;34;0.86;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;16;28;0.85;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;16.5;10;0.31;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;17;9;0.3;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;17.5;1;0.03;0;5 -"P0409";"ENGR-ENC";0;"N";3.92;151;18;0;0;0;5 -"P0409";"MERL-MCC";0;"N";0.48;2;31;1;0.31;1;1 -"P0409";"MERL-MCC";0;"N";0.48;2;36;1;0.31;1;1 -"P0409";"SARD-PIL";0;"N";7.16;103;18.5;2;0.1;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;19;4;0.21;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;19.5;8;0.46;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;20;22;1.46;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;20.5;8;0.52;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;21;25;1.71;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;21.5;12;0.9;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;22;17;1.35;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;22.5;0;0;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;23;4;0.34;0;5 -"P0409";"SARD-PIL";0;"N";7.16;103;23.5;1;0.1;0;5 -"P0409";"SCOM-JAP";0;"N";2.99;40;16;1;0.02;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;17;1;0.03;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;18;7;0.3;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;19;3;0.15;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;20;5;0.3;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;21;9;0.63;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;22;6;0.49;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;23;4;0.38;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;24;1;0.1;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;25;1;0.12;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;54;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;61;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;63;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;64;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;67;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;68;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;71;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;74;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;75;2;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;76;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;77;2;0;1;1 -"P0501";"BELO-BEO";0;"N";3.02;5;72;1;0;1;1 -"P0501";"BELO-BEO";0;"N";3.02;5;73;2;0;1;1 -"P0501";"BELO-BEO";0;"N";3.02;5;76;1;0;1;1 -"P0501";"BELO-BEO";0;"N";3.02;5;84;1;0;1;1 -"P0501";"DIVE-RS2";0;"N";0.39;57;0;57;NA;1;1 -"P0501";"ENGR-ENC";0;"N";3.21;112;15.5;29;0.77;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;16;24;0.7;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;16.5;9;0.29;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;17;4;0.14;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;17.5;2;0.07;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;18;5;0.21;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;18.5;2;0.09;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;19;1;0.04;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;20;0;NA;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;14.5;5;0.12;0;5 -"P0501";"ENGR-ENC";0;"N";3.21;112;15;31;0.75;0;5 -"P0501";"SCOM-JAP";0;"N";0.09;1;23;1;0;1;1 -"P0501";"SCOM-SCO";0;"N";11.01;44;27;1;0;1;1 -"P0501";"SCOM-SCO";0;"N";11.01;44;28;1;0;1;1 -"P0501";"SCOM-SCO";0;"N";11.01;44;29;5;0;1;1 -"P0501";"SCOM-SCO";0;"N";11.01;44;30;21;0;1;1 -"P0501";"SCOM-SCO";0;"N";11.01;44;31;9;0;1;1 -"P0501";"SCOM-SCO";0;"N";11.01;44;32;3;0;1;1 -"P0501";"SCOM-SCO";0;"N";11.01;44;36;1;0;1;1 -"P0501";"SCOM-SCO";0;"N";11.01;44;37;2;0;1;1 -"P0501";"SCOM-SCO";0;"N";11.01;44;43;1;0;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;21;1;0.07;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;22;1;0.08;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;29;2;0.44;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;30;0;0;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;31;4;1.06;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;32;3;0.89;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;33;3;0.98;1;1 -"P0480";"AMMO-TOB";0;"N";0.002;20;3;10;0.002;1;1 -"P0480";"AMMO-TOB";0;"N";0.08;20;3;10;0.002;1;1 -"P0480";"CEPO-RUB";0;"N";0.08;1;49;1;0.08;1;1 -"P0480";"ENGR-ENC";0;"N";0.79;107;10;20;0.12;0;5 -"P0480";"ENGR-ENC";0;"N";0.79;107;10.5;41;0.27;0;5 -"P0480";"ENGR-ENC";0;"N";0.79;107;11;24;0.19;0;5 -"P0480";"ENGR-ENC";0;"N";0.79;107;11.5;14;0.13;0;5 -"P0480";"ENGR-ENC";0;"N";0.79;107;12;5;0.05;0;5 -"P0480";"ENGR-ENC";0;"N";0.79;107;13;1;0.01;0;5 -"P0480";"ENGR-ENC";0;"N";0.79;107;9.5;2;0.01;0;5 -"P0480";"MERL-MCC";0;"N";2.05;20;19;1;0;1;1 -"P0480";"MERL-MCC";0;"N";2.05;20;20;1;0;1;1 -"P0480";"MERL-MCC";0;"N";2.05;20;21;2;0;1;1 -"P0480";"MERL-MCC";0;"N";2.05;20;23;5;0;1;1 -"P0480";"MERL-MCC";0;"N";2.05;20;24;4;0;1;1 -"P0480";"MERL-MCC";0;"N";2.05;20;25;4;0;1;1 -"P0480";"MERL-MCC";0;"N";2.05;20;26;1;0;1;1 -"P0480";"MERL-MCC";0;"N";2.05;20;28;1;0;1;1 -"P0480";"MERL-MCC";0;"N";2.05;20;30;1;0;1;1 -"P0480";"MERL-MNG";0;"N";0.21;2;23;1;0;1;1 -"P0480";"MERL-MNG";0;"N";0.21;2;24;1;0;1;1 -"P0480";"MICR-POU";0;"N";0.33;5;20;1;0;1;1 -"P0480";"MICR-POU";0;"N";0.33;5;21;4;0;1;1 -"P0480";"SCOM-SCO";0;"N";0.23;3;22;2;0;1;1 -"P0480";"SCOM-SCO";0;"N";0.23;3;27;1;0;1;1 -"P0480";"SPRA-SPR";0;"N";0.03;52;4.5;1;0;0;5 -"P0480";"SPRA-SPR";0;"N";0.03;52;4.5;1;0;0;5 -"P0480";"SPRA-SPR";0;"N";0.03;52;5;5;0;0;5 -"P0480";"SPRA-SPR";0;"N";0.03;52;5;5;0;0;5 -"P0480";"SPRA-SPR";0;"N";0.03;52;5.5;12;0;0;5 -"P0480";"SPRA-SPR";0;"N";0.03;52;5.5;12;0;0;5 -"P0480";"SPRA-SPR";0;"N";0.03;52;6;8;0;0;5 -"P0480";"SPRA-SPR";0;"N";0.03;52;6;8;0;0;5 -"P0396";"ENGR-ENC";0;"N";2.4;104;13;2;0.03;0;5 -"P0396";"ENGR-ENC";0;"N";2.4;104;13.5;5;0.08;0;5 -"P0396";"ENGR-ENC";0;"N";2.4;104;14;21;0.44;0;5 -"P0396";"ENGR-ENC";0;"N";2.4;104;14.5;13;0.26;0;5 -"P0396";"ENGR-ENC";0;"N";2.4;104;15;31;0.71;0;5 -"P0396";"ENGR-ENC";0;"N";2.4;104;15.5;19;0.48;0;5 -"P0396";"ENGR-ENC";0;"N";2.4;104;16;9;0.25;0;5 -"P0396";"ENGR-ENC";0;"N";2.4;104;16.5;3;0.09;0;5 -"P0396";"ENGR-ENC";0;"N";2.4;104;17;1;0.03;0;5 -"P0396";"MERL-MCC";0;"N";12.16;81;14;3;0.05;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;15;4;0.08;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;16;8;0.2;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;17;9;0.27;1;1 -"P0509";"SARD-PIL";0;"N";5.39;112;19;9;0.48;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;19.5;4;0.28;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;20;3;0.18;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;20.5;3;0.2;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;21;2;0.13;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;21.5;3;0.23;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;22;5;0.4;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;23.5;1;0.09;0;5 -"P0509";"SCOM-JAP";0;"N";0.27;2;22;1;0;1;1 -"P0509";"SCOM-JAP";0;"N";0.27;2;27;1;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;7;1;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;21;2;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;22;14;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;23;19;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;24;7;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;25;1;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;26;1;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;27;7;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;28;2;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;29;5;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;30;1;0;1;1 -"P0509";"SCOM-SCO";0;"N";7.4;62;31;2;0;1;1 -"P0510";"ARGE-SIL";0;"N";0.14;1;26;1;0;1;1 -"P0510";"BELO-BEO";0;"N";1.12;2;70;1;0;1;1 -"P0510";"BELO-BEO";0;"N";1.12;2;82;1;0;1;1 -"P0510";"CAPR-APE";0;"N";1.75;59;8;2;0;1;1 -"P0510";"CAPR-APE";0;"N";1.75;59;9;17;0;1;1 -"P0510";"CAPR-APE";0;"N";1.75;59;10;12;0;1;1 -"P0510";"CAPR-APE";0;"N";1.75;59;11;13;0;1;1 -"P0510";"CAPR-APE";0;"N";1.75;59;12;9;0;1;1 -"P0510";"CAPR-APE";0;"N";1.75;59;13;2;0;1;1 -"P0510";"CAPR-APE";0;"N";1.75;59;14;3;0;1;1 -"P0510";"CAPR-APE";0;"N";1.75;59;16;1;0;1;1 -"P0510";"DIVE-RS2";0;"N";0.32;43;0;43;NA;1;1 -"P0510";"MERL-MCC";0;"N";5.38;4;48;1;0;1;1 -"P0510";"MERL-MCC";0;"N";5.38;4;49;1;0;1;1 -"P0510";"MERL-MCC";0;"N";5.38;4;57;1;0;1;1 -"P0510";"MERL-MCC";0;"N";5.38;4;70;1;0;1;1 -"P0510";"MICR-POU";0;"N";0.62;11;19;2;0;1;1 -"P0510";"MICR-POU";0;"N";0.62;11;20;6;0;1;1 -"P0510";"MICR-POU";0;"N";0.62;11;21;1;0;1;1 -"P0510";"MICR-POU";0;"N";0.62;11;22;1;0;1;1 -"P0510";"MICR-POU";0;"N";0.62;11;23;1;0;1;1 -"P0510";"MYCT-OPX";0;"N";0.01;9;5;8;NA;1;1 -"P0510";"MYCT-OPX";0;"N";0.01;9;6;1;NA;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;11;1;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;12;2;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;13;4;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;14;9;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;15;18;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;16;38;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;17;28;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;18;9;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;8;1;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;9;1;0;1;1 -"P0474";"ZEUS-FAB";0;"N";0.85;1;38;1;0.85;1;1 -"P0473";"TRAC-TRU";0;"N";1.78;134;9;1;0.005;1;1 -"P0473";"TRAC-TRU";0;"N";1.78;134;10;41;0.41;1;1 -"P0473";"TRAC-TRU";0;"N";1.78;134;11;49;0.56;1;1 -"P0473";"TRAC-TRU";0;"N";1.78;134;12;20;0.28;1;1 -"P0473";"TRAC-TRU";0;"N";1.78;134;13;10;0.18;1;1 -"P0473";"TRAC-TRU";0;"N";1.78;134;14;7;0.16;1;1 -"P0473";"TRAC-TRU";0;"N";1.78;134;15;4;0.11;1;1 -"P0473";"TRAC-TRU";0;"N";1.78;134;16;2;0.07;1;1 -"P0463";"DIVE-RS2";0;"N";0.16;30;0;30;NA;1;1 -"P0463";"ENGR-ENC";0;"N";1.98;94;13.5;12;0.19;0;5 -"P0463";"ENGR-ENC";0;"N";1.98;94;14;16;0.29;0;5 -"P0463";"ENGR-ENC";0;"N";1.98;94;14.5;26;0.52;0;5 -"P0463";"ENGR-ENC";0;"N";1.98;94;15;22;0.49;0;5 -"P0463";"ENGR-ENC";0;"N";1.98;94;15.5;8;0.18;0;5 -"P0463";"ENGR-ENC";0;"N";1.98;94;16;6;0.15;0;5 -"P0463";"ENGR-ENC";0;"N";1.98;94;16.5;0;0;0;5 -"P0463";"ENGR-ENC";0;"N";1.98;94;17;1;0.03;0;5 -"P0463";"ENGR-ENC";0;"N";1.98;94;17.5;2;0.07;0;5 -"P0463";"ENGR-ENC";0;"N";1.98;94;20;1;0.05;0;5 -"P0463";"MERL-MCC";0;"N";3.94;8;19;1;0;1;1 -"P0463";"MERL-MCC";0;"N";3.94;8;31;1;0;1;1 -"P0463";"MERL-MCC";0;"N";3.94;8;36;1;0;1;1 -"P0463";"MERL-MCC";0;"N";3.94;8;37;1;0;1;1 -"P0463";"MERL-MCC";0;"N";3.94;8;39;1;0;1;1 -"P0463";"MERL-MCC";0;"N";3.94;8;44;1;0;1;1 -"P0463";"MERL-MCC";0;"N";3.94;8;50;1;0;1;1 -"P0463";"MERL-MCC";0;"N";3.94;8;54;1;0;1;1 -"P0463";"SARD-PIL";0;"N";0.12;3;16.5;2;0;0;5 -"P0463";"SARD-PIL";0;"N";0.12;3;19.5;1;0;0;5 -"P0463";"TRAC-TRU";0;"N";2.54;50;17;11;0;1;1 -"P0463";"TRAC-TRU";0;"N";2.54;50;18;28;0;1;1 -"P0463";"TRAC-TRU";0;"N";2.54;50;19;10;0;1;1 -"P0463";"TRAC-TRU";0;"N";2.54;50;20;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;78;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;79;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;81;1;0;1;1 -"P0505";"BELO-BEO";0;"N";9.88;17;83;1;0;1;1 -"P0505";"DIVE-RS2";0;"N";0.18;34;0;34;NA;1;1 -"P0505";"ENGR-ENC";0;"N";2.45;68;14.5;1;0.02;0;5 -"P0505";"ENGR-ENC";0;"N";2.45;68;15;4;0.1;0;5 -"P0505";"ENGR-ENC";0;"N";2.45;68;15.5;8;0.21;0;5 -"P0505";"ENGR-ENC";0;"N";2.45;68;16;8;0.23;0;5 -"P0505";"ENGR-ENC";0;"N";2.45;68;16.5;5;0.16;0;5 -"P0505";"ENGR-ENC";0;"N";2.45;68;17;7;0.25;0;5 -"P0505";"ENGR-ENC";0;"N";2.45;68;17.5;10;0.38;0;5 -"P0505";"ENGR-ENC";0;"N";2.45;68;18;9;0.36;0;5 -"P0505";"ENGR-ENC";0;"N";2.45;68;18.5;13;0.58;0;5 -"P0505";"ENGR-ENC";0;"N";2.45;68;19;3;0.14;0;5 -"P0505";"PRIO-GLA";0;"N";15.72;1;158;1;15.72;1;1 -"P0505";"SARD-PIL";0;"N";4.42;60;17.5;1;0.04;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;18;0;0;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;18.5;0;0;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;19;6;0.32;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;19.5;8;0.47;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;20;5;0.32;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;20.5;4;0.27;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;21;5;0.36;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;21.5;8;0.61;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;22;7;0.56;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;22.5;8;0.68;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;23;2;0.18;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;23.5;4;0.38;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;24;0;0;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;24.5;1;0.1;0;5 -"P0505";"SARD-PIL";0;"N";4.42;60;25;1;0.1;0;5 -"P0505";"SCOM-SCO";0;"N";7.82;44;22;1;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;23;0;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;24;1;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;25;1;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;26;1;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;27;10;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;28;8;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;29;10;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;30;9;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;31;2;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;32;1;0;1;1 -"P0505";"SCOM-SCO";0;"N";7.82;44;34;0;NA;1;1 -"P0506";"DIVE-RS3";0;"N";0.27;0;0;0;NA;1;1 -"P0550";"ENGR-ENC";0;"N";2.22;106;16.5;6;0.18;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;17;2;0.06;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;17.5;1;0.04;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;18.5;0;NA;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;12.5;4;0.05;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;13;15;0.23;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;13.5;18;0.3;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;14;18;0.34;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;14.5;16;0.35;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;15;15;0.35;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;15.5;7;0.18;0;5 -"P0550";"ENGR-ENC";0;"N";2.22;106;16;4;0.11;0;5 -"P0550";"MERL-MCC";0;"N";0.18;1;29;1;0;1;1 -"P0550";"SARD-PIL";0;"N";1.38;17;21;1;0;0;5 -"P0550";"SARD-PIL";0;"N";1.38;17;21.5;5;0;0;5 -"P0550";"SARD-PIL";0;"N";1.38;17;22;3;0;0;5 -"P0550";"SARD-PIL";0;"N";1.38;17;22.5;4;0;0;5 -"P0550";"SARD-PIL";0;"N";1.38;17;23;2;0;0;5 -"P0550";"SARD-PIL";0;"N";1.38;17;23.5;2;0;0;5 -"P0550";"SCOM-JAP";0;"N";7;86;19;6;0.37;1;1 -"P0550";"SCOM-JAP";0;"N";7;86;20;19;1.3;1;1 -"P0550";"SCOM-JAP";0;"N";7;86;21;28;2.18;1;1 -"P0550";"SCOM-JAP";0;"N";7;86;22;17;1.51;1;1 -"P0550";"SCOM-JAP";0;"N";7;86;23;8;0.84;1;1 -"P0550";"SCOM-JAP";0;"N";7;86;24;7;0.79;1;1 -"P0550";"SCOM-JAP";0;"N";7;86;25;1;0.13;1;1 -"P0550";"SCOM-JAP";0;"N";7;86;27;0;NA;1;1 -"P0550";"SCOM-SCO";0;"N";1.24;9;24;2;0;1;1 -"P0550";"SCOM-SCO";0;"N";1.24;9;25;2;0;1;1 -"P0550";"SCOM-SCO";0;"N";1.24;9;26;0;0;1;1 -"P0550";"SCOM-SCO";0;"N";1.24;9;27;1;0;1;1 -"P0550";"SCOM-SCO";0;"N";1.24;9;28;4;0;1;1 -"P0550";"TRAC-TRU";0;"N";1.24;35;13;2;0;1;1 -"P0550";"TRAC-TRU";0;"N";1.24;35;14;1;0;1;1 -"P0550";"TRAC-TRU";0;"N";1.24;35;15;2;0;1;1 -"P0550";"TRAC-TRU";0;"N";1.24;35;16;11;0;1;1 -"P0550";"TRAC-TRU";0;"N";1.24;35;17;18;0;1;1 -"P0550";"TRAC-TRU";0;"N";1.24;35;18;1;0;1;1 -"P0553";"ENGR-ENC";0;"N";2.21;112;11.5;1;0.01;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;12;0;0;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;12.5;2;0.02;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;13;23;0.34;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;13.5;15;0.25;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;14;17;0.31;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;19.5;4;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;20;5;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;20.5;9;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;21;5;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;21.5;6;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;22;1;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;22.5;2;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;23;0;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;23.5;1;0;0;5 -"P0559";"SCOM-JAP";0;"N";0.21;2;22;1;0;1;1 -"P0559";"SCOM-JAP";0;"N";0.21;2;24;1;0;1;1 -"P0559";"SCOM-SCO";0;"N";0.33;5;11;2;0;1;1 -"P0559";"SCOM-SCO";0;"N";0.33;5;12;1;0;1;1 -"P0559";"SCOM-SCO";0;"N";0.33;5;25;1;0;1;1 -"P0559";"SCOM-SCO";0;"N";0.33;5;26;1;0;1;1 -"P0559";"TODA-EBL";0;"N";0.02;1;0;1;0;1;1 -"P0559";"TRAC-TRU";0;"N";2.84;70;12;1;0;1;1 -"P0559";"TRAC-TRU";0;"N";2.84;70;13;0;0;1;1 -"P0559";"TRAC-TRU";0;"N";2.84;70;14;2;0;1;1 -"P0559";"TRAC-TRU";0;"N";2.84;70;15;7;0;1;1 -"P0559";"TRAC-TRU";0;"N";2.84;70;16;19;0;1;1 -"P0559";"TRAC-TRU";0;"N";2.84;70;17;33;0;1;1 -"P0559";"TRAC-TRU";0;"N";2.84;70;18;7;0;1;1 -"P0559";"TRAC-TRU";0;"N";2.84;70;19;1;0;1;1 -"P0561";"ENGR-ENC";0;"N";1.99;96;12.5;2;0.03;0;5 -"P0561";"ENGR-ENC";0;"N";1.99;96;13;8;0.12;0;5 -"P0561";"ENGR-ENC";0;"N";1.99;96;13.5;17;0.28;0;5 -"P0561";"ENGR-ENC";0;"N";1.99;96;14;16;0.29;0;5 -"P0561";"ENGR-ENC";0;"N";1.99;96;14.5;15;0.3;0;5 -"P0561";"ENGR-ENC";0;"N";1.99;96;15;19;0.43;0;5 -"P0561";"ENGR-ENC";0;"N";1.99;96;15.5;10;0.25;0;5 -"P0561";"ENGR-ENC";0;"N";1.99;96;16;5;0.14;0;5 -"P0561";"ENGR-ENC";0;"N";1.99;96;16.5;3;0.09;0;5 -"P0561";"ENGR-ENC";0;"N";1.99;96;17;1;0.03;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;17.5;2;0.09;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;19;4;0.24;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;19.5;7;0.42;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;20;8;0.53;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;20.5;14;0.98;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;21;8;0.58;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;21.5;7;0.55;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;22;15;1.28;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;22.5;6;0.52;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;23;2;0.18;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;23.5;1;0.09;0;5 -"P0489";"MERL-MCC";0;"N";10.26;16;56;2;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;61;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;64;1;0;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;17;2;0.07;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;18;6;0.24;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;20;33;1.5;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;21;41;2.13;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;22;26;1.55;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;23;4;0.28;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;24;3;0.24;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;25;1;0.07;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;28;1;0.11;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;29;1;0.16;1;1 -"P0489";"MICR-POU";0;"N";6.56;119;31;1;0.19;1;1 -"P0489";"MYCT-OPX";0;"N";0.004;3;4;1;NA;1;1 -"P0489";"MYCT-OPX";0;"N";0.004;3;5;1;NA;1;1 -"P0489";"MYCT-OPX";0;"N";0.004;3;6;1;NA;1;1 -"P0489";"SARD-PIL";0;"N";0.25;3;22.5;1;0;0;5 -"P0489";"SARD-PIL";0;"N";0.25;3;23;1;0;0;5 -"P0489";"SARD-PIL";0;"N";0.25;3;24.5;1;0;0;5 -"P0489";"SCOM-SCO";0;"N";9.22;61;19;1;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;20;1;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;21;4;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;22;8;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;23;3;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;24;13;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;25;7;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;26;4;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;27;2;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;28;1;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;29;1;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;30;4;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;31;5;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;32;1;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;33;4;0;1;1 -"P0489";"SCOM-SCO";0;"N";9.22;61;34;2;0;1;1 -"P0489";"TODA-EBL";0;"N";0.15;2;9;1;0;1;1 -"P0489";"TODA-EBL";0;"N";0.15;2;11;1;0;1;1 -"P0489";"TRAC-MED";0;"N";1.36;1;57;1;0;1;1 -"P0489";"TRAC-TRU";0;"N";8.06;69;21;2;0.16;1;1 -"P0489";"TRAC-TRU";0;"N";8.06;69;22;6;0.56;1;1 -"P0489";"TRAC-TRU";0;"N";8.06;69;23;28;2.96;1;1 -"P0489";"TRAC-TRU";0;"N";8.06;69;24;16;1.83;1;1 -"P0489";"TRAC-TRU";0;"N";8.06;69;25;14;1.99;1;1 -"P0489";"TRAC-TRU";0;"N";8.06;69;26;1;0.15;1;1 -"P0489";"TRAC-TRU";0;"N";8.06;69;27;1;0.17;1;1 -"P0489";"TRAC-TRU";0;"N";8.06;69;28;1;0.22;1;1 -"P0489";"ZEUS-FAB";0;"N";2.82;1;53;1;0;1;1 -"P0449";"ENGR-ENC";0;"N";1.13;46;16.5;3;0;0;5 -"P0449";"ENGR-ENC";0;"N";1.13;46;17;2;0;0;5 -"P0449";"ENGR-ENC";0;"N";1.13;46;17.5;1;0;0;5 -"P0449";"ENGR-ENC";0;"N";1.13;46;18;1;0;0;5 -"P0449";"ENGR-ENC";0;"N";1.13;46;14;2;0;0;5 -"P0449";"ENGR-ENC";0;"N";1.13;46;14.5;5;0;0;5 -"P0449";"ENGR-ENC";0;"N";1.13;46;15;15;0;0;5 -"P0449";"ENGR-ENC";0;"N";1.13;46;15.5;10;0;0;5 -"P0449";"ENGR-ENC";0;"N";1.13;46;16;7;0;0;5 -"P0449";"MICR-POU";0;"N";0.001;1;5;1;0;1;1 -"P0449";"SARD-PIL";0;"N";5.83;94;23;1;0.1;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;18;1;0.04;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;18.5;6;0.3;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;19.5;21;1.2;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;20;17;1;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;20.5;8;0.53;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;21;15;1.07;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;21.5;7;0.54;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;22;3;0.25;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;22.5;0;0;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;19;15;0.78;0;5 -"P0449";"SARD-PIL";0;"N";5.83;94;24;0;NA;0;5 -"P0449";"SCOM-SCO";0;"N";0.2;2;23;1;0;1;1 -"P0449";"SCOM-SCO";0;"N";0.2;2;24;1;0;1;1 -"P0450";"TRAC-TRU";0;"N";1.04;18;20;2;0;1;1 -"P0455";"TRAC-TRU";0;"N";4.1;86;19;7;0;1;1 -"P0460";"SARD-PIL";0;"N";0.13;3;18;1;0;0;5 -"P0460";"SARD-PIL";0;"N";0.13;3;20;1;0;0;5 -"P0493";"DIVE-RS1";0;"N";0.24;36;0;36;NA;1;1 -"P0493";"ENGR-ENC";0;"N";0.04;3;13;1;0;0;5 -"P0493";"ENGR-ENC";0;"N";0.04;3;13.5;2;0;0;5 -"P0493";"MERL-MCC";0;"N";0.1;1;26;1;0;1;1 -"P0493";"MICR-POU";0;"N";0.42;8;18;1;0;1;1 -"P0493";"MICR-POU";0;"N";0.42;8;20;4;0;1;1 -"P0493";"MICR-POU";0;"N";0.42;8;21;2;0;1;1 -"P0493";"MICR-POU";0;"N";0.42;8;23;1;0;1;1 -"P0493";"SARD-PIL";0;"N";0.07;1;20.5;1;0;0;5 -"P0493";"SCOM-SCO";0;"N";4.62;18;28;2;0;1;1 -"P0493";"SCOM-SCO";0;"N";4.62;18;29;1;0;1;1 -"P0493";"SCOM-SCO";0;"N";4.62;18;30;2;0;1;1 -"P0384";"SARD-PIL";0;"N";4.9;71;19.5;6;0;0;5 -"P0384";"SARD-PIL";0;"N";4.9;71;20;10;0;0;5 -"P0384";"SARD-PIL";0;"N";4.9;71;20.5;7;0;0;5 -"P0384";"SARD-PIL";0;"N";4.9;71;21;14;0;0;5 -"P0384";"SARD-PIL";0;"N";4.9;71;21.5;10;0;0;5 -"P0384";"SARD-PIL";0;"N";4.9;71;22;13;0;0;5 -"P0384";"SARD-PIL";0;"N";4.9;71;22.5;7;0;0;5 -"P0384";"SCOM-JAP";0;"N";7.48;90;16;2;0.05;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;17;3;0.1;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;18;1;0.04;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;19;14;0.71;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;20;16;0.96;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;21;22;1.55;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;22;12;0.98;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;23;13;1.23;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;24;5;0.54;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;28;1;0.17;1;1 -"P0384";"SCOM-JAP";0;"N";7.48;90;31;1;0.25;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;23;1;0.08;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;24;1;0.09;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;29;1;0.17;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;30;1;0.19;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;31;1;0.21;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;32;4;0.93;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;33;3;0.77;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;34;2;0.56;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;35;0;0;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;36;4;1.34;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;37;1;0.36;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;38;1;0.39;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;39;1;0.42;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;40;1;0.46;1;1 -"P0384";"SCOM-SCO";0;"N";7.92;26;41;4;2;1;1 -"P0384";"TRAC-TRU";0;"N";3.19;340;11;15;0.2;1;1 -"P0384";"TRAC-TRU";0;"N";0.42;340;11;15;0.2;1;1 -"P0384";"TRAC-TRU";0;"N";3.19;340;12;85;1.32;1;1 -"P0384";"TRAC-TRU";0;"N";0.42;340;12;85;1.32;1;1 -"P0384";"TRAC-TRU";0;"N";3.19;340;13;41;0.77;1;1 -"P0384";"TRAC-TRU";0;"N";0.42;340;13;41;0.77;1;1 -"P0384";"TRAC-TRU";0;"N";3.19;340;14;8;0.19;1;1 -"P0384";"TRAC-TRU";0;"N";0.42;340;14;8;0.19;1;1 -"P0384";"TRAC-TRU";0;"N";3.19;340;15;12;0.35;1;1 -"P0384";"TRAC-TRU";0;"N";0.42;340;15;12;0.35;1;1 -"P0384";"TRAC-TRU";0;"N";3.19;340;16;5;0.18;1;1 -"P0384";"TRAC-TRU";0;"N";0.42;340;16;5;0.18;1;1 -"P0384";"TRAC-TRU";0;"N";3.19;340;17;4;0.17;1;1 -"P0384";"TRAC-TRU";0;"N";0.42;340;17;4;0.17;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;31;12;3.05;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;32;17;4.61;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;33;25;7.15;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;34;20;6.57;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;35;8;2.92;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;36;0;0;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;37;4;1.73;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;38;1;0.5;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;39;3;1.53;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;40;1;0.52;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;41;0;0;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;42;0;0;1;1 -"P0377";"SCOM-JAP";0;"N";31.05;100;43;1;0.69;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;30;2;0.41;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;31;2;0.44;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;32;5;1.18;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;33;7;1.83;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;34;18;5.22;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;35;14;4.26;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;36;8;2.86;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;37;7;2.46;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;38;7;2.83;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;39;12;5.08;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;40;12;5.49;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;41;7;3.48;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;42;0;0;1;1 -"P0377";"SCOM-SCO";0;"N";36.07;102;43;1;0.51;1;1 -"P0377";"TODA-EBL";0;"N";0.11;2;0;2;0;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;21;2;0.17;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;22;1;0.09;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;23;1;0.11;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;24;3;0.35;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;25;0;0;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;26;5;0.85;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;27;13;2.23;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;28;35;6.45;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;29;51;10.61;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;30;29;6.72;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;31;12;3.06;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;32;5;1.33;1;1 -"P0377";"TRAC-TRU";0;"N";31.99;157;34;0;NA;1;1 -"P0404";"SCOM-SCO";0;"N";1.94;6;33;1;0.25;1;1 -"P0404";"SCOM-SCO";0;"N";1.94;6;34;2;0.56;1;1 -"P0404";"SCOM-SCO";0;"N";1.94;6;35;1;0.3;1;1 -"P0404";"SCOM-SCO";0;"N";1.94;6;39;1;0.42;1;1 -"P0404";"SCYL-CAN";0;"F";0.29;1;44;1;0.28;1;1 -"P0404";"TRAC-DRA";0;"N";0.1;1;25;1;0;1;1 -"P0494";"BELO-BEO";0;"N";2.96;5;64;1;0;1;1 -"P0554";"ENGR-ENC";0;"N";2.22;123;12;7;0.08;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;12.5;11;0.15;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;13;21;0.3;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;13.5;24;0.4;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;14;27;0.5;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;14.5;12;0.25;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;15;9;0.21;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;15.5;6;0.15;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;16;4;0.1;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;16.5;1;0.03;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;18.5;1;0.04;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;14.5;18;0.37;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;15;19;0.43;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;15.5;10;0.24;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;16;3;0.08;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;16.5;2;0.06;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;17;1;0.03;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;17.5;0;0;0;5 -"P0553";"ENGR-ENC";0;"N";2.21;112;18;0;0;0;5 -"P0553";"MERL-MCC";0;"N";1.75;20;17;2;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;18;1;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;19;3;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;20;1;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;23;3;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;24;0;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;25;2;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;26;5;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;27;1;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;28;1;0;1;1 -"P0553";"MERL-MCC";0;"N";1.75;20;29;1;0;1;1 -"P0553";"MICR-POU";0;"N";0.23;1;32;1;0;1;1 -"P0553";"SARD-PIL";0;"N";0.18;2;22;1;0;0;5 -"P0553";"SARD-PIL";0;"N";0.18;2;23;1;0;0;5 -"P0553";"SCOM-JAP";0;"N";3.72;36;21;2;0;1;1 -"P0553";"SCOM-JAP";0;"N";3.72;36;22;14;0;1;1 -"P0553";"SCOM-JAP";0;"N";3.72;36;23;13;0;1;1 -"P0553";"SCOM-JAP";0;"N";3.72;36;24;7;0;1;1 -"P0553";"SCOM-SCO";0;"N";0.65;8;11;1;0;1;1 -"P0553";"SCOM-SCO";0;"N";0.65;8;12;2;0;1;1 -"P0553";"SCOM-SCO";0;"N";0.65;8;13;1;0;1;1 -"P0553";"SCOM-SCO";0;"N";0.65;8;24;1;0;1;1 -"P0553";"SCOM-SCO";0;"N";0.65;8;27;2;0;1;1 -"P0553";"SCOM-SCO";0;"N";0.65;8;28;1;0;1;1 -"P0553";"TRAC-TRU";0;"N";26.8;121;11;1;0.01;1;1 -"P0495";"DIVE-RS2";0;"N";0.11;20;0;20;NA;1;1 -"P0495";"MOLA-MOL";0;"N";7.4;1;47;1;0;1;1 -"P0495";"TRAC-TRU";0;"N";5.74;94;17;1;0.04;1;1 -"P0495";"TRAC-TRU";0;"N";5.74;94;18;23;1.26;1;1 -"P0495";"TRAC-TRU";0;"N";5.74;94;19;48;2.86;1;1 -"P0495";"TRAC-TRU";0;"N";5.74;94;20;18;1.24;1;1 -"P0495";"TRAC-TRU";0;"N";5.74;94;21;3;0.23;1;1 -"P0494";"BELO-BEO";0;"N";2.96;5;67;1;0;1;1 -"P0494";"BELO-BEO";0;"N";2.96;5;70;1;0;1;1 -"P0494";"BELO-BEO";0;"N";2.96;5;84;1;0;1;1 -"P0494";"BELO-BEO";0;"N";2.96;5;96;1;0;1;1 -"P0494";"DIVE-RS2";0;"N";0.31;50;0;50;NA;1;1 -"P0494";"ENGR-ENC";0;"N";2.69;76;15;1;0.03;0;5 -"P0494";"ENGR-ENC";0;"N";2.69;76;15.5;14;0.38;0;5 -"P0494";"ENGR-ENC";0;"N";2.69;76;16;10;0.29;0;5 -"P0494";"ENGR-ENC";0;"N";2.69;76;16.5;12;0.4;0;5 -"P0494";"ENGR-ENC";0;"N";2.69;76;17;12;0.42;0;5 -"P0494";"ENGR-ENC";0;"N";2.69;76;17.5;8;0.31;0;5 -"P0494";"ENGR-ENC";0;"N";2.69;76;18;13;0.55;0;5 -"P0494";"ENGR-ENC";0;"N";2.69;76;18.5;5;0.24;0;5 -"P0494";"ENGR-ENC";0;"N";2.69;76;19;1;0.05;0;5 -"P0494";"ENGR-ENC";0;"N";2.69;76;20;0;0;0;5 -"P0494";"MOLA-MOL";0;"N";8.1;2;35;1;3.16;1;1 -"P0494";"MOLA-MOL";0;"N";8.1;2;41;1;4.94;1;1 -"P0494";"SARD-PIL";0;"N";5.33;81;17.5;3;0.12;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;18;1;0.04;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;18.5;4;0.21;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;19;4;0.21;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;19.5;17;0.98;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;20;18;1.13;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;20.5;5;0.33;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;21;7;0.55;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;21.5;12;0.91;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;22;6;0.5;0;5 -"P0494";"SARD-PIL";0;"N";5.33;81;22.5;4;0.34;0;5 -"P0494";"SCOM-JAP";0;"N";2.51;28;20;4;0;1;1 -"P0494";"SCOM-JAP";0;"N";2.51;28;21;12;0;1;1 -"P0494";"SCOM-JAP";0;"N";2.51;28;22;9;0;1;1 -"P0494";"SCOM-JAP";0;"N";2.51;28;23;3;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;22;1;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;23;1;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;24;1;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;25;1;0;1;1 -"P0554";"ENGR-ENC";0;"N";2.22;123;17;0;0;0;5 -"P0554";"ENGR-ENC";0;"N";2.22;123;17.5;1;0.03;0;5 -"P0554";"MERL-MCC";0;"N";1.61;11;19;1;0;1;1 -"P0554";"MERL-MCC";0;"N";1.61;11;20;2;0;1;1 -"P0554";"MERL-MCC";0;"N";1.61;11;25;1;0;1;1 -"P0554";"MERL-MCC";0;"N";1.61;11;27;3;0;1;1 -"P0554";"MERL-MCC";0;"N";1.61;11;29;2;0;1;1 -"P0554";"MERL-MCC";0;"N";1.61;11;31;1;0;1;1 -"P0554";"MERL-MCC";0;"N";1.61;11;43;1;0;1;1 -"P0554";"MICR-POU";0;"N";0.14;1;27;1;0;1;1 -"P0554";"SCOM-JAP";0;"N";0.91;11;19;3;0;1;1 -"P0554";"SCOM-JAP";0;"N";0.91;11;20;1;0;1;1 -"P0554";"SCOM-JAP";0;"N";0.91;11;21;0;0;1;1 -"P0554";"SCOM-JAP";0;"N";0.91;11;22;5;0;1;1 -"P0554";"SCOM-JAP";0;"N";0.91;11;23;2;0;1;1 -"P0554";"SCOM-SCO";0;"N";0.14;15;10;2;0;1;1 -"P0554";"SCOM-SCO";0;"N";0.14;15;11;7;0;1;1 -"P0554";"SCOM-SCO";0;"N";0.14;15;12;5;0;1;1 -"P0554";"SCOM-SCO";0;"N";0.14;15;13;1;0;1;1 -"P0554";"TRAC-TRU";0;"N";2.81;89;12;10;0;1;1 -"P0554";"TRAC-TRU";0;"N";2.81;89;13;9;0;1;1 -"P0554";"TRAC-TRU";0;"N";2.81;89;14;5;0;1;1 -"P0554";"TRAC-TRU";0;"N";2.81;89;15;8;0;1;1 -"P0554";"TRAC-TRU";0;"N";2.81;89;16;37;0;1;1 -"P0554";"TRAC-TRU";0;"N";2.81;89;17;20;0;1;1 -"P0553";"TRAC-TRU";0;"N";26.8;121;12;9;0.01;1;1 -"P0553";"TRAC-TRU";0;"N";26.8;121;13;5;0.09;1;1 -"P0553";"TRAC-TRU";0;"N";26.8;121;14;1;0.02;1;1 -"P0553";"TRAC-TRU";0;"N";26.8;121;15;4;0.12;1;1 -"P0553";"TRAC-TRU";0;"N";26.8;121;16;33;1.17;1;1 -"P0553";"TRAC-TRU";0;"N";26.8;121;17;56;2.33;1;1 -"P0553";"TRAC-TRU";0;"N";26.8;121;18;12;0.57;1;1 -"P0553";"TRAC-TRU";0;"N";26.8;121;20;0;NA;1;1 -"P0553";"ZEUS-FAB";0;"N";1.66;1;48;1;0;1;1 -"P0557";"ENGR-ENC";0;"N";1.07;55;12;1;0.01;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;12.5;3;0.04;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;13;11;0.17;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;13.5;8;0.13;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;14;13;0.24;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;14.5;7;0.13;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;15;4;0.09;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;15.5;1;0.02;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;16;2;0.05;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;16.5;2;0.06;0;5 -"P0557";"ENGR-ENC";0;"N";1.07;55;17;3;0.1;0;5 -"P0495";"TRAC-TRU";0;"N";5.74;94;22;1;0.09;1;1 -"P0495";"TRAC-TRU";0;"N";5.74;94;24;0;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;28;3;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;29;1;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;30;1;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;31;0;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;32;1;0;1;1 -"P0494";"SCOM-SCO";0;"N";1.91;11;39;1;0;1;1 -"P0500";"DIVE-RS2";0;"N";0.11;20;0;20;NA;1;1 -"P0500";"ENGR-ENC";0;"N";1.1;26;17;3;0;0;5 -"P0500";"ENGR-ENC";0;"N";1.1;26;17.5;9;0;0;5 -"P0500";"ENGR-ENC";0;"N";1.1;26;18;7;0;0;5 -"P0500";"ENGR-ENC";0;"N";1.1;26;18.5;6;0;0;5 -"P0500";"ENGR-ENC";0;"N";1.1;26;19;1;0;0;5 -"P0500";"MERL-MCC";0;"N";21.52;35;31;0;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;32;1;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;35;2;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;36;1;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;37;4;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;38;1;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;39;3;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;40;2;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;41;2;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;42;2;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;43;2;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;44;0;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;45;1;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;46;1;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;47;1;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;48;1;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;49;3;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;50;4;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;51;1;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;52;2;0;1;1 -"P0500";"MERL-MCC";0;"N";21.52;35;58;1;0;1;1 -"P0500";"MICR-POU";0;"N";0.53;9;20;2;0;1;1 -"P0500";"MICR-POU";0;"N";0.53;9;21;4;0;1;1 -"P0500";"MICR-POU";0;"N";0.53;9;22;1;0;1;1 -"P0500";"MICR-POU";0;"N";0.53;9;23;2;0;1;1 -"P0500";"MOLA-MOL";0;"N";33.88;4;39;1;4.04;1;1 -"P0500";"MOLA-MOL";0;"N";33.88;4;53;1;9;1;1 -"P0500";"MOLA-MOL";0;"N";33.88;4;44;1;5.78;1;1 -"P0500";"MOLA-MOL";0;"N";33.88;4;62;1;15.06;1;1 -"P0500";"SARD-PIL";0;"N";1.71;27;18.5;1;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.35;92;9;1;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.4;92;9;1;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.35;92;9.5;2;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.4;92;9.5;2;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.35;92;10;3;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.4;92;10;3;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.35;92;10.5;11;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.4;92;10.5;11;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.35;92;11;13;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.4;92;11;13;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.35;92;11.5;8;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.4;92;11.5;8;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.35;92;12;6;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.4;92;12;6;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.35;92;12.5;1;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.4;92;12.5;1;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.35;92;13.5;1;0;0;5 -"P0484";"ENGR-ENC";0;"N";0.4;92;13.5;1;0;0;5 -"P0484";"MERL-MCC";0;"N";23.74;106;17;4;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;18;3;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;19;10;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;20;9;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;21;6;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;22;7;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;23;8;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;24;6;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;25;7;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;26;10;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;27;7;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;28;5;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;29;3;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;30;3;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;33;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;34;2;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;36;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;37;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;38;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;39;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;40;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;41;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;42;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;43;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;51;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;54;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;62;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;63;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;65;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;67;1;0;1;1 -"P0484";"MERL-MCC";0;"N";23.74;106;70;1;0;1;1 -"P0372";"SCOM-SCO";0;"N";0.06;1;22;1;0.06;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;35;5;1.53;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;36;2;0.67;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;37;1;0.36;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;38;5;1.98;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;39;1;0.42;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;25;7;0.87;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;28;1;0.17;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;29;3;0.6;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;30;2;0.44;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;17;1;0.03;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;18;5;0.21;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;19;4;0.2;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;20;7;0.42;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;21;18;1.27;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;22;18;1.48;1;1 -"P0379";"SCOM-JAP";0;"N";8.88;91;23;18;1.71;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;31;2;0.42;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;32;1;0.23;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;33;3;0.77;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;34;5;1.4;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;35;5;1.53;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;36;8;2.68;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;37;5;1.82;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;38;3;1.19;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;39;5;2.14;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;40;4;1.85;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;41;3;1.5;1;1 -"P0379";"SCOM-SCO";0;"N";17.62;46;42;2;1.08;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;10;1;0.00775244850909183;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;11;0;0;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;12;1;0.01;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;13;3;0.05;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;14;4;0.08;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;15;14;0.37;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;16;26;0.83;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;17;24;0.93;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;18;10;0.46;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;19;3;0.21;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;18;12;0.44;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;19;6;0.26;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;20;3;0.15;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;21;0;0;1;1 -"P0384";"ENGR-ENC";0;"N";2.05;127;14;32;0.63;0;5 -"P0384";"ENGR-ENC";0;"N";2.05;127;14.5;8;0.17;0;5 -"P0384";"ENGR-ENC";0;"N";2.05;127;15;6;0.13;0;5 -"P0384";"MERL-MCC";0;"N";4.3;26;16;1;0.02;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;16;1;0.02;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;18;1;0.03;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;18;1;0.03;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;19;1;0.04;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;19;1;0.04;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;23;1;0.07;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;23;1;0.07;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;34;1;0.26;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;34;1;0.26;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;25;1;0.1;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;25;1;0.1;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;30;1;0.17;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;30;1;0.17;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;32;1;0.21;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;32;1;0.21;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;38;1;0.36;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;38;1;0.36;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;42;1;0.5;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;42;1;0.5;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;51;1;0.91;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;51;1;0.91;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;53;1;1.02;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;53;1;1.02;1;1 -"P0384";"MERL-MCC";0;"N";4.3;26;54;1;1.08;1;1 -"P0384";"MERL-MCC";0;"N";0.48;26;54;1;1.08;1;1 -"P0385";"ALLO-TEZ";0;"N";0.03;7;0;7;0;1;1 -"P0385";"ASPI-OBS";0;"N";0.16;1;28;1;0;1;1 -"P0385";"ENGR-ENC";0;"N";0.97;70;11;1;0.00795616830692451;0;5 -"P0385";"ENGR-ENC";0;"N";0.97;70;11.5;4;0.03;0;5 -"P0385";"ENGR-ENC";0;"N";0.97;70;12;9;0.09;0;5 -"P0385";"ENGR-ENC";0;"N";0.97;70;12.5;12;0.13;0;5 -"P0385";"ENGR-ENC";0;"N";0.97;70;13;25;0.32;0;5 -"P0385";"ENGR-ENC";0;"N";0.97;70;13.5;12;0.17;0;5 -"P0385";"ENGR-ENC";0;"N";0.97;70;14;4;0.06;0;5 -"P0385";"ENGR-ENC";0;"N";0.97;70;14.5;1;0.01;0;5 -"P0385";"ENGR-ENC";0;"N";0.97;70;15;2;0;0;5 -"P0385";"GALE-GAL";0;"M";2.76;2;55;1;0;1;1 -"P0385";"GALE-GAL";0;"M";2.76;2;76;1;0;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;15;1;0.02;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;16;2;0.05;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;17;6;0.18;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;18;9;0.33;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;19;6;0.26;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;20;11;0.56;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;21;4;0.23;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;22;2;0.13;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;23;3;0.23;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;24;2;0.17;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;25;1;0.1;1;1 -"P0385";"MERL-MCC";0;"N";2.73;48;27;1;0.12;1;1 -"P0385";"SARD-PIL";0;"N";1.78;23;19.5;1;0;0;5 -"P0385";"SARD-PIL";0;"N";1.78;23;20;1;0;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;19.5;15;1;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;20;21;1.33;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;20.5;31;2.13;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;21;23;1.65;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;21.5;5;0.38;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;22;9;0.72;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;22.5;2;0.18;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;15;1;0.02;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;17.5;2;0.08;0;5 -"P0389";"SARD-PIL";0;"N";8.13;121;18;1;0.04;0;5 -"P0389";"SPON-CAN";0;"N";0.73;1;35;1;0.7;1;1 -"P0389";"TRAC-DRA";0;"N";0.25;4;20;2;0.1;1;1 -"P0389";"TRAC-DRA";0;"N";0.25;4;22;1;0.06;1;1 -"P0389";"TRAC-DRA";0;"N";0.25;4;23;1;0.07;1;1 -"P0389";"TRAC-TRU";0;"N";0.06;2;15;1;0.02;1;1 -"P0389";"TRAC-TRU";0;"N";0.06;2;16;1;0.03;1;1 -"P0395";"DIVE-RS2";0;"N";0.12;42;0;42;NA;1;1 -"P0395";"MICR-POU";0;"N";0.03;50;3;4;0.000443198264359424;1;1 -"P0395";"MICR-POU";0;"N";0.03;50;4;33;0.00887397464041503;1;1 -"P0395";"MICR-POU";0;"N";0.03;50;5;13;0.00695389505460134;1;1 -"P0395";"MOLA-MOL";0;"N";5.02;1;43;1;0;1;1 -"P0395";"MYCT-OPX";0;"N";0.06;50;4;4;NA;1;1 -"P0395";"MYCT-OPX";0;"N";0.06;50;5;42;NA;1;1 -"P0395";"MYCT-OPX";0;"N";0.06;50;6;4;NA;1;1 -"P0385";"SARD-PIL";0;"N";1.78;23;20.5;5;0;0;5 -"P0385";"SARD-PIL";0;"N";1.78;23;21;6;0;0;5 -"P0385";"SARD-PIL";0;"N";1.78;23;21.5;2;0;0;5 -"P0385";"SARD-PIL";0;"N";1.78;23;22;5;0;0;5 -"P0385";"SARD-PIL";0;"N";1.78;23;22.5;3;0;0;5 -"P0385";"SARD-SAR";0;"N";1.44;1;53;1;0;1;1 -"P0385";"SCOM-SCO";0;"N";1.09;4;24;1;0.09;1;1 -"P0385";"SCOM-SCO";0;"N";1.09;4;30;1;0.19;1;1 -"P0385";"SCOM-SCO";0;"N";1.09;4;32;1;0.23;1;1 -"P0385";"SCOM-SCO";0;"N";1.09;4;45;1;0.66;1;1 -"P0385";"SEPI-OLZ";0;"N";0.01;6;0;6;NA;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;10;1;0.00775244850909183;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;11;1;0.01;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;12;20;0.26;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;13;14;0.24;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;14;11;0.23;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;15;14;0.37;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;16;12;0.38;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;17;6;0.23;1;1 -"P0395";"SCOM-SCO";0;"N";0.01;12;4;2;0.000766347825696447;1;1 -"P0395";"SCOM-SCO";0;"N";0.01;12;5;8;0.00610018257777708;1;1 -"P0395";"SCOM-SCO";0;"N";0.01;12;6;2;0.00267588053067527;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;22;1;0.06;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;23;1;0.07;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;24;2;0.17;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;25;0;0;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;26;2;0.22;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;27;4;0.51;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;28;2;0.28;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;29;4;0.64;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;30;0;0;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;31;0;0;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;32;2;0.43;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;33;0;0.23;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;34;2;0.52;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;35;2;0.57;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;36;5;1.56;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;37;1;0.33;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;38;1;0.36;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;39;1;0.39;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;40;1;0.43;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;41;1;0.46;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;47;3;2.12;1;1 -"P0396";"MERL-MCC";0;"N";12.16;81;61;1;1.57;1;1 -"P0396";"MICR-POU";0;"N";0.2;1;31;1;0.14;1;1 -"P0396";"SARD-PIL";0;"N";0.43;8;16;1;0;0;5 -"P0396";"SARD-PIL";0;"N";0.43;8;18;1;0;0;5 -"P0396";"SARD-PIL";0;"N";0.43;8;18.5;3;0;0;5 -"P0396";"SARD-PIL";0;"N";0.43;8;19.5;1;0;0;5 -"P0396";"SARD-PIL";0;"N";0.43;8;20.5;1;0;0;5 -"P0396";"SARD-PIL";0;"N";0.43;8;22;1;0;0;5 -"P0396";"SCOM-JAP";0;"N";7.94;24;17;1;0.03;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;18;1;0.04;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;23;2;0.19;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;32;1;0.27;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;33;9;2.75;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;34;4;1.35;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;35;0;0;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;36;2;0.81;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;37;2;0.88;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;41;1;0.61;1;1 -"P0396";"SCOM-JAP";0;"N";7.94;24;44;1;0.77;1;1 -"P0399";"SCOM-JAP";0;"N";0.38;6;17;1;0.03;1;1 -"P0399";"SCOM-JAP";0;"N";0.38;6;18;0;0;1;1 -"P0399";"SCOM-JAP";0;"N";0.38;6;19;2;0.1;1;1 -"P0399";"SCOM-JAP";0;"N";0.38;6;20;1;0.06;1;1 -"P0399";"SCOM-SCO";0;"N";0.49;1;37;1;0.36;1;1 -"P0399";"TRAC-TRU";0;"N";3.59;366;10;1;0.01;1;1 -"P0399";"TRAC-TRU";0;"N";0.5;366;10;1;0.01;1;1 -"P0399";"TRAC-TRU";0;"N";3.59;366;11;11;0.13;1;1 -"P0399";"TRAC-TRU";0;"N";0.5;366;11;11;0.13;1;1 -"P0399";"TRAC-TRU";0;"N";3.59;366;12;64;1.01;1;1 -"P0399";"TRAC-TRU";0;"N";0.5;366;12;64;1.01;1;1 -"P0399";"TRAC-TRU";0;"N";3.59;366;13;73;1.35;1;1 -"P0399";"TRAC-TRU";0;"N";0.5;366;13;73;1.35;1;1 -"P0399";"TRAC-TRU";0;"N";3.59;366;14;9;0.2;1;1 -"P0399";"TRAC-TRU";0;"N";0.5;366;14;9;0.2;1;1 -"P0399";"TRAC-TRU";0;"N";3.59;366;15;10;0.29;1;1 -"P0399";"TRAC-TRU";0;"N";0.5;366;15;10;0.29;1;1 -"P0399";"TRAC-TRU";0;"N";3.59;366;16;12;0.43;1;1 -"P0399";"TRAC-TRU";0;"N";0.5;366;16;12;0.43;1;1 -"P0399";"TRAC-TRU";0;"N";3.59;366;17;1;0.04;1;1 -"P0399";"TRAC-TRU";0;"N";0.5;366;17;1;0.04;1;1 -"P0399";"TRAC-TRU";0;"N";3.59;366;18;2;0.11;1;1 -"P0399";"TRAC-TRU";0;"N";0.5;366;18;2;0.11;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;26;1;0.14;1;1 -"P0409";"SCOM-JAP";0;"N";2.99;40;27;1;0.15;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;21;1;0.07;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;22;0;0;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;23;16;1.52;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;24;43;4.42;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;25;15;1.71;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;26;3;0.41;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;30;1;0.19;1;1 -"P0396";"SCOM-SCO";0;"N";1.46;5;32;2;0.46;1;1 -"P0396";"SCOM-SCO";0;"N";1.46;5;34;1;0.28;1;1 -"P0396";"SCOM-SCO";0;"N";1.46;5;35;1;0.3;1;1 -"P0396";"SCOM-SCO";0;"N";1.46;5;39;1;0.42;1;1 -"P0396";"TRAC-TRU";0;"N";1.12;252;13;2;0.03;1;1 -"P0396";"TRAC-TRU";0;"N";4.56;252;13;2;0.03;1;1 -"P0396";"TRAC-TRU";0;"N";1.12;252;14;3;0.06;1;1 -"P0396";"TRAC-TRU";0;"N";4.56;252;14;3;0.06;1;1 -"P0396";"TRAC-TRU";0;"N";1.12;252;15;29;0.76;1;1 -"P0396";"TRAC-TRU";0;"N";4.56;252;15;29;0.76;1;1 -"P0396";"TRAC-TRU";0;"N";1.12;252;16;58;1.87;1;1 -"P0396";"TRAC-TRU";0;"N";4.56;252;16;58;1.87;1;1 -"P0396";"TRAC-TRU";0;"N";1.12;252;17;29;1.12;1;1 -"P0396";"TRAC-TRU";0;"N";4.56;252;17;29;1.12;1;1 -"P0396";"TRAC-TRU";0;"N";1.12;252;18;4;0.18;1;1 -"P0396";"TRAC-TRU";0;"N";4.56;252;18;4;0.18;1;1 -"P0396";"TRAC-TRU";0;"N";1.12;252;19;1;0.05;1;1 -"P0396";"TRAC-TRU";0;"N";4.56;252;19;1;0.05;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;11;1;0;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;18;1;0;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;19;4;0;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;20;14;0;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;21;14;0;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;22;8;0;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;23;1;0;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;27;1;0;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;28;2;0;1;1 -"P0484";"MICR-POU";0;"N";3.54;51;29;5;0;1;1 -"P0484";"SARD-PIL";0;"N";0.3;4;21.5;2;0;0;5 -"P0484";"SARD-PIL";0;"N";0.3;4;22.5;2;0;0;5 -"P0484";"SCOM-SCO";0;"N";2.6;29;21;5;0;1;1 -"P0484";"SCOM-SCO";0;"N";2.6;29;22;13;0;1;1 -"P0484";"SCOM-SCO";0;"N";2.6;29;23;5;0;1;1 -"P0484";"SCOM-SCO";0;"N";2.6;29;24;4;0;1;1 -"P0484";"SCOM-SCO";0;"N";2.6;29;25;1;0;1;1 -"P0484";"SCOM-SCO";0;"N";2.6;29;27;1;0;1;1 -"P0484";"SPRA-SPR";0;"N";0.01;1;13;1;0;0;5 -"P0484";"TODA-EBL";0;"N";0.1;1;12;1;0.1;1;1 -"P0429";"ENGR-ENC";0;"N";3.62;184;17.5;2;0.07;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;18;3;0.12;0;5 -"P0429";"ENGR-ENC";0;"N";3.62;184;18.5;2;0.09;0;5 -"P0429";"MERL-MCC";0;"N";3.26;7;27;1;0.12;1;1 -"P0429";"MERL-MCC";0;"N";3.26;7;29;1;0.16;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;38;1;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;49;1;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;50;1;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;54;3;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;55;3;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;56;5;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;57;5;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;58;1;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;59;3;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;60;3;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;61;5;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;62;3;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;63;3;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;64;5;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;65;3;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;68;1;0;1;1 -"P0485";"MERL-MCC";0;"N";65.52;47;71;1;0;1;1 -"P0485";"MICR-POU";0;"N";0.21;2;23;1;0;1;1 -"P0485";"MICR-POU";0;"N";0.21;2;29;1;0;1;1 -"P0410";"BELO-BEO";0;"N";4.5;7;54;1;0;1;1 -"P0410";"BELO-BEO";0;"N";4.5;7;64;1;0;1;1 -"P0410";"BELO-BEO";0;"N";4.5;7;68;1;0;1;1 -"P0410";"BELO-BEO";0;"N";4.5;7;70;1;0;1;1 -"P0410";"BELO-BEO";0;"N";4.5;7;76;1;0;1;1 -"P0410";"BELO-BEO";0;"N";4.5;7;90;1;0;1;1 -"P0410";"BELO-BEO";0;"N";4.5;7;91;1;0;1;1 -"P0410";"CENT-NIR";0;"N";0.21;1;28;1;NA;1;1 -"P0410";"DIVE-RS1";0;"N";0.02;2;0;2;NA;1;1 -"P0410";"ENGR-ENC";0;"N";5.63;194;13.5;2;0.03;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;14;3;0.05;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;14.5;14;0.32;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;15;22;0.52;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;15.5;30;0.79;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;16;55;1.58;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;16.5;29;0.93;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;17;19;0.67;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;17.5;15;0.49;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;18;2;0.09;0;5 -"P0410";"ENGR-ENC";0;"N";5.63;194;18.5;3;0.12;0;5 -"P0410";"LOPH-BUD";0;"N";0.01;3;6;1;0.00376482952606717;1;1 -"P0410";"LOPH-BUD";0;"N";0.01;3;7;1;0.0058833301310022;1;1 -"P0410";"LOPH-BUD";0;"N";0.01;3;8;1;0.00866099717735616;1;1 -"P0410";"MOLA-MOL";0;"N";3.66;1;38;1;0;1;1 -"P0410";"SCOM-JAP";0;"N";1.64;17;18;1;0.04;1;1 -"P0410";"SCOM-JAP";0;"N";1.64;17;19;0;0;1;1 -"P0410";"SCOM-JAP";0;"N";1.64;17;20;2;0.12;1;1 -"P0410";"SCOM-JAP";0;"N";1.64;17;21;2;0.14;1;1 -"P0410";"SCOM-JAP";0;"N";1.64;17;22;2;0.16;1;1 -"P0410";"SCOM-JAP";0;"N";1.64;17;23;5;0.47;1;1 -"P0410";"SCOM-JAP";0;"N";1.64;17;24;4;0.43;1;1 -"P0410";"SCOM-JAP";0;"N";1.64;17;25;1;0.12;1;1 -"P0410";"SCOM-SCO";0;"N";1.86;20;6;1;0.00133794026533763;1;1 -"P0410";"SCOM-SCO";0;"N";1.86;20;21;1;0.06;1;1 -"P0410";"SCOM-SCO";0;"N";1.86;20;22;3;0.22;1;1 -"P0410";"SCOM-SCO";0;"N";1.86;20;23;7;0.59;1;1 -"P0410";"SCOM-SCO";0;"N";1.86;20;24;6;0.57;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;31;1;0.22;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;32;3;0.69;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;33;3;0.86;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;34;2;0.62;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;35;10;3.24;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;36;9;3.18;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;37;7;2.74;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;38;11;4.55;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;39;11;5.09;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;40;11;4.15;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;41;7;3.65;1;1 -"P0409";"SCOM-SCO";0;"N";38.47;156;42;2;1.11;1;1 -"P0409";"TRAC-TRU";0;"N";2.16;73;13;7;0.12;1;1 -"P0409";"TRAC-TRU";0;"N";2.16;73;14;5;0.1;1;1 -"P0405";"BELO-BEO";0;"N";0.56;1;74;1;0;1;1 -"P0405";"ENGR-ENC";0;"N";2.92;259;10;5;0.03;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;10.5;10;0.08;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;11;44;0.37;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;11.5;46;0.43;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;12;50;0.51;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;12.5;31;0.38;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;13;40;0.57;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;13.5;23;0.36;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;14;7;0.12;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;14.5;2;0.04;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;15;1;0.01;0;5 -"P0405";"ENGR-ENC";0;"N";2.92;259;16;0;0;0;5 -"P0405";"MOLA-MOL";0;"N";4.16;1;41;1;0;1;1 -"P0405";"SARD-PIL";0;"N";3.17;97;15;6;0.14;0;5 -"P0405";"SARD-PIL";0;"N";3.17;97;15.5;12;0.33;0;5 -"P0405";"SARD-PIL";0;"N";3.17;97;16;35;1.05;0;5 -"P0405";"SARD-PIL";0;"N";3.17;97;16.5;20;0.67;0;5 -"P0405";"SARD-PIL";0;"N";3.17;97;17;15;0.55;0;5 -"P0405";"SARD-PIL";0;"N";3.17;97;17.5;5;0.2;0;5 -"P0405";"SARD-PIL";0;"N";3.17;97;18;2;0.09;0;5 -"P0405";"SARD-PIL";0;"N";3.17;97;19.5;1;0.06;0;5 -"P0405";"SARD-PIL";0;"N";3.17;97;20.5;1;0.06;0;5 -"P0405";"SCOM-JAP";0;"N";9.28;41;28;3;0.53;1;1 -"P0405";"SCOM-JAP";0;"N";9.28;41;29;13;2.62;1;1 -"P0405";"SCOM-JAP";0;"N";9.28;41;30;9;2.02;1;1 -"P0405";"SCOM-JAP";0;"N";9.28;41;31;8;2;1;1 -"P0405";"SCOM-JAP";0;"N";9.28;41;32;5;1.38;1;1 -"P0405";"SCOM-JAP";0;"N";9.28;41;33;3;0.91;1;1 -"P0405";"SCOM-SCO";0;"N";0.48;1;37;1;0.36;1;1 -"P0500";"SARD-PIL";0;"N";1.71;27;19;3;0;0;5 -"P0500";"SARD-PIL";0;"N";1.71;27;19.5;6;0;0;5 -"P0500";"SARD-PIL";0;"N";1.71;27;20;5;0;0;5 -"P0500";"SARD-PIL";0;"N";1.71;27;20.5;4;0;0;5 -"P0422";"ENGR-ENC";0;"N";2;209;10;3;0.01;0;5 -"P0422";"ENGR-ENC";0;"N";2;209;10.5;16;0.11;0;5 -"P0422";"ENGR-ENC";0;"N";2;209;11;54;0.42;0;5 -"P0422";"ENGR-ENC";0;"N";2;209;11.5;43;0.38;0;5 -"P0422";"ENGR-ENC";0;"N";2;209;12;53;0.56;0;5 -"P0422";"ENGR-ENC";0;"N";2;209;12.5;21;0.24;0;5 -"P0422";"ENGR-ENC";0;"N";2;209;13;10;0.13;0;5 -"P0422";"ENGR-ENC";0;"N";2;209;13.5;7;0.1;0;5 -"P0422";"ENGR-ENC";0;"N";2;209;14;2;0.03;0;5 -"P0422";"MERL-MCC";0;"N";0.12;1;25;1;0.1;1;1 -"P0422";"SARD-PIL";0;"N";0.83;26;14.5;1;0;0;5 -"P0422";"SARD-PIL";0;"N";0.83;26;15;3;0;0;5 -"P0422";"SARD-PIL";0;"N";0.83;26;15.5;1;0;0;5 -"P0422";"SARD-PIL";0;"N";0.83;26;16;9;0;0;5 -"P0422";"SARD-PIL";0;"N";0.83;26;16.5;7;0;0;5 -"P0422";"SARD-PIL";0;"N";0.83;26;17;5;0;0;5 -"P0422";"SCOM-JAP";0;"N";0.22;1;31;1;0.25;1;1 -"P0422";"SCOM-SCO";0;"N";2.75;7;34;1;0;1;1 -"P0422";"SCOM-SCO";0;"N";2.75;7;35;1;0;1;1 -"P0422";"SCOM-SCO";0;"N";2.75;7;36;1;0;1;1 -"P0422";"SCOM-SCO";0;"N";2.75;7;37;2;0;1;1 -"P0422";"SCOM-SCO";0;"N";2.75;7;38;2;0;1;1 -"P0422";"SPRA-SPR";0;"N";0.57;51;10.5;3;0;0;5 -"P0422";"SPRA-SPR";0;"N";0.57;51;11;18;0;0;5 -"P0422";"SPRA-SPR";0;"N";0.57;51;11.5;22;0;0;5 -"P0422";"SPRA-SPR";0;"N";0.57;51;12;8;0;0;5 -"P0422";"TRAC-DRA";0;"N";0.34;3;25;1;0;1;1 -"P0422";"TRAC-DRA";0;"N";0.34;3;26;1;0;1;1 -"P0422";"TRAC-DRA";0;"N";0.34;3;27;0;0;1;1 -"P0422";"TRAC-DRA";0;"N";0.34;3;28;1;0;1;1 -"P0417";"TRAC-TRU";0;"N";3.13;89;15;12;0.31;1;1 -"P0417";"TRAC-TRU";0;"N";3.13;89;16;36;1.16;1;1 -"P0417";"TRAC-TRU";0;"N";3.13;89;17;22;0.85;1;1 -"P0417";"TRAC-TRU";0;"N";3.13;89;18;3;0.13;1;1 -"P0423";"SPRA-SPR";0;"N";0.91;85;10.5;20;0.18;0;5 -"P0423";"SPRA-SPR";0;"N";0.91;85;11;37;0.39;0;5 -"P0423";"SPRA-SPR";0;"N";0.91;85;11.5;20;0.23;0;5 -"P0423";"SPRA-SPR";0;"N";0.91;85;12;6;0.08;0;5 -"P0484";"CARI-DAC";0;"N";0.007;20;0;20;0.007;1;1 -"P0484";"CLUP-HAR";0;"N";0.28;2;25;1;0;0;5 -"P0484";"CLUP-HAR";0;"N";0.28;2;25.5;1;0;0;5 -"P0484";"DIVE-RS1";0;"N";0.09;3;0;3;0.09;1;1 -"P0429";"MERL-MCC";0;"N";3.26;7;31;1;0.43;1;1 -"P0429";"MERL-MCC";0;"N";3.26;7;32;2;0.43;1;1 -"P0429";"MERL-MCC";0;"N";3.26;7;51;1;0.91;1;1 -"P0429";"MERL-MCC";0;"N";3.26;7;54;1;1.08;1;1 -"P0429";"SARD-PIL";0;"N";7.43;108;18;1;0.05;0;5 -"P0429";"SARD-PIL";0;"N";7.43;108;18.5;4;0.2;0;5 -"P0429";"SARD-PIL";0;"N";7.43;108;19.5;14;0.83;0;5 -"P0429";"SARD-PIL";0;"N";7.43;108;20;18;1.15;0;5 -"P0429";"SARD-PIL";0;"N";7.43;108;20.5;23;1.56;0;5 -"P0429";"SARD-PIL";0;"N";7.43;108;21;22;1.63;0;5 -"P0429";"SARD-PIL";0;"N";7.43;108;21.5;13;1.01;0;5 -"P0429";"SARD-PIL";0;"N";7.43;108;22;6;0.53;0;5 -"P0429";"SARD-PIL";0;"N";7.43;108;22.5;2;0.16;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;12.5;15;0.18;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;13;25;0.35;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;13.5;37;0.64;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;14;65;1.06;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;14.5;36;0.66;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;15;7;0.16;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;15.5;3;0.08;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;16;4;0.12;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;16.5;3;0.1;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;18;1;0.04;0;5 -"P0430";"ENGR-ENC";0;"N";3.46;197;18.5;1;0.05;0;5 -"P0430";"EUTR-GUR";0;"N";0.98;5;27;1;0;1;1 -"P0430";"EUTR-GUR";0;"N";0.98;5;28;1;0;1;1 -"P0430";"EUTR-GUR";0;"N";0.98;5;29;1;0;1;1 -"P0430";"EUTR-GUR";0;"N";0.98;5;31;1;0;1;1 -"P0430";"EUTR-GUR";0;"N";0.98;5;34;1;0;1;1 -"P0430";"ILLE-COI";0;"N";0.04;2;7;1;0;1;1 -"P0430";"ILLE-COI";0;"N";0.04;2;9;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;21;2;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;21;2;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;29;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;29;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;31;2;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;31;2;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;35;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;35;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;37;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;37;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;46;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;46;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;54;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;54;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;56;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;56;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;59;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;59;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;61;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;61;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;28;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;28;1;0;1;1 -"P0435";"ALLO-TEZ";0;"N";0.03;5;6;3;0;1;1 -"P0435";"ALLO-TEZ";0;"N";0.03;5;7;2;0;1;1 -"P0435";"ENGR-ENC";0;"N";1.62;219;9.5;15;0.08;0;5 -"P0435";"ENGR-ENC";0;"N";1.62;219;10;58;0.33;0;5 -"P0435";"ENGR-ENC";0;"N";1.62;219;10.5;59;0.39;0;5 -"P0435";"ENGR-ENC";0;"N";1.62;219;11;41;0.32;0;5 -"P0430";"MERL-MCC";0;"N";1.38;34;30;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;30;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;31;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;31;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;32;0;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;32;0;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;33;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;33;1;0;1;1 -"P0430";"MERL-MCC";0;"N";1.38;34;34;1;0;1;1 -"P0430";"MERL-MCC";0;"N";7.08;34;34;1;0;1;1 -"P0430";"MICR-POU";0;"N";0.36;8;18;1;0;1;1 -"P0430";"MICR-POU";0;"N";0.36;8;19;0;0;1;1 -"P0430";"MICR-POU";0;"N";0.36;8;20;3;0;1;1 -"P0430";"MICR-POU";0;"N";0.36;8;21;3;0;1;1 -"P0430";"MICR-POU";0;"N";0.36;8;22;1;0;1;1 -"P0430";"SARD-PIL";0;"N";3.04;45;22;1;0;0;5 -"P0430";"SARD-PIL";0;"N";3.04;45;23.5;2;0;0;5 -"P0430";"SARD-PIL";0;"N";3.04;45;18;1;0;0;5 -"P0430";"SARD-PIL";0;"N";3.04;45;18.5;1;0;0;5 -"P0430";"SARD-PIL";0;"N";3.04;45;19;6;0;0;5 -"P0430";"SARD-PIL";0;"N";3.04;45;19.5;8;0;0;5 -"P0430";"SARD-PIL";0;"N";3.04;45;20;5;0;0;5 -"P0430";"SARD-PIL";0;"N";3.04;45;20.5;8;0;0;5 -"P0430";"SARD-PIL";0;"N";3.04;45;21;8;0;0;5 -"P0430";"SARD-PIL";0;"N";3.04;45;21.5;5;0;0;5 -"P0430";"SCOM-JAP";0;"N";0.36;4;19;2;0;1;1 -"P0430";"SCOM-JAP";0;"N";0.36;4;20;1;0;1;1 -"P0430";"SCOM-JAP";0;"N";0.36;4;29;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;22;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;23;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;24;2;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;25;0;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;26;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;29;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;30;2;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;31;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;32;2;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;33;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;34;2;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;35;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;36;5;0;1;1 -"P0444";"DIVE-RS1";0;"N";1.52;4;0;4;1.52;1;1 -"P0444";"ENGR-ENC";0;"N";1.1;93;11;1;0.01;0;5 -"P0444";"ENGR-ENC";0;"N";1.1;93;11.5;22;0.22;0;5 -"P0444";"ENGR-ENC";0;"N";1.1;93;12;33;0.38;0;5 -"P0444";"ENGR-ENC";0;"N";1.1;93;12.5;20;0.25;0;5 -"P0444";"ENGR-ENC";0;"N";1.1;93;13;10;0.13;0;5 -"P0444";"ENGR-ENC";0;"N";1.1;93;13.5;5;0.07;0;5 -"P0444";"ENGR-ENC";0;"N";1.1;93;14;1;0.02;0;5 -"P0444";"ENGR-ENC";0;"N";1.1;93;14.5;1;0.02;0;5 -"P0444";"ILLE-COI";0;"N";0.05;4;7;2;0;1;1 -"P0444";"ILLE-COI";0;"N";0.05;4;8;2;0;1;1 -"P0444";"MICR-POU";0;"N";0.2;3;18;1;0;1;1 -"P0444";"MICR-POU";0;"N";0.2;3;27;1;0;1;1 -"P0444";"MICR-POU";0;"N";0.2;3;20;1;0;1;1 -"P0479";"ENGR-ENC";0;"N";1.57;136;10;3;0.01;0;5 -"P0479";"ENGR-ENC";0;"N";1.57;136;10.5;7;0.05;0;5 -"P0479";"ENGR-ENC";0;"N";1.57;136;11;9;0.07;0;5 -"P0479";"ENGR-ENC";0;"N";1.57;136;11.5;12;0.11;0;5 -"P0479";"ENGR-ENC";0;"N";1.57;136;12;35;0.39;0;5 -"P0479";"ENGR-ENC";0;"N";1.57;136;12.5;44;0.54;0;5 -"P0479";"ENGR-ENC";0;"N";1.57;136;13;21;0.29;0;5 -"P0479";"ENGR-ENC";0;"N";1.57;136;13.5;2;0.03;0;5 -"P0479";"ENGR-ENC";0;"N";1.57;136;14;2;0.03;0;5 -"P0479";"ENGR-ENC";0;"N";1.57;136;15.5;1;0.02;0;5 -"P0479";"ILLE-COI";0;"N";0.9;1;31;1;0.9;1;1 -"P0479";"MERL-MCC";0;"N";0.8;6;18;1;0;1;1 -"P0479";"MERL-MCC";0;"N";0.8;6;23;1;0;1;1 -"P0479";"MERL-MCC";0;"N";0.8;6;25;1;0;1;1 -"P0479";"MERL-MCC";0;"N";0.8;6;29;1;0;1;1 -"P0479";"MERL-MCC";0;"N";0.8;6;32;1;0;1;1 -"P0479";"MERL-MCC";0;"N";0.8;6;33;1;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;6;1;0;1;1 -"P0443";"SPRA-SPR";0;"N";1.07;91;10.5;8;0;0;5 -"P0443";"SPRA-SPR";0;"N";1.07;91;11;44;0;0;5 -"P0443";"SPRA-SPR";0;"N";1.07;91;11.5;32;0;0;5 -"P0443";"SPRA-SPR";0;"N";1.07;91;12;6;0;0;5 -"P0443";"TRAC-DRA";0;"N";0.16;1;29;1;0;1;1 -"P0443";"TRAC-MED";0;"N";0.4;4;23;2;0;1;1 -"P0443";"TRAC-MED";0;"N";0.4;4;24;2;0;1;1 -"P0443";"TRAC-MED";0;"N";0.4;4;26;0;0;1;1 -"P0493";"SCOM-SCO";0;"N";4.62;18;32;3;0;1;1 -"P0493";"SCOM-SCO";0;"N";4.62;18;33;6;0;1;1 -"P0493";"SCOM-SCO";0;"N";4.62;18;34;3;0;1;1 -"P0461";"ENGR-ENC";0;"N";1.78;91;15;14;0.34;0;5 -"P0461";"ENGR-ENC";0;"N";1.78;91;15.5;5;0.13;0;5 -"P0461";"MERL-MCC";0;"N";1.18;3;23;1;0;1;1 -"P0461";"MERL-MCC";0;"N";1.18;3;35;1;0;1;1 -"P0461";"MERL-MCC";0;"N";1.18;3;48;1;0;1;1 -"P0461";"SCOM-SCO";0;"N";4.78;18;29;1;0;1;1 -"P0461";"SCOM-SCO";0;"N";4.78;18;30;4;0;1;1 -"P0461";"SCOM-SCO";0;"N";4.78;18;31;2;0;1;1 -"P0461";"SCOM-SCO";0;"N";4.78;18;32;3;0;1;1 -"P0461";"SCOM-SCO";0;"N";4.78;18;33;2;0;1;1 -"P0461";"SCOM-SCO";0;"N";4.78;18;34;2;0;1;1 -"P0461";"SCOM-SCO";0;"N";4.78;18;35;2;0;1;1 -"P0461";"SCOM-SCO";0;"N";4.78;18;36;1;0;1;1 -"P0461";"SCOM-SCO";0;"N";4.78;18;37;1;0;1;1 -"P0461";"TRAC-TRU";0;"N";3.79;73;16;1;0.05;1;1 -"P0461";"TRAC-TRU";0;"N";3.79;73;17;15;0.67;1;1 -"P0461";"TRAC-TRU";0;"N";3.79;73;18;33;1.68;1;1 -"P0461";"TRAC-TRU";0;"N";3.79;73;19;20;1.14;1;1 -"P0461";"TRAC-TRU";0;"N";3.79;73;20;4;0.25;1;1 -"P0463";"TRAC-TRU";0;"N";2.54;50;23;0;NA;1;1 -"P0489";"ARGE-SPH";0;"N";0.1;2;18;1;0;1;1 -"P0489";"ARGE-SPH";0;"N";0.1;2;22;1;0;1;1 -"P0489";"CLUP-HAR";0;"N";2.08;11;23.5;1;0;0;5 -"P0489";"CLUP-HAR";0;"N";2.08;11;25;1;0;0;5 -"P0489";"CLUP-HAR";0;"N";2.08;11;26;3;0;0;5 -"P0489";"CLUP-HAR";0;"N";2.08;11;26.5;1;0;0;5 -"P0489";"CLUP-HAR";0;"N";2.08;11;27;1;0;0;5 -"P0489";"CLUP-HAR";0;"N";2.08;11;27.5;2;0;0;5 -"P0489";"CLUP-HAR";0;"N";2.08;11;29.5;1;0;0;5 -"P0489";"CLUP-HAR";0;"N";2.08;11;31.5;1;0;0;5 -"P0489";"DIVE-RS3";0;"N";0.001;20;0;20;NA;1;1 -"P0489";"ENGR-ENC";0;"N";1.05;24;14.5;1;0;0;5 -"P0489";"ENGR-ENC";0;"N";1.05;24;16.5;1;0;0;5 -"P0489";"ENGR-ENC";0;"N";1.05;24;17;5;0;0;5 -"P0489";"ENGR-ENC";0;"N";1.05;24;17.5;2;0;0;5 -"P0489";"ENGR-ENC";0;"N";1.05;24;18;10;0;0;5 -"P0489";"ENGR-ENC";0;"N";1.05;24;18.5;4;0;0;5 -"P0489";"ENGR-ENC";0;"N";1.05;24;20;1;0;0;5 -"P0489";"ILLE-COI";0;"N";0.28;1;20;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;28;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;31;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;32;0;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;33;1;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;7;4;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;8;9;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;9;7;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;10;12;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;11;9;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;12;7;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;13;10;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;14;1;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;19;6;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;20;13;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;21;4;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;22;3;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;23;1;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;27;1;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;30;1;0;1;1 -"P0479";"MICR-POU";0;"N";2.5;90;31;1;0;1;1 -"P0479";"MYCT-OPX";0;"N";0.004;5;0;5;NA;1;1 -"P0479";"TRAC-TRU";0;"N";0.04;1;17;1;0.04;1;1 -"P0410";"SCOM-SCO";0;"N";1.86;20;25;1;0.1;1;1 -"P0410";"SCOM-SCO";0;"N";1.86;20;26;1;0.12;1;1 -"P0409";"TRAC-TRU";0;"N";2.16;73;15;19;0.5;1;1 -"P0409";"TRAC-TRU";0;"N";2.16;73;16;37;1.19;1;1 -"P0409";"TRAC-TRU";0;"N";2.16;73;17;5;0.19;1;1 -"P0378";"SCOM-SCO";0;"N";9.72;32;40;1;0.46;1;1 -"P0378";"TRAC-TRU";0;"N";1.46;80;10;7;0.05;1;1 -"P0378";"TRAC-TRU";0;"N";1.46;80;11;60;0.62;1;1 -"P0378";"TRAC-TRU";0;"N";1.46;80;12;9;0.09;1;1 -"P0378";"TRAC-TRU";0;"N";1.46;80;13;1;0.01;1;1 -"P0378";"TRAC-TRU";0;"N";1.46;80;14;0;0;1;1 -"P0378";"TRAC-TRU";0;"N";1.46;80;15;0;0;1;1 -"P0378";"TRAC-TRU";0;"N";1.46;80;16;1;0.03;1;1 -"P0378";"TRAC-TRU";0;"N";1.46;80;30;1;0.21;1;1 -"P0378";"TRAC-TRU";0;"N";1.46;80;31;1;0.23;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;20;2;0.06;1;1 -"P0379";"TRAC-TRU";0;"N";3.46;89;21;1;0.07;1;1 -"P0443";"TRAC-TRU";0;"N";2.14;60;14;6;0;1;1 -"P0443";"TRAC-TRU";0;"N";2.14;60;15;22;0;1;1 -"P0443";"TRAC-TRU";0;"N";2.14;60;16;21;0;1;1 -"P0443";"TRAC-TRU";0;"N";2.14;60;17;9;0;1;1 -"P0443";"TRAC-TRU";0;"N";2.14;60;18;1;0;1;1 -"P0443";"TRAC-TRU";0;"N";2.14;60;19;0;0;1;1 -"P0443";"TRAC-TRU";0;"N";2.14;60;23;1;0;1;1 -"P0390";"TRAC-TRU";0;"N";0.41;22;19;1;0.05;1;1 -"P0441";"ENGR-ENC";0;"N";3.12;239;11;1;0.01;0;5 -"P0441";"ENGR-ENC";0;"N";3.12;239;11.5;1;0.01;0;5 -"P0441";"ENGR-ENC";0;"N";3.12;239;12;18;0.2;0;5 -"P0441";"ENGR-ENC";0;"N";3.12;239;12.5;92;1.12;0;5 -"P0441";"ENGR-ENC";0;"N";3.12;239;13;88;1.16;0;5 -"P0441";"ENGR-ENC";0;"N";3.12;239;13.5;26;0.38;0;5 -"P0441";"ENGR-ENC";0;"N";3.12;239;14;10;0.17;0;5 -"P0441";"ENGR-ENC";0;"N";3.12;239;14.5;3;0.05;0;5 -"P0441";"EUTR-GUR";0;"N";0.49;5;21;1;0;1;1 -"P0441";"EUTR-GUR";0;"N";0.49;5;22;0;0;1;1 -"P0441";"EUTR-GUR";0;"N";0.49;5;23;1;0;1;1 -"P0441";"EUTR-GUR";0;"N";0.49;5;24;0;0;1;1 -"P0441";"EUTR-GUR";0;"N";0.49;5;25;1;0;1;1 -"P0441";"EUTR-GUR";0;"N";0.49;5;26;2;0;1;1 -"P0441";"MERL-MCC";0;"N";0.63;5;24;1;0;1;1 -"P0441";"MERL-MCC";0;"N";0.63;5;25;1;0;1;1 -"P0441";"MERL-MCC";0;"N";0.63;5;26;1;0;1;1 -"P0441";"MERL-MCC";0;"N";0.63;5;27;1;0;1;1 -"P0441";"MERL-MCC";0;"N";0.63;5;28;0;0;1;1 -"P0441";"MERL-MCC";0;"N";0.63;5;29;1;0;1;1 -"P0441";"SARD-PIL";0;"N";0.31;8;16;2;0;0;5 -"P0441";"SARD-PIL";0;"N";0.31;8;16.5;3;0;0;5 -"P0441";"SARD-PIL";0;"N";0.31;8;18.5;1;0;0;5 -"P0441";"SARD-PIL";0;"N";0.31;8;19;1;0;0;5 -"P0441";"SARD-PIL";0;"N";0.31;8;21;1;0;0;5 -"P0441";"SCOM-JAP";0;"N";11.28;37;31;2;0;1;1 -"P0441";"SCOM-JAP";0;"N";11.28;37;32;4;0;1;1 -"P0441";"SCOM-JAP";0;"N";11.28;37;33;19;0;1;1 -"P0441";"SCOM-JAP";0;"N";11.28;37;34;12;0;1;1 -"P0436";"SARD-PIL";0;"N";9.33;145;23;3;0.3;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;23.5;0;0;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;24;1;0.09;0;5 -"P0436";"SARD-PIL";0;"N";9.33;145;24.5;1;0.1;0;5 -"P0436";"SCOM-JAP";0;"N";10.96;45;20;1;0;1;1 -"P0436";"SCOM-JAP";0;"N";10.96;45;21;1;0;1;1 -"P0436";"SCOM-JAP";0;"N";10.96;45;22;3;0;1;1 -"P0436";"SCOM-JAP";0;"N";10.96;45;29;1;0;1;1 -"P0436";"SCOM-JAP";0;"N";10.96;45;30;7;0;1;1 -"P0436";"SCOM-JAP";0;"N";10.96;45;31;5;0;1;1 -"P0436";"SCOM-JAP";0;"N";10.96;45;32;9;0;1;1 -"P0436";"SCOM-JAP";0;"N";10.96;45;33;13;0;1;1 -"P0436";"SCOM-JAP";0;"N";10.96;45;34;5;0;1;1 -"P0390";"ZEUS-FAB";0;"N";0.64;1;34;1;0.65;1;1 -"P0464";"CAPR-APE";0;"N";0.91;56;8;21;0;1;1 -"P0464";"CAPR-APE";0;"N";0.91;56;9;29;0;1;1 -"P0464";"CAPR-APE";0;"N";0.91;56;10;6;0;1;1 -"P0464";"DIVE-RS1";0;"N";0.09;7;0;7;NA;1;1 -"P0464";"DIVE-RS2";0;"N";0.19;31;0;31;NA;1;1 -"P0464";"ENGR-ENC";0;"N";0.65;20;14;4;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;14.5;1;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;15;4;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;15.5;2;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;16;1;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;16.5;2;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;17;1;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;17.5;2;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;18;1;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;18.5;1;0;0;5 -"P0464";"ENGR-ENC";0;"N";0.65;20;19.5;1;0;0;5 -"P0464";"MERL-MCC";0;"N";1.63;4;35;1;0;1;1 -"P0464";"MERL-MCC";0;"N";1.63;4;36;1;0;1;1 -"P0464";"MERL-MCC";0;"N";1.63;4;39;1;0;1;1 -"P0464";"MERL-MCC";0;"N";1.63;4;47;1;0;1;1 -"P0464";"SCOM-JAP";0;"N";0.29;1;33;1;0;1;1 -"P0464";"TRAC-TRU";0;"N";4.06;69;17;2;0;1;1 -"P0464";"TRAC-TRU";0;"N";4.06;69;18;20;0;1;1 -"P0464";"TRAC-TRU";0;"N";4.06;69;19;29;0;1;1 -"P0464";"TRAC-TRU";0;"N";4.06;69;20;17;0;1;1 -"P0464";"TRAC-TRU";0;"N";4.06;69;21;1;0;1;1 -"P0468";"AMMO-TOB";0;"N";0.08;2;24;1;0;1;1 -"P0468";"AMMO-TOB";0;"N";0.08;2;26;1;0;1;1 -"P0468";"ENGR-ENC";0;"N";1.3;86;12;6;0.06;0;5 -"P0468";"ENGR-ENC";0;"N";1.3;86;12.5;16;0.22;0;5 -"P0468";"ENGR-ENC";0;"N";1.3;86;13;26;0.37;0;5 -"P0468";"ENGR-ENC";0;"N";1.3;86;13.5;22;0.35;0;5 -"P0468";"ENGR-ENC";0;"N";1.3;86;14;12;0.21;0;5 -"P0468";"ENGR-ENC";0;"N";1.3;86;14.5;3;0.05;0;5 -"P0468";"ENGR-ENC";0;"N";1.3;86;15.5;1;0.02;0;5 -"P0468";"ILLE-COI";0;"N";0.02;2;15;1;0;1;1 -"P0468";"ILLE-COI";0;"N";0.02;2;17;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;34;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;35;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;36;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;37;2;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;40;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;44;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;49;1;0;1;1 -"P0489";"MERL-MCC";0;"N";10.26;16;55;1;0;1;1 -"P0500";"SARD-PIL";0;"N";1.71;27;21;3;0;0;5 -"P0500";"SARD-PIL";0;"N";1.71;27;21.5;3;0;0;5 -"P0500";"SARD-PIL";0;"N";1.71;27;22;2;0;0;5 -"P0500";"SCOM-JAP";0;"N";6.38;46;21;2;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;22;11;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;23;11;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;24;12;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;25;1;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;26;1;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;32;2;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;33;4;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;34;1;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;35;0;0;1;1 -"P0500";"SCOM-JAP";0;"N";6.38;46;36;1;0;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;28;1;0.16;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;29;1;0.17;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;30;3;0.6;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;31;6;1.36;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;32;4;1.04;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;33;7;1.93;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;34;2;0.61;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;35;4;1.3;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;36;1;0.31;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;37;0;0;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;38;4;1.72;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;39;8;3.46;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;40;6;2.86;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;41;5;2.47;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;42;0;0;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;43;6;3.61;1;1 -"P0500";"SCOM-SCO";0;"N";21.8;58;45;0;NA;1;1 -"P0500";"TRAC-TRU";0;"N";7.18;97;18;1;0;1;1 -"P0500";"TRAC-TRU";0;"N";7.18;97;19;12;0;1;1 -"P0500";"TRAC-TRU";0;"N";7.18;97;20;55;0;1;1 -"P0500";"TRAC-TRU";0;"N";7.18;97;21;20;0;1;1 -"P0500";"TRAC-TRU";0;"N";7.18;97;22;6;0;1;1 -"P0500";"TRAC-TRU";0;"N";7.18;97;23;1;0;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;34;6;2.1;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;35;3;1.16;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;36;2;0.87;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;37;6;2.58;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;38;2;0.97;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;39;0;0;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;40;1;0.54;1;1 -"P0506";"ENGR-ENC";0;"N";0.04;1;17.5;1;0;0;5 -"P0506";"MERL-MCC";0;"N";0.8;5;26;1;0;1;1 -"P0506";"MERL-MCC";0;"N";0.8;5;29;2;0;1;1 -"P0506";"MERL-MCC";0;"N";0.8;5;30;1;0;1;1 -"P0506";"MERL-MCC";0;"N";0.8;5;33;1;0;1;1 -"P0506";"MICR-POU";0;"N";0.16;3;19;1;0;1;1 -"P0506";"MICR-POU";0;"N";0.16;3;20;1;0;1;1 -"P0506";"MICR-POU";0;"N";0.16;3;21;1;0;1;1 -"P0506";"SCOM-SCO";0;"N";0.49;2;31;1;0;1;1 -"P0506";"SCOM-SCO";0;"N";0.49;2;32;1;0;1;1 -"P0506";"TODA-EBL";0;"N";0.25;1;15;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;49;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;63;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;64;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;65;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;70;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;71;1;NA;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;72;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;73;2;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;74;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;77;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;81;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;82;0;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;83;1;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;84;0;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;85;0;0;1;1 -"P0509";"BELO-BEO";0;"N";6.62;14;86;1;0;1;1 -"P0509";"ENGR-ENC";0;"N";2.87;84;14.5;2;0.05;0;5 -"P0509";"ENGR-ENC";0;"N";2.87;84;15;6;0.15;0;5 -"P0509";"ENGR-ENC";0;"N";2.87;84;15.5;12;0.32;0;5 -"P0509";"ENGR-ENC";0;"N";2.87;84;16;16;0.47;0;5 -"P0509";"ENGR-ENC";0;"N";2.87;84;16.5;8;0.26;0;5 -"P0509";"ENGR-ENC";0;"N";2.87;84;17;7;0.25;0;5 -"P0509";"ENGR-ENC";0;"N";2.87;84;17.5;13;0.51;0;5 -"P0509";"ENGR-ENC";0;"N";2.87;84;18;9;0.36;0;5 -"P0509";"ENGR-ENC";0;"N";2.87;84;18.5;11;0.47;0;5 -"P0509";"ENGR-ENC";0;"N";2.87;84;19.5;0;NA;0;5 -"P0509";"MOLA-MOL";0;"N";9.2;1;55;1;0;1;1 -"P0509";"PRIO-GLA";0;"F";5;1;114;1;NA;1;1 -"P0509";"SARD-PIL";0;"N";5.39;112;16;3;0.1;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;16.5;9;0.33;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;17;15;0.58;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;17.5;30;1.23;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;18;15;0.63;0;5 -"P0509";"SARD-PIL";0;"N";5.39;112;18.5;10;0.5;0;5 -"P0510";"SCOM-SCO";0;"N";0.33;1;36;1;0;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;18;5;0.27;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;19;27;1.77;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;20;40;2.87;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;21;16;1.34;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;22;2;0.17;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;23;0;0;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;24;1;0.12;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;25;0;0;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;26;1;0.17;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;27;3;0.52;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;28;3;0.52;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;29;1;0.18;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;30;2;0.43;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;31;0;0;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;32;0;0;1;1 -"P0510";"TRAC-TRU";0;"N";8.68;102;33;1;0.3;1;1 -"P0511";"BELO-BEO";0;"N";2.44;6;55;1;0;1;1 -"P0511";"BELO-BEO";0;"N";2.44;6;65;2;0;1;1 -"P0511";"BELO-BEO";0;"N";2.44;6;67;1;0;1;1 -"P0511";"BELO-BEO";0;"N";2.44;6;72;1;0;1;1 -"P0511";"BELO-BEO";0;"N";2.44;6;85;1;0;1;1 -"P0511";"DIVE-RS1";0;"N";0.5;55;0;55;NA;1;1 -"P0511";"DIVE-RS2";0;"N";0.05;8;0;8;NA;1;1 -"P0511";"ENGR-ENC";0;"N";0.53;15;15;1;0;0;5 -"P0511";"ENGR-ENC";0;"N";0.53;15;15.5;1;0;0;5 -"P0511";"ENGR-ENC";0;"N";0.53;15;16;1;0;0;5 -"P0511";"ENGR-ENC";0;"N";0.53;15;16.5;2;0;0;5 -"P0511";"ENGR-ENC";0;"N";0.53;15;17;3;0;0;5 -"P0511";"ENGR-ENC";0;"N";0.53;15;17.5;2;0;0;5 -"P0511";"ENGR-ENC";0;"N";0.53;15;18;4;0;0;5 -"P0511";"ENGR-ENC";0;"N";0.53;15;18.5;1;0;0;5 -"P0511";"LOPH-PIS";0;"N";0.03;1;12;1;0;1;1 -"P0511";"SARD-PIL";0;"N";5.83;82;18;1;0.05;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;19;2;0.11;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;19.5;11;0.6;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;20;12;0.75;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;20.5;8;0.53;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;21;12;0.86;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;21.5;19;1.45;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;22;8;0.65;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;22.5;3;0.25;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;23;3;0.27;0;5 -"P0511";"SARD-PIL";0;"N";5.83;82;23.5;3;0.28;0;5 -"P0511";"SCOM-SCO";0;"N";3.18;32;22;12;0;1;1 -"P0511";"SCOM-SCO";0;"N";3.18;32;23;10;0;1;1 -"P0511";"SCOM-SCO";0;"N";3.18;32;24;5;0;1;1 -"P0511";"SCOM-SCO";0;"N";3.18;32;25;2;0;1;1 -"P0511";"SCOM-SCO";0;"N";3.18;32;26;1;0;1;1 -"P0511";"SCOM-SCO";0;"N";3.18;32;27;0;0;1;1 -"P0511";"SCOM-SCO";0;"N";3.18;32;28;2;0;1;1 -"P0500";"TRAC-TRU";0;"N";7.18;97;29;1;0;1;1 -"P0500";"TRAC-TRU";0;"N";7.18;97;30;1;0;1;1 -"P0501";"TRAC-TRU";0;"N";12.3;35;41;1;0.53;1;1 -"P0493";"SCOM-SCO";0;"N";4.62;18;37;1;0;1;1 -"P0485";"PETR-MAR";0;"N";0.08;1;34;1;0;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;18;0;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;37;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;38;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;39;1;0;1;1 -"P0512";"CAPR-APE";0;"N";4.36;74;9;1;0.02;1;1 -"P0512";"CAPR-APE";0;"N";4.36;74;10;0;0;1;1 -"P0512";"CAPR-APE";0;"N";4.36;74;11;3;0.1;1;1 -"P0512";"CAPR-APE";0;"N";4.36;74;12;17;0.71;1;1 -"P0512";"CAPR-APE";0;"N";4.36;74;13;17;0.88;1;1 -"P0512";"CAPR-APE";0;"N";4.36;74;14;18;1.18;1;1 -"P0512";"CAPR-APE";0;"N";4.36;74;15;17;1.36;1;1 -"P0512";"CAPR-APE";0;"N";4.36;74;16;1;0.09;1;1 -"P0512";"MERL-MCC";0;"N";2.9;3;33;1;0;1;1 -"P0512";"MERL-MCC";0;"N";2.9;3;45;1;0;1;1 -"P0512";"MERL-MCC";0;"N";2.9;3;70;1;0;1;1 -"P0512";"SCOM-SCO";0;"N";8.24;37;27;2;0;1;1 -"P0512";"SCOM-SCO";0;"N";8.24;37;28;5;0;1;1 -"P0512";"SCOM-SCO";0;"N";8.24;37;29;6;0;1;1 -"P0512";"SCOM-SCO";0;"N";8.24;37;30;7;0;1;1 -"P0512";"SCOM-SCO";0;"N";8.24;37;31;10;0;1;1 -"P0512";"SCOM-SCO";0;"N";8.24;37;32;4;0;1;1 -"P0512";"SCOM-SCO";0;"N";8.24;37;33;3;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;19;1;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;19;1;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;26;1;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;26;1;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;19;2;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;19;2;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;20;1;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;20;1;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;21;2;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;21;2;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;24;2;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;24;2;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;25;2;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;25;2;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;26;5;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;26;5;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;27;1;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;27;1;0;1;1 -"P0385";"TRAC-TRU";0;"N";2.16;81;25;1;0.12;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;40;1;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;41;0;0;1;1 -"P0430";"SCOM-SCO";0;"N";6.7;25;42;1;0;1;1 -"P0430";"TRAC-TRU";0;"N";2.32;60;15;5;0;1;1 -"P0430";"TRAC-TRU";0;"N";2.32;60;16;32;0;1;1 -"P0430";"TRAC-TRU";0;"N";2.32;60;17;21;0;1;1 -"P0430";"TRAC-TRU";0;"N";2.32;60;18;2;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;29;1;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;29;1;0;1;1 -"P0512";"TRAC-TRU";0;"N";2;36;30;0;0;1;1 -"P0512";"TRAC-TRU";0;"N";0.22;36;30;0;0;1;1 -"P0523";"ALLO-TEZ";0;"N";0.02;4;0;4;0;1;1 -"P0523";"DIVE-RS1";0;"N";0.49;2;0;2;NA;1;1 -"P0523";"ENGR-ENC";0;"N";0.57;85;9;1;0.005;0;5 -"P0523";"ENGR-ENC";0;"N";0.57;85;9.5;12;0.06;0;5 -"P0523";"ENGR-ENC";0;"N";0.57;85;10;38;0.23;0;5 -"P0523";"ENGR-ENC";0;"N";0.57;85;10.5;19;0.13;0;5 -"P0523";"ENGR-ENC";0;"N";0.57;85;11;12;0.1;0;5 -"P0523";"ENGR-ENC";0;"N";0.57;85;11.5;2;0.02;0;5 -"P0523";"ENGR-ENC";0;"N";0.57;85;13;1;0.01;0;5 -"P0523";"ENGR-ENC";0;"N";0.57;85;14;0;NA;0;5 -"P0523";"MERL-MCC";0;"N";0.11;1;25;1;0;1;1 -"P0523";"SCOM-SCO";0;"N";0.01;2;8;1;0;1;1 -"P0523";"SCOM-SCO";0;"N";0.01;2;9;1;0;1;1 -"P0523";"SPRA-SPR";0;"N";0.9;79;10;2;0;0;5 -"P0523";"SPRA-SPR";0;"N";0.9;79;10.5;14;0;0;5 -"P0523";"SPRA-SPR";0;"N";0.9;79;11;43;0;0;5 -"P0523";"SPRA-SPR";0;"N";0.9;79;11.5;17;0;0;5 -"P0523";"SPRA-SPR";0;"N";0.9;79;12;2;0;0;5 -"P0523";"SPRA-SPR";0;"N";0.9;79;12.5;1;0;0;5 -"P0523";"TRAC-DRA";0;"N";0.04;1;19;1;0;1;1 -"P0523";"TRAC-TRU";0;"N";0.02;3;9;1;0;1;1 -"P0523";"TRAC-TRU";0;"N";0.02;3;10;2;0;1;1 -"P0535";"ENGR-ENC";0;"N";0.81;86;10;2;0.01;0;5 -"P0535";"ENGR-ENC";0;"N";0.81;86;10.5;10;0.07;0;5 -"P0535";"ENGR-ENC";0;"N";0.81;86;11;22;0.18;0;5 -"P0535";"ENGR-ENC";0;"N";0.81;86;11.5;26;0.24;0;5 -"P0535";"ENGR-ENC";0;"N";0.81;86;12;13;0.14;0;5 -"P0535";"ENGR-ENC";0;"N";0.81;86;12.5;7;0.08;0;5 -"P0535";"ENGR-ENC";0;"N";0.81;86;13;4;0.06;0;5 -"P0535";"ENGR-ENC";0;"N";0.81;86;13.5;2;0.03;0;5 -"P0535";"MERL-MCC";0;"N";0.62;6;22;1;0;1;1 -"P0535";"MERL-MCC";0;"N";0.62;6;23;3;0;1;1 -"P0535";"MERL-MCC";0;"N";0.62;6;24;0;0;1;1 -"P0535";"MERL-MCC";0;"N";0.62;6;25;1;0;1;1 -"P0535";"MERL-MCC";0;"N";0.62;6;26;0;0;1;1 -"P0535";"TRAC-TRU";0;"N";0.06;6;11;4;0;1;1 -"P0540";"ENGR-ENC";0;"N";1.14;110;10;4;0.03;0;5 -"P0540";"ENGR-ENC";0;"N";1.14;110;10.5;10;0.07;0;5 -"P0540";"ENGR-ENC";0;"N";1.14;110;11;24;0.2;0;5 -"P0540";"ENGR-ENC";0;"N";1.14;110;11.5;26;0.25;0;5 -"P0540";"ENGR-ENC";0;"N";1.14;110;12;18;0.19;0;5 -"P0540";"ENGR-ENC";0;"N";1.14;110;12.5;12;0.15;0;5 -"P0540";"ENGR-ENC";0;"N";1.14;110;13;11;0.15;0;5 -"P0540";"ENGR-ENC";0;"N";1.14;110;13.5;3;0.04;0;5 -"P0540";"ENGR-ENC";0;"N";1.14;110;14;1;0.02;0;5 -"P0540";"ENGR-ENC";0;"N";1.14;110;14.5;1;0.02;0;5 -"P0542";"ENGR-ENC";0;"N";0.84;83;10.5;3;0.02;0;5 -"P0542";"ENGR-ENC";0;"N";0.84;83;11;29;0.25;0;5 -"P0542";"ENGR-ENC";0;"N";0.84;83;11.5;26;0.26;0;5 -"P0542";"ENGR-ENC";0;"N";0.84;83;12;12;0.13;0;5 -"P0542";"ENGR-ENC";0;"N";0.84;83;12.5;9;0.12;0;5 -"P0542";"ENGR-ENC";0;"N";0.84;83;13;4;0.05;0;5 -"P0542";"SCOM-SCO";0;"N";0.25;2;24;1;0;1;1 -"P0542";"SCOM-SCO";0;"N";0.25;2;26;0;NA;1;1 -"P0542";"SCOM-SCO";0;"N";0.25;2;27;1;0;1;1 -"P0542";"SCOM-SCO";0;"N";0.25;2;30;0;NA;1;1 -"P0542";"SPRA-SPR";0;"N";0.65;59;10.5;9;0;0;5 -"P0542";"SPRA-SPR";0;"N";0.65;59;11;28;0;0;5 -"P0542";"SPRA-SPR";0;"N";0.65;59;11.5;19;0;0;5 -"P0542";"SPRA-SPR";0;"N";0.65;59;12;1;0;0;5 -"P0542";"SPRA-SPR";0;"N";0.65;59;12.5;2;0;0;5 -"P0542";"TRAC-TRU";0;"N";0.01;1;11;1;0;1;1 -"P0545";"ENGR-ENC";0;"N";1.92;119;11.5;1;0.01;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;12;5;0.06;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;12.5;21;0.27;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;13;44;0.64;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;13.5;26;0.43;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;14;10;0.18;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;14.5;6;0.14;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;15;2;0.05;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;15.5;2;0.05;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;16;1;0.03;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;16.5;0;0;0;5 -"P0545";"ENGR-ENC";0;"N";1.92;119;17;1;0.03;0;5 -"P0545";"MERL-MCC";0;"N";3.46;25;20;2;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;21;1;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;22;1;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;23;3;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;24;2;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;25;4;0;1;1 -"P0429";"SARD-PIL";0;"N";7.43;108;19;5;0.28;0;5 -"P0429";"SCOM-JAP";0;"N";9.34;92;20;23;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;21;27;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;22;9;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;23;6;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;24;3;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;25;1;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;26;2;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;27;1;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;30;5;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;31;1;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;32;1;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;33;0;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;34;2;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;35;1;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;38;1;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;18;1;0;1;1 -"P0429";"SCOM-JAP";0;"N";9.34;92;19;8;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;21;2;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;22;31;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;23;73;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;24;33;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;25;9;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;31;2;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;32;2;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;33;4;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;34;3;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;35;1;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;36;2;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;37;1;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;38;2;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;39;2;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;40;1;0;1;1 -"P0429";"SCOM-SCO";0;"N";20.96;170;41;2;0;1;1 -"P0429";"TRAC-TRU";0;"N";1.98;116;12;1;0;1;1 -"P0429";"TRAC-TRU";0;"N";0.22;116;12;1;0;1;1 -"P0429";"TRAC-TRU";0;"N";1.98;116;13;0;0;1;1 -"P0429";"TRAC-TRU";0;"N";0.22;116;13;0;0;1;1 -"P0429";"TRAC-TRU";0;"N";1.98;116;14;4;0;1;1 -"P0429";"TRAC-TRU";0;"N";0.22;116;14;4;0;1;1 -"P0429";"TRAC-TRU";0;"N";1.98;116;15;22;0;1;1 -"P0429";"TRAC-TRU";0;"N";0.22;116;15;22;0;1;1 -"P0429";"TRAC-TRU";0;"N";1.98;116;16;28;0;1;1 -"P0429";"TRAC-TRU";0;"N";0.22;116;16;28;0;1;1 -"P0429";"TRAC-TRU";0;"N";1.98;116;17;2;0;1;1 -"P0429";"TRAC-TRU";0;"N";0.22;116;17;2;0;1;1 -"P0429";"TRAC-TRU";0;"N";1.98;116;18;1;0;1;1 -"P0429";"TRAC-TRU";0;"N";0.22;116;18;1;0;1;1 -"P0535";"MERL-MCC";0;"N";0.62;6;27;1;0;1;1 -"P0535";"MERL-MNG";0;"N";0.23;1;31;1;0;1;1 -"P0535";"SPRA-SPR";0;"N";0.82;64;11;7;0;0;5 -"P0545";"MERL-MCC";0;"N";3.46;25;26;2;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;27;3;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;28;3;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;29;3;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;47;1;0;1;1 -"P0545";"MERL-MCC";0;"N";3.46;25;32;0;NA;1;1 -"P0545";"MICR-POU";0;"N";0.1;1;25;1;0;1;1 -"P0545";"SARD-PIL";0;"N";1.57;22;19;2;0;0;5 -"P0545";"SARD-PIL";0;"N";1.57;22;19.5;3;0;0;5 -"P0545";"SARD-PIL";0;"N";1.57;22;20;4;0;0;5 -"P0545";"SARD-PIL";0;"N";1.57;22;20.5;6;0;0;5 -"P0545";"SARD-PIL";0;"N";1.57;22;21;2;0;0;5 -"P0545";"SARD-PIL";0;"N";1.57;22;21.5;3;0;0;5 -"P0545";"SARD-PIL";0;"N";1.57;22;23.5;2;0;0;5 -"P0545";"SCOM-JAP";0;"N";1.78;21;20;4;0;1;1 -"P0545";"SCOM-JAP";0;"N";1.78;21;21;8;0;1;1 -"P0545";"SCOM-JAP";0;"N";1.78;21;22;7;0;1;1 -"P0545";"SCOM-JAP";0;"N";1.78;21;23;2;0;1;1 -"P0545";"SCOM-SCO";0;"N";0.71;3;24;1;0;1;1 -"P0545";"SCOM-SCO";0;"N";0.71;3;31;1;0;1;1 -"P0545";"SCOM-SCO";0;"N";0.71;3;35;1;0;1;1 -"P0545";"TRAC-MED";0;"N";3.74;40;15;1;0;1;1 -"P0545";"TRAC-MED";0;"N";3.74;40;18;1;0;1;1 -"P0545";"TRAC-MED";0;"N";3.74;40;19;3;0;1;1 -"P0545";"TRAC-MED";0;"N";3.74;40;20;8;0;1;1 -"P0545";"TRAC-MED";0;"N";3.74;40;21;7;0;1;1 -"P0545";"TRAC-MED";0;"N";3.74;40;22;8;0;1;1 -"P0545";"TRAC-MED";0;"N";3.74;40;23;2;0;1;1 -"P0545";"TRAC-MED";0;"N";3.74;40;24;8;0;1;1 -"P0545";"TRAC-MED";0;"N";3.74;40;25;2;0;1;1 -"P0545";"TRAC-TRU";0;"N";5.54;156;12;2;0;1;1 -"P0545";"TRAC-TRU";0;"N";5.54;156;13;2;0;1;1 -"P0545";"TRAC-TRU";0;"N";5.54;156;14;2;0;1;1 -"P0545";"TRAC-TRU";0;"N";5.54;156;15;12;0;1;1 -"P0545";"TRAC-TRU";0;"N";5.54;156;16;71;0;1;1 -"P0545";"TRAC-TRU";0;"N";5.54;156;17;52;0;1;1 -"P0545";"TRAC-TRU";0;"N";5.54;156;18;15;0;1;1 -"P0557";"ENGR-ENC";0;"N";1.07;55;18;0;0;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;19;1;0.06;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;19.5;1;0.06;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;20;11;0.75;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;20.5;8;0.56;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;21;18;1.32;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;21.5;12;0.91;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;22;10;0.84;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;22.5;4;0.34;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;23;5;0.46;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;23.5;1;0.11;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;24;1;0.11;0;5 -"P0557";"SARD-PIL";0;"N";5.56;72;25;0;NA;0;5 -"P0557";"SCOM-JAP";0;"N";4.1;15;22;3;0;1;1 -"P0557";"SCOM-JAP";0;"N";4.1;15;23;2;0;1;1 -"P0557";"SCOM-JAP";0;"N";4.1;15;24;1;0;1;1 -"P0557";"SCOM-JAP";0;"N";4.1;15;29;2;0;1;1 -"P0557";"SCOM-JAP";0;"N";4.1;15;30;1;0;1;1 -"P0557";"SCOM-JAP";0;"N";4.1;15;31;1;0;1;1 -"P0557";"SCOM-JAP";0;"N";4.1;15;34;1;0;1;1 -"P0557";"SCOM-JAP";0;"N";4.1;15;35;1;0;1;1 -"P0557";"SCOM-JAP";0;"N";4.1;15;39;2;0;1;1 -"P0557";"SCOM-JAP";0;"N";4.1;15;40;1;0;1;1 -"P0557";"SCOM-SCO";0;"N";1.34;12;12;2;0;1;1 -"P0557";"SCOM-SCO";0;"N";1.34;12;23;1;0;1;1 -"P0557";"SCOM-SCO";0;"N";1.34;12;24;1;0;1;1 -"P0557";"SCOM-SCO";0;"N";1.34;12;25;3;0;1;1 -"P0557";"SCOM-SCO";0;"N";1.34;12;26;1;0;1;1 -"P0557";"SCOM-SCO";0;"N";1.34;12;27;2;0;1;1 -"P0557";"SCOM-SCO";0;"N";1.34;12;28;2;0;1;1 -"P0557";"TRAC-TRU";0;"N";22.14;68;16;22;0.79;1;1 -"P0557";"TRAC-TRU";0;"N";22.14;68;17;35;1.45;1;1 -"P0557";"TRAC-TRU";0;"N";22.14;68;18;10;0.46;1;1 -"P0557";"TRAC-TRU";0;"N";22.14;68;19;1;0.05;1;1 -"P0559";"ENGR-ENC";0;"N";1.15;60;11.5;1;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;12;1;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;12.5;9;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;13;11;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;13.5;8;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;14;11;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;14.5;4;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;15;8;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;15.5;2;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;16;3;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;16.5;0;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;17;1;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;17.5;0;0;0;5 -"P0559";"ENGR-ENC";0;"N";1.15;60;18;1;0;0;5 -"P0559";"MOLA-MOL";0;"N";6.36;1;49;1;0;1;1 -"P0559";"SARD-PIL";0;"N";2.93;40;18;1;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;18.5;1;0;0;5 -"P0559";"SARD-PIL";0;"N";2.93;40;19;5;0;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;24;1;0.11;0;5 -"P0561";"SARD-PIL";0;"N";5.7;76;24.5;1;0.11;0;5 -"P0561";"SCOM-JAP";0;"N";0.17;2;21;1;0;1;1 -"P0561";"SCOM-JAP";0;"N";0.17;2;22;1;0;1;1 -"P0561";"SCOM-SCO";0;"N";0.14;1;27;1;0;1;1 -"P0561";"TRAC-TRU";0;"N";0.16;3;13;1;0;1;1 -"P0561";"TRAC-TRU";0;"N";0.16;3;14;1;0;1;1 -"P0561";"TRAC-TRU";0;"N";0.16;3;24;1;0;1;1 -"P0563";"ENGR-ENC";0;"N";1.6;87;12;5;0;0;5 -"P0563";"ENGR-ENC";0;"N";1.6;87;12.5;6;0;0;5 -"P0563";"ENGR-ENC";0;"N";1.6;87;13;12;0;0;5 -"P0563";"ENGR-ENC";0;"N";1.6;87;13.5;16;0;0;5 -"P0563";"ENGR-ENC";0;"N";1.6;87;14;21;0;0;5 -"P0563";"ENGR-ENC";0;"N";1.6;87;14.5;15;0;0;5 -"P0563";"ENGR-ENC";0;"N";1.6;87;15;7;0;0;5 -"P0563";"ENGR-ENC";0;"N";1.6;87;15.5;1;0;0;5 -"P0563";"ENGR-ENC";0;"N";1.6;87;16;3;0;0;5 -"P0563";"ENGR-ENC";0;"N";1.6;87;16.5;1;0;0;5 -"P0563";"SCOM-JAP";0;"N";0.16;1;26;1;0;1;1 -"P0563";"SCOM-SCO";0;"N";0.89;6;23;2;0;1;1 -"P0563";"SCOM-SCO";0;"N";0.89;6;24;1;0;1;1 -"P0563";"SCOM-SCO";0;"N";0.89;6;25;1;0;1;1 -"P0563";"SCOM-SCO";0;"N";0.89;6;26;1;0;1;1 -"P0563";"SCOM-SCO";0;"N";0.89;6;34;1;0;1;1 -"P0563";"TRAC-MED";0;"N";0.2;2;22;1;0;1;1 -"P0563";"TRAC-MED";0;"N";0.2;2;24;1;0;1;1 -"P5001";"BOOP-BOO";0;"N";1.4;5;29;1;0;1;1 -"P5001";"BOOP-BOO";0;"N";1.4;5;30;2;0;1;1 -"P5001";"BOOP-BOO";0;"N";1.4;5;31;1;0;1;1 -"P5001";"BOOP-BOO";0;"N";1.4;5;32;0;0;1;1 -"P5001";"BOOP-BOO";0;"N";1.4;5;33;1;0;1;1 -"P5001";"MOLA-MOL";0;"N";17.7;5;33;1;0;1;1 -"P5001";"MOLA-MOL";0;"N";17.7;5;37;1;0;1;1 -"P5001";"MOLA-MOL";0;"N";17.7;5;40;1;0;1;1 -"P5001";"MOLA-MOL";0;"N";17.7;5;41;1;0;1;1 -"P5001";"MOLA-MOL";0;"N";17.7;5;43;1;0;1;1 -"P5001";"SARD-SAR";0;"N";6.6;5;41;1;0;1;1 -"P5001";"SARD-SAR";0;"N";6.6;5;44;1;0;1;1 -"P5001";"SARD-SAR";0;"N";6.6;5;55;1;0;1;1 -"P5001";"SARD-SAR";0;"N";6.6;5;56;1;0;1;1 -"P5001";"SARD-SAR";0;"N";6.6;5;58;1;0;1;1 -"P5001";"SPON-CAN";0;"N";2.4;6;30;2;0;1;1 -"P5001";"SPON-CAN";0;"N";2.4;6;32;2;0;1;1 -"P5001";"SPON-CAN";0;"N";2.4;6;33;1;0;1;1 -"P5001";"SPON-CAN";0;"N";2.4;6;34;1;0;1;1 -"P5001";"TRAC-MED";0;"N";19;71;26;1;0;1;1 -"P5001";"TRAC-MED";0;"N";19;71;29;4;0;1;1 -"P5001";"TRAC-MED";0;"N";19;71;30;5;0;1;1 -"P5001";"TRAC-MED";0;"N";19;71;31;10;0;1;1 -"P5001";"TRAC-MED";0;"N";19;71;32;15;0;1;1 -"P5001";"TRAC-MED";0;"N";19;71;33;13;0;1;1 -"P5001";"TRAC-MED";0;"N";19;71;34;10;0;1;1 -"P5001";"TRAC-MED";0;"N";19;71;35;10;0;1;1 -"P5001";"TRAC-MED";0;"N";19;71;36;3;0;1;1 -"P5002";"ENGR-ENC";0;"N";3.26;143;13;2;0.03;0;5 -"P5002";"ENGR-ENC";0;"N";3.26;143;13.5;5;0.09;0;5 -"P5002";"ENGR-ENC";0;"N";3.26;143;14;24;0.46;0;5 -"P5002";"ENGR-ENC";0;"N";3.26;143;14.5;33;0.7;0;5 -"P5002";"ENGR-ENC";0;"N";3.26;143;15;38;0.89;0;5 -"P5002";"ENGR-ENC";0;"N";3.26;143;15.5;25;0.62;0;5 -"P5002";"ENGR-ENC";0;"N";3.26;143;16;12;0.34;0;5 -"P5002";"ENGR-ENC";0;"N";3.26;143;16.5;4;0.12;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;13;1;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;13.5;0;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;14;4;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;14.5;14;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;15;23;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;15.5;20;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;16;6;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;16.5;3;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;17;6;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;17.5;3;0;0;5 -"P5003";"ENGR-ENC";0;"N";2.1;81;18;1;0;0;5 -"P5004";"ENGR-ENC";0;"N";2.3;90;14;3;0;0;5 -"P5004";"ENGR-ENC";0;"N";2.3;90;14.5;8;0;0;5 -"P5004";"ENGR-ENC";0;"N";2.3;90;15;25;0;0;5 -"P5004";"ENGR-ENC";0;"N";2.3;90;15.5;20;0;0;5 -"P5004";"ENGR-ENC";0;"N";2.3;90;16;15;0;0;5 -"P5004";"ENGR-ENC";0;"N";2.3;90;16.5;8;0;0;5 -"P5004";"ENGR-ENC";0;"N";2.3;90;17;4;0;0;5 -"P5004";"ENGR-ENC";0;"N";2.3;90;17.5;5;0;0;5 -"P5004";"ENGR-ENC";0;"N";2.3;90;18;2;0;0;5 -"P5004";"SCOM-JAP";0;"N";1.1;12;20;1;0;1;1 -"P5004";"SCOM-JAP";0;"N";1.1;12;21;3;0;1;1 -"P5004";"SCOM-JAP";0;"N";1.1;12;22;3;0;1;1 -"P5004";"SCOM-JAP";0;"N";1.1;12;23;2;0;1;1 -"P5004";"SCOM-JAP";0;"N";1.1;12;24;3;0;1;1 -"P5004";"SCOM-SCO";0;"N";1.3;9;21;1;0;1;1 -"P5004";"SCOM-SCO";0;"N";1.3;9;22;0;0;1;1 -"P5004";"SCOM-SCO";0;"N";1.3;9;23;5;0;1;1 -"P5004";"SCOM-SCO";0;"N";1.3;9;24;2;0;1;1 -"P5004";"SCOM-SCO";0;"N";1.3;9;25;1;0;1;1 -"P5005";"ENGR-ENC";0;"N";3.7;115;14;2;0.04;0;5 -"P5005";"ENGR-ENC";0;"N";3.7;115;14.5;8;0.18;0;5 -"P5005";"ENGR-ENC";0;"N";3.7;115;15;13;0.33;0;5 -"P5005";"ENGR-ENC";0;"N";3.7;115;15.5;23;0.61;0;5 -"P5005";"ENGR-ENC";0;"N";3.7;115;16;27;0.82;0;5 -"P5005";"ENGR-ENC";0;"N";3.7;115;16.5;16;0.53;0;5 -"P5005";"ENGR-ENC";0;"N";3.7;115;17;12;0.47;0;5 -"P5005";"ENGR-ENC";0;"N";3.7;115;17.5;10;0.25;0;5 -"P5005";"ENGR-ENC";0;"N";3.7;115;18;2;0.09;0;5 -"P5005";"ENGR-ENC";0;"N";3.7;115;18.5;2;0.09;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;16;2;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;16.5;10;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;17;15;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;17.5;6;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;18;8;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;18.5;14;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;19;14;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;19.5;16;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;20;11;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;20.5;8;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;21;5;0;0;5 -"P5006";"SARD-PIL";0;"N";5.5;111;22;2;0;0;5 -"P5007";"ENGR-ENC";0;"N";1.4;185;12;8;0.1;0;5 -"P5007";"ENGR-ENC";0;"N";1.4;185;12.5;35;0.45;0;5 -"P5007";"ENGR-ENC";0;"N";1.4;185;13;66;0.92;0;5 -"P5007";"ENGR-ENC";0;"N";1.4;185;13.5;51;0.79;0;5 -"P5007";"ENGR-ENC";0;"N";1.4;185;14;15;0.25;0;5 -"P5007";"ENGR-ENC";0;"N";1.4;185;14.5;5;0.09;0;5 -"P5007";"ENGR-ENC";0;"N";1.4;185;15;3;0.06;0;5 -"P5007";"ENGR-ENC";0;"N";1.4;185;15.5;2;0.04;0;5 -"P5007";"LIZA-RAM";0;"N";5;11;33;1;0;1;1 -"P5007";"LIZA-RAM";0;"N";5;11;35;2;0;1;1 -"P5007";"LIZA-RAM";0;"N";5;11;36;1;0;1;1 -"P5007";"LIZA-RAM";0;"N";5;11;37;2;0;1;1 -"P5007";"LIZA-RAM";0;"N";5;11;38;1;0;1;1 -"P5007";"LIZA-RAM";0;"N";5;11;40;1;0;1;1 -"P5007";"LIZA-RAM";0;"N";5;11;41;1;0;1;1 -"P5007";"LIZA-RAM";0;"N";5;11;44;2;0;1;1 -"P5007";"MERL-MCC";0;"N";2.9;3;44;1;0;1;1 -"P5007";"MERL-MCC";0;"N";2.9;3;54;1;0;1;1 -"P5007";"MERL-MCC";0;"N";2.9;3;55;1;0;1;1 -"P5007";"SARD-PIL";0;"N";2.96;99;14.5;4;0.09;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;15;17;0.43;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;15.5;27;0.75;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;16;24;0.72;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;16.5;19;0.63;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;17;5;0.18;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;17.5;1;0.04;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;18;0;0;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;18.5;1;0.05;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;19;0;0;0;5 -"P5007";"SARD-PIL";0;"N";2.96;99;19.5;1;0.06;0;5 -"P5007";"SARD-SAR";0;"N";7.5;10;39;2;0;1;1 -"P5007";"SARD-SAR";0;"N";7.5;10;42;1;0;1;1 -"P5007";"SARD-SAR";0;"N";7.5;10;43;6;0;1;1 -"P5007";"SARD-SAR";0;"N";7.5;10;45;1;0;1;1 -"P5007";"SPON-CAN";0;"N";3.5;12;21;1;0;1;1 -"P5007";"SPON-CAN";0;"N";3.5;12;23;1;0;1;1 -"P5007";"SPON-CAN";0;"N";3.5;12;25;1;0;1;1 -"P5007";"SPON-CAN";0;"N";3.5;12;26;3;0;1;1 -"P5007";"SPON-CAN";0;"N";3.5;12;27;3;0;1;1 -"P5007";"SPON-CAN";0;"N";3.5;12;28;1;0;1;1 -"P5007";"SPON-CAN";0;"N";3.5;12;31;1;0;1;1 -"P5007";"SPON-CAN";0;"N";3.5;12;33;1;0;1;1 -"P5008";"ENGR-ENC";0;"N";2.9;89;14.5;1;0;0;5 -"P5008";"ENGR-ENC";0;"N";2.9;89;15;2;0;0;5 -"P5008";"ENGR-ENC";0;"N";2.9;89;15.5;16;0;0;5 -"P5008";"ENGR-ENC";0;"N";2.9;89;16;20;0;0;5 -"P5008";"ENGR-ENC";0;"N";2.9;89;16.5;21;0;0;5 -"P5008";"ENGR-ENC";0;"N";2.9;89;17;16;0;0;5 -"P5008";"ENGR-ENC";0;"N";2.9;89;17.5;8;0;0;5 -"P5008";"ENGR-ENC";0;"N";2.9;89;18;3;0;0;5 -"P5008";"ENGR-ENC";0;"N";2.9;89;18.5;1;0;0;5 -"P5008";"ENGR-ENC";0;"N";2.9;89;19;1;0;0;5 -"P5008";"SCOM-JAP";0;"N";0.5;1;38;1;0;1;1 -"P5008";"SCOM-SCO";0;"N";2.4;6;33;1;0;1;1 -"P5008";"SCOM-SCO";0;"N";2.4;6;35;1;0;1;1 -"P5008";"SCOM-SCO";0;"N";2.4;6;36;2;0;1;1 -"P5008";"SCOM-SCO";0;"N";2.4;6;38;1;0;1;1 -"P5008";"SCOM-SCO";0;"N";2.4;6;41;1;0;1;1 -"P5009";"MERL-MCC";0;"N";1.6;4;34;1;0;1;1 -"P5009";"MERL-MCC";0;"N";1.6;4;36;1;0;1;1 -"P5009";"MERL-MCC";0;"N";1.6;4;41;1;0;1;1 -"P5009";"MERL-MCC";0;"N";1.6;4;50;1;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;15;8;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;16;29;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;17;15;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;18;2;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;19;1;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;27;1;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;28;1;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;29;1;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;30;1;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;31;2;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;32;1;0;1;1 -"P5009";"TRAC-TRU";0;"N";3.8;63;33;1;0;1;1 -"P5010";"MYCT-OPX";0;"N";0;0;0;0;NA;1;1 -"P5011";"ENGR-ENC";0;"N";2.2;158;13.5;1;0.02;0;5 -"P5011";"ENGR-ENC";0;"N";2.2;158;14;12;0.24;0;5 -"P5011";"ENGR-ENC";0;"N";2.2;158;14.5;40;0.85;0;5 -"P5011";"ENGR-ENC";0;"N";2.2;158;15;38;0.9;0;5 -"P5011";"ENGR-ENC";0;"N";2.2;158;15.5;38;1;0;5 -"P5011";"ENGR-ENC";0;"N";2.2;158;16;19;0.56;0;5 -"P5011";"ENGR-ENC";0;"N";2.2;158;16.5;5;0.17;0;5 -"P5011";"ENGR-ENC";0;"N";2.2;158;17;5;0.18;0;5 -"P5011";"MOLA-MOL";0;"N";5.7;1;45;1;0;1;1 -"P5011";"SARD-PIL";0;"N";0.6;11;16.5;1;0;0;5 -"P5011";"SARD-PIL";0;"N";0.6;11;17;1;0;0;5 -"P5011";"SARD-PIL";0;"N";0.6;11;17.5;2;0;0;5 -"P5011";"SARD-PIL";0;"N";0.6;11;18.5;2;0;0;5 -"P5011";"SARD-PIL";0;"N";0.6;11;20;2;0;0;5 -"P5011";"SARD-PIL";0;"N";0.6;11;21.5;2;0;0;5 -"P5011";"SARD-PIL";0;"N";0.6;11;24;1;0;0;5 -"P5011";"SCOM-JAP";0;"N";3.5;55;17;1;0;1;1 -"P5011";"SCOM-JAP";0;"N";3.5;55;18;3;0;1;1 -"P5011";"SCOM-JAP";0;"N";3.5;55;19;16;0;1;1 -"P5011";"SCOM-JAP";0;"N";3.5;55;20;18;0;1;1 -"P5011";"SCOM-JAP";0;"N";3.5;55;21;11;0;1;1 -"P5011";"SCOM-JAP";0;"N";3.5;55;22;5;0;1;1 -"P5011";"SCOM-JAP";0;"N";3.5;55;23;1;0;1;1 -"P5012";"ENGR-ENC";0;"N";3.3;102;15;2;0;0;5 -"P5012";"ENGR-ENC";0;"N";3.3;102;15.5;12;0;0;5 -"P5012";"ENGR-ENC";0;"N";3.3;102;16;22;0;0;5 -"P5012";"ENGR-ENC";0;"N";3.3;102;16.5;21;0;0;5 -"P5012";"ENGR-ENC";0;"N";3.3;102;17;20;0;0;5 -"P5012";"ENGR-ENC";0;"N";3.3;102;17.5;15;0;0;5 -"P5012";"ENGR-ENC";0;"N";3.3;102;18;8;0;0;5 -"P5012";"ENGR-ENC";0;"N";3.3;102;18.5;2;0;0;5 -"P5012";"SARD-PIL";0;"N";6.3;81;19;5;0;0;5 -"P5012";"SARD-PIL";0;"N";6.3;81;19.5;2;0;0;5 -"P5012";"SARD-PIL";0;"N";6.3;81;20;10;0;0;5 -"P5012";"SARD-PIL";0;"N";6.3;81;20.5;9;0;0;5 -"P5012";"SARD-PIL";0;"N";6.3;81;21;22;0;0;5 -"P0442";"ENGR-ENC";0;"N";1.87;144;14.5;1;0.02;0;5 -"P0474";"MERL-MCC";0;"N";3.58;38;17;1;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;18;2;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;19;4;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;20;3;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;21;5;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;22;5;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;23;5;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;24;5;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;25;0;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;26;1;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;27;2;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;28;0;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;29;1;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;30;1;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;31;0;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;32;1;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;35;1;0;1;1 -"P0474";"MERL-MCC";0;"N";3.58;38;43;1;0;1;1 -"P0474";"MICR-POU";0;"N";0.05;1;23;1;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;22;2;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;23;2;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;24;0;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;25;1;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;26;1;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;27;2;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;28;1;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;29;2;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;30;4;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;31;5;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;32;6;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;33;2;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;34;4;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;35;3;0;1;1 -"P0474";"SCOM-SCO";0;"N";8.12;36;41;1;0;1;1 -"P0474";"TRAC-TRU";0;"N";3.86;118;10;7;0;1;1 -"P0384";"SARD-PIL";0;"N";4.9;71;15.5;2;0;0;5 -"P0384";"SARD-PIL";0;"N";4.9;71;18;1;0;0;5 -"P0384";"SARD-PIL";0;"N";4.9;71;19;1;0;0;5 -"P0385";"TRAC-TRU";0;"N";2.16;81;19;1;0.05;1;1 -"P0535";"SPRA-SPR";0;"N";0.82;64;11.5;33;0;0;5 -"P0535";"SPRA-SPR";0;"N";0.82;64;12;22;0;0;5 -"P0535";"SPRA-SPR";0;"N";0.82;64;12.5;2;0;0;5 -"P0535";"TRAC-TRU";0;"N";0.06;6;10;2;0;1;1 -"P5012";"SARD-PIL";0;"N";6.3;81;21.5;11;0;0;5 -"P5012";"SARD-PIL";0;"N";6.3;81;22;12;0;0;5 -"P5012";"SARD-PIL";0;"N";6.3;81;22.5;5;0;0;5 -"P5012";"SARD-PIL";0;"N";6.3;81;23;3;0;0;5 -"P5012";"SARD-PIL";0;"N";6.3;81;23.5;2;0;0;5 -"P5012";"SCOM-JAP";0;"N";0.3;3;22;1;0;1;1 -"P5012";"SCOM-JAP";0;"N";0.3;3;23;1;0;1;1 -"P5012";"SCOM-JAP";0;"N";0.3;3;24;1;0;1;1 -"P5012";"SCOM-JAP";0;"N";0.3;3;27;0;NA;1;1 -"P5012";"SCOM-SCO";0;"N";0.3;3;23;1;0;1;1 -"P5012";"SCOM-SCO";0;"N";0.3;3;24;1;0;1;1 -"P5012";"SCOM-SCO";0;"N";0.3;3;25;1;0;1;1 -"P5013";"ENGR-ENC";0;"N";3.45;143;12.5;3;0.04;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;13;2;0.03;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;13.5;5;0.09;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;14;9;0.16;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;14.5;33;0.67;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;15;36;0.84;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;15.5;30;0.78;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;16;16;0.52;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;16.5;4;0.13;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;17;4;0.13;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;17.5;1;0.03;0;5 -"P5013";"ENGR-ENC";0;"N";3.45;143;18.5;0;NA;0;5 -"P5013";"MERL-MCC";0;"N";27.4;51;20;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;23;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;24;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;25;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;26;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;27;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;28;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;29;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;30;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;31;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;32;4;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;33;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;35;4;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;36;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;37;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;38;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;39;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;40;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;42;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;43;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;44;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;46;2;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;48;3;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;49;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;51;3;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;54;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;57;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;60;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;62;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;63;1;0;1;1 -"P5013";"MERL-MCC";0;"N";27.4;51;77;1;0;1;1 -"P5013";"SARD-PIL";0;"N";4.7;90;18.5;3;0.17;0;5 -"P5013";"SARD-PIL";0;"N";4.7;90;19;5;0.29;0;5 -"P5013";"SARD-PIL";0;"N";4.7;90;19.5;18;1.06;0;5 -"P5013";"SARD-PIL";0;"N";4.7;90;20;23;1.47;0;5 -"P5013";"SARD-PIL";0;"N";4.7;90;20.5;17;1.16;0;5 -"P5013";"SARD-PIL";0;"N";4.7;90;21;15;1.08;0;5 -"P5013";"SARD-PIL";0;"N";4.7;90;21.5;3;0.25;0;5 -"P5013";"SARD-PIL";0;"N";4.7;90;22;4;0.33;0;5 -"P5013";"SARD-PIL";0;"N";4.7;90;22.5;2;0.18;0;5 -"P5013";"SCOM-JAP";0;"N";2.8;36;19;6;0;1;1 -"P5013";"SCOM-JAP";0;"N";2.8;36;20;9;0;1;1 -"P5013";"SCOM-JAP";0;"N";2.8;36;21;11;0;1;1 -"P5013";"SCOM-JAP";0;"N";2.8;36;22;7;0;1;1 -"P5013";"SCOM-JAP";0;"N";2.8;36;23;2;0;1;1 -"P5013";"SCOM-JAP";0;"N";2.8;36;24;1;0;1;1 -"P5013";"SCOM-SCO";0;"N";2;7;22;1;0;1;1 -"P5013";"SCOM-SCO";0;"N";2;7;33;3;0;1;1 -"P5013";"SCOM-SCO";0;"N";2;7;34;1;0;1;1 -"P5013";"SCOM-SCO";0;"N";2;7;36;1;0;1;1 -"P5013";"SCOM-SCO";0;"N";2;7;37;1;0;1;1 -"P5013";"TRAC-TRU";0;"N";0.9;17;16;7;0;1;1 -"P5013";"TRAC-TRU";0;"N";0.9;17;17;8;0;1;1 -"P5013";"TRAC-TRU";0;"N";0.9;17;20;1;0;1;1 -"P5013";"TRAC-TRU";0;"N";0.9;17;28;1;0;1;1 -"P5014";"ENGR-ENC";0;"N";2.4;77;15;4;0;0;5 -"P5014";"ENGR-ENC";0;"N";2.4;77;15.5;17;0;0;5 -"P5014";"ENGR-ENC";0;"N";2.4;77;16;22;0;0;5 -"P5014";"ENGR-ENC";0;"N";2.4;77;16.5;15;0;0;5 -"P5014";"ENGR-ENC";0;"N";2.4;77;17;7;0;0;5 -"P5014";"ENGR-ENC";0;"N";2.4;77;17.5;6;0;0;5 -"P5014";"ENGR-ENC";0;"N";2.4;77;18;3;0;0;5 -"P5014";"ENGR-ENC";0;"N";2.4;77;18.5;2;0;0;5 -"P5014";"ENGR-ENC";0;"N";2.4;77;19;1;0;0;5 -"P5014";"SCOM-JAP";0;"N";2;14;19;1;0;1;1 -"P5014";"SCOM-JAP";0;"N";2;14;22;1;0;1;1 -"P5014";"SCOM-JAP";0;"N";2;14;23;6;0;1;1 -"P5014";"SCOM-JAP";0;"N";2;14;24;3;0;1;1 -"P5014";"SCOM-JAP";0;"N";2;14;25;2;0;1;1 -"P5014";"SCOM-JAP";0;"N";2;14;34;1;0;1;1 -"P5014";"SCOM-SCO";0;"N";1.4;3;37;2;0;1;1 -"P5014";"SCOM-SCO";0;"N";1.4;3;40;1;0;1;1 -"P5014";"TRAC-TRU";0;"N";3.1;9;32;2;0;1;1 -"P5014";"TRAC-TRU";0;"N";3.1;9;33;2;0;1;1 -"P5014";"TRAC-TRU";0;"N";3.1;9;34;3;0;1;1 -"P5014";"TRAC-TRU";0;"N";3.1;9;35;2;0;1;1 -"P5015";"ENGR-ENC";0;"N";2.1;120;11.5;1;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;12;1;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;12.5;6;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;13;15;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;13.5;18;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;14;12;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;14.5;30;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;15;7;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;15.5;16;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;16;7;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;16.5;5;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;17;1;0;0;5 -"P5015";"ENGR-ENC";0;"N";2.1;120;17.5;1;0;0;5 -"P5015";"MERL-MCC";0;"N";35.6;157;16;6;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;17;13;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;18;19;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;19;15;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;20;5;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;21;9;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;22;6;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;23;8;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;24;7;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;25;12;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;26;6;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;27;8;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;28;6;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;29;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;31;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;32;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;33;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;34;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;35;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;36;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;38;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;39;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;40;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;41;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;42;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;44;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;45;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;48;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;50;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;51;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;52;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;53;3;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;55;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;56;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;57;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;61;2;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;64;1;0;1;1 -"P5015";"MERL-MCC";0;"N";35.6;157;74;1;0;1;1 -"P5015";"SARD-PIL";0;"N";5.1;79;17;1;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;17.5;1;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;18;1;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;18.5;5;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;19;2;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;19.5;5;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;20;13;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;20.5;15;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;21;18;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;21.5;12;0;0;5 -"P5015";"SARD-PIL";0;"N";5.1;79;22;6;0;0;5 -"P5015";"TRAC-TRU";0;"N";1.5;84;11;15;0;1;1 -"P5015";"TRAC-TRU";0;"N";1.5;84;12;48;0;1;1 -"P5015";"TRAC-TRU";0;"N";1.5;84;13;13;0;1;1 -"P5015";"TRAC-TRU";0;"N";1.5;84;15;2;0;1;1 -"P5015";"TRAC-TRU";0;"N";1.5;84;16;5;0;1;1 -"P5015";"TRAC-TRU";0;"N";1.5;84;17;1;0;1;1 -"P5016";"BOOP-BOO";0;"N";0.4;2;29;2;0;1;1 -"P5016";"ENGR-ENC";0;"N";1.91;102;12.5;5;0.06;0;5 -"P5016";"ENGR-ENC";0;"N";1.91;102;13;12;0.17;0;5 -"P5016";"ENGR-ENC";0;"N";1.91;102;13.5;19;0.31;0;5 -"P5016";"ENGR-ENC";0;"N";1.91;102;14;28;0.51;0;5 -"P5016";"ENGR-ENC";0;"N";1.91;102;14.5;26;0.55;0;5 -"P5016";"ENGR-ENC";0;"N";1.91;102;15;7;0.16;0;5 -"P5016";"ENGR-ENC";0;"N";1.91;102;15.5;3;0.07;0;5 -"P5016";"ENGR-ENC";0;"N";1.91;102;16;2;0.05;0;5 -"P5016";"MERL-MCC";0;"N";1.8;5;26;1;0;1;1 -"P5016";"MERL-MCC";0;"N";1.8;5;29;2;0;1;1 -"P5016";"MERL-MCC";0;"N";1.8;5;39;1;0;1;1 -"P5016";"MERL-MCC";0;"N";1.8;5;51;1;0;1;1 -"P5016";"SARD-PIL";0;"N";5.1;89;16.5;3;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;17;1;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;17.5;3;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;18.5;12;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;19;16;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;19.5;15;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;20;19;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;20.5;10;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;21;8;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;21.5;1;0;0;5 -"P5016";"SARD-PIL";0;"N";5.1;89;22;1;0;0;5 -"P5016";"SPON-CAN";0;"N";0.2;1;25;1;0;1;1 -"P5017";"DICE-LAB";0;"N";1.2;1;51;1;0;1;1 -"P5017";"SARD-PIL";0;"N";7.2;141;16.5;8;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;17;24;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;17.5;11;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;18;18;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;18.5;25;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;19;20;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;19.5;17;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;20;8;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;20.5;2;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;21;4;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;21.5;2;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;22;1;0;0;5 -"P5017";"SARD-PIL";0;"N";7.2;141;24;1;0;0;5 -"P5017";"SCOM-JAP";0;"N";4;19;21;2;0;1;1 -"P5017";"SCOM-JAP";0;"N";4;19;22;2;0;1;1 -"P5017";"SCOM-JAP";0;"N";4;19;24;1;0;1;1 -"P5017";"SCOM-JAP";0;"N";4;19;30;1;0;1;1 -"P5017";"SCOM-JAP";0;"N";4;19;31;3;0;1;1 -"P5017";"SCOM-JAP";0;"N";4;19;32;2;0;1;1 -"P5017";"SCOM-JAP";0;"N";4;19;33;5;0;1;1 -"P5017";"SCOM-JAP";0;"N";4;19;34;3;0;1;1 -"P5017";"SCOM-SCO";0;"N";0.6;2;33;1;0;1;1 -"P5017";"SCOM-SCO";0;"N";0.6;2;35;1;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;19;3;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;20;2;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;21;5;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;22;11;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;23;6;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;24;4;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;25;3;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;26;6;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;27;1;0;1;1 -"P5017";"TRAC-MED";0;"N";4.4;43;28;2;0;1;1 -"P5018";"ENGR-ENC";0;"N";5.57;151;14.5;2;0.04;0;5 -"P5018";"ENGR-ENC";0;"N";5.57;151;15.5;9;0.25;0;5 -"P5018";"ENGR-ENC";0;"N";5.57;151;16;14;0.42;0;5 -"P5018";"ENGR-ENC";0;"N";5.57;151;16.5;37;1.24;0;5 -"P5018";"ENGR-ENC";0;"N";5.57;151;17;37;1.35;0;5 -"P5018";"ENGR-ENC";0;"N";5.57;151;17.5;30;1.29;0;5 -"P5018";"ENGR-ENC";0;"N";5.57;151;18;17;0.72;0;5 -"P5018";"ENGR-ENC";0;"N";5.57;151;18.5;4;0.18;0;5 -"P5018";"ENGR-ENC";0;"N";5.57;151;19;1;0.05;0;5 -"P5018";"SCOM-JAP";0;"N";0.3;3;20;1;0;1;1 -"P5018";"SCOM-JAP";0;"N";0.3;3;23;2;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;23;2;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;24;3;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;25;1;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;35;1;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;36;2;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;37;0;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;38;14;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;39;1;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;40;4;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;41;1;0;1;1 -"P5018";"SCOM-SCO";0;"N";7.3;33;42;4;0;1;1 -"P5019";"ENGR-ENC";0;"N";2.1;73;14;2;0;0;5 -"P5019";"ENGR-ENC";0;"N";2.1;73;14.5;1;0;0;5 -"P5019";"ENGR-ENC";0;"N";2.1;73;15;4;0;0;5 -"P5019";"ENGR-ENC";0;"N";2.1;73;15.5;14;0;0;5 -"P5019";"ENGR-ENC";0;"N";2.1;73;16;17;0;0;5 -"P5019";"ENGR-ENC";0;"N";2.1;73;16.5;18;0;0;5 -"P5019";"ENGR-ENC";0;"N";2.1;73;17;7;0;0;5 -"P5019";"ENGR-ENC";0;"N";2.1;73;17.5;2;0;0;5 -"P5019";"ENGR-ENC";0;"N";2.1;73;18;7;0;0;5 -"P5019";"ENGR-ENC";0;"N";2.1;73;18.5;1;0;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;14;7;0.12;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;14.5;24;0.55;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;15;47;1.12;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;15.5;48;1.27;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;16;47;1.36;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;16.5;26;0.84;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;17;15;0.53;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;17.5;7;0.27;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;18;5;0.2;0;5 -"P5020";"ENGR-ENC";0;"N";6.37;228;18.5;2;0.08;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;16;3;0.09;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;16.5;5;0.17;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;17;12;0.45;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;17.5;6;0.26;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;18;21;0.7;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;18.5;16;0.73;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;19;26;1.49;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;19.5;11;0.65;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;20;3;0.19;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;20.5;6;0.39;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;21;6;0.45;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;21.5;2;0.14;0;5 -"P5021";"SARD-PIL";0;"N";5.83;118;22;1;0.08;0;5 -"P5022";"DICE-LAB";0;"N";0;1;58;1;0;1;1 -"P5022";"PRIO-GLA";0;"N";10;1;60;0;NA;1;1 -"P5022";"PRIO-GLA";0;"N";10;1;143;1;NA;1;1 -"P5022";"TRAC-TRU";0;"N";10.2;22;36;2;0;1;1 -"P5022";"TRAC-TRU";0;"N";10.2;22;37;3;0;1;1 -"P5022";"TRAC-TRU";0;"N";10.2;22;38;7;0;1;1 -"P5022";"TRAC-TRU";0;"N";10.2;22;39;3;0;1;1 -"P5022";"TRAC-TRU";0;"N";10.2;22;40;6;0;1;1 -"P5022";"TRAC-TRU";0;"N";10.2;22;41;0;0;1;1 -"P5022";"TRAC-TRU";0;"N";10.2;22;42;1;0;1;1 -"P5023";"DICE-PUN";0;"N";2.1;5;32;1;0;1;1 -"P5023";"DICE-PUN";0;"N";2.1;5;33;1;0;1;1 -"P5023";"DICE-PUN";0;"N";2.1;5;34;0;0;1;1 -"P5023";"DICE-PUN";0;"N";2.1;5;35;1;0;1;1 -"P5023";"DICE-PUN";0;"N";2.1;5;36;1;0;1;1 -"P5023";"DICE-PUN";0;"N";2.1;5;39;1;0;1;1 -"P5023";"DICE-PUN";0;"N";2.1;5;116;0;NA;1;1 -"P5023";"ENGR-ENC";0;"N";0.81;146;8.5;1;0.004;0;5 -"P5023";"ENGR-ENC";0;"N";0.81;146;9;34;0.17;0;5 -"P5023";"ENGR-ENC";0;"N";0.81;146;9.5;44;0.22;0;5 -"P5023";"ENGR-ENC";0;"N";0.81;146;10;54;0.31;0;5 -"P5023";"ENGR-ENC";0;"N";0.81;146;10.5;9;0.07;0;5 -"P5023";"ENGR-ENC";0;"N";0.81;146;11;4;0.03;0;5 -"P5023";"LIZA-RAM";0;"N";12.3;24;32;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;33;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;34;3;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;35;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;36;0;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;37;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;38;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;39;2;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;40;4;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;41;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;42;3;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;43;2;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;44;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;45;0;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;46;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;47;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;50;1;0;1;1 -"P5023";"LIZA-RAM";0;"N";12.3;24;52;0;NA;1;1 -"P5023";"SARD-PIL";0;"N";4.2;57;13;1;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;13.5;1;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;14;0;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;14.5;1;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;15;0;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;15.5;1;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;16;6;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;16.5;14;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;17.5;11;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;18;7;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;19.5;9;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;20;2;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;20.5;3;0;0;5 -"P5023";"SARD-PIL";0;"N";4.2;57;22;1;0;0;5 -"P5023";"SPRA-SPR";0;"N";0.6;62;10;8;0;0;5 -"P5023";"SPRA-SPR";0;"N";0.6;62;10.5;28;0;0;5 -"P5023";"SPRA-SPR";0;"N";0.6;62;11;17;0;0;5 -"P5023";"SPRA-SPR";0;"N";0.6;62;11.5;9;0;0;5 -"P5024";"SCOM-SCO";0;"N";2.2;6;33;1;0;1;1 -"P5024";"SCOM-SCO";0;"N";2.2;6;34;1;0;1;1 -"P5024";"SCOM-SCO";0;"N";2.2;6;35;3;0;1;1 -"P5024";"SCOM-SCO";0;"N";2.2;6;41;1;0;1;1 -"P5024";"TRAC-MED";0;"N";13.9;35;34;1;0;1;1 -"P5024";"TRAC-MED";0;"N";13.9;35;35;2;0;1;1 -"P5024";"TRAC-MED";0;"N";13.9;35;36;6;0;1;1 -"P5024";"TRAC-MED";0;"N";13.9;35;37;8;0;1;1 -"P5024";"TRAC-MED";0;"N";13.9;35;38;4;0;1;1 -"P5024";"TRAC-MED";0;"N";13.9;35;39;8;0;1;1 -"P5024";"TRAC-MED";0;"N";13.9;35;40;5;0;1;1 -"P5024";"TRAC-MED";0;"N";13.9;35;41;1;0;1;1 -"P5025";"DICE-LAB";0;"N";1.5;1;53;1;0;1;1 -"P5025";"ENGR-ENC";0;"N";1.99;138;11.5;5;0.05;0;5 -"P5025";"ENGR-ENC";0;"N";1.99;138;12;17;0.19;0;5 -"P5025";"ENGR-ENC";0;"N";1.99;138;12.5;35;0.46;0;5 -"P5025";"ENGR-ENC";0;"N";1.99;138;13;38;0.54;0;5 -"P5025";"ENGR-ENC";0;"N";1.99;138;13.5;29;0.46;0;5 -"P5025";"ENGR-ENC";0;"N";1.99;138;14;10;0.19;0;5 -"P5025";"ENGR-ENC";0;"N";1.99;138;14.5;4;0.07;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;15.5;1;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;16;5;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;16.5;22;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;17;24;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;17.5;11;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;18;8;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;18.5;13;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;19;8;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;19.5;8;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;20;3;0;0;5 -"P5025";"SARD-PIL";0;"N";4.4;104;20.5;1;0;0;5 -"P5026";"ENGR-ENC";0;"N";0.39;123;7.5;4;0.01;0;5 -"P5026";"ENGR-ENC";0;"N";0.39;123;8;57;0.16;0;5 -"P5026";"ENGR-ENC";0;"N";0.39;123;8.5;51;0.16;0;5 -"P5026";"ENGR-ENC";0;"N";0.39;123;9;10;0.04;0;5 -"P5026";"ENGR-ENC";0;"N";0.39;123;9.5;1;0.004;0;5 -"P5026";"LIZA-RAM";0;"N";8.7;6;34;1;0;1;1 -"P5026";"LIZA-RAM";0;"N";8.7;6;43;1;0;1;1 -"P5026";"LIZA-RAM";0;"N";8.7;6;49;1;0;1;1 -"P5026";"LIZA-RAM";0;"N";8.7;6;54;1;0;1;1 -"P5026";"LIZA-RAM";0;"N";8.7;6;62;1;0;1;1 -"P5026";"LIZA-RAM";0;"N";8.7;6;65;1;0;1;1 -"P5026";"SARD-PIL";0;"N";8;381;11.5;4;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;12;40;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;12.5;156;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;13;80;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;13.5;12;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;15;5;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;15.5;10;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;16;3;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;16.5;8;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;17;8;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;17.5;1;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;18;5;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;18.5;7;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;19;12;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;19.5;10;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;20;6;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;20.5;6;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;21;4;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;22.5;1;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;23;1;0;0;5 -"P5026";"SARD-PIL";0;"N";8;381;23.5;2;0;0;5 -"P5026";"SPRA-SPR";0;"N";0.2;60;8;1;0;0;5 -"P5026";"SPRA-SPR";0;"N";0.2;60;8.5;3;0;0;5 -"P5026";"SPRA-SPR";0;"N";0.2;60;9;32;0;0;5 -"P5026";"SPRA-SPR";0;"N";0.2;60;9.5;16;0;0;5 -"P5026";"SPRA-SPR";0;"N";0.2;60;10;5;0;0;5 -"P5026";"SPRA-SPR";0;"N";0.2;60;10.5;2;0;0;5 -"P5026";"SPRA-SPR";0;"N";0.2;60;11;1;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;13.5;7;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;14;17;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;14.5;28;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;15;24;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;15.5;5;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;16;11;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;16.5;9;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;17;3;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;17.5;8;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;18;5;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;18.5;2;0;0;5 -"P5027";"ENGR-ENC";0;"N";3;121;19;2;0;0;5 -"P5027";"MERL-MCC";0;"N";2.2;3;30;1;0;1;1 -"P5027";"MERL-MCC";0;"N";2.2;3;32;1;0;1;1 -"P5027";"MERL-MCC";0;"N";2.2;3;61;1;0;1;1 -"P5027";"SCOM-JAP";0;"N";1.1;17;18;1;0;1;1 -"P5027";"SCOM-JAP";0;"N";1.1;17;19;2;0;1;1 -"P5027";"SCOM-JAP";0;"N";1.1;17;20;4;0;1;1 -"P5027";"SCOM-JAP";0;"N";1.1;17;21;6;0;1;1 -"P5027";"SCOM-JAP";0;"N";1.1;17;22;2;0;1;1 -"P5027";"SCOM-JAP";0;"N";1.1;17;23;1;0;1;1 -"P5027";"SCOM-JAP";0;"N";1.1;17;24;1;0;1;1 -"P5027";"SCOM-SCO";0;"N";0.4;4;21;1;0;1;1 -"P5027";"SCOM-SCO";0;"N";0.4;4;22;1;0;1;1 -"P5027";"SCOM-SCO";0;"N";0.4;4;23;2;0;1;1 -"P5028";"ENGR-ENC";0;"N";2.4;96;14;5;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;14.5;27;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;15;26;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;15.5;18;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;16;9;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;16.5;1;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;17;3;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;17.5;2;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;18;3;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;18.5;1;0;0;5 -"P5028";"ENGR-ENC";0;"N";2.4;96;19;1;0;0;5 -"P5028";"MOLA-MOL";0;"N";20;4;35;1;0;1;1 -"P5028";"MOLA-MOL";0;"N";20;4;39;1;0;1;1 -"P5028";"MOLA-MOL";0;"N";20;4;42;1;0;1;1 -"P5028";"MOLA-MOL";0;"N";20;4;47;1;0;1;1 -"P5028";"SARD-PIL";0;"N";3.9;47;19.5;2;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;20;0;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;20.5;1;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;21;7;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;21.5;12;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;22;7;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;22.5;7;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;23;6;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;23.5;1;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;24;2;0;0;5 -"P5028";"SARD-PIL";0;"N";3.9;47;25;2;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;13;2;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;13.5;22;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;14;41;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;14.5;38;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;15;14;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;15.5;8;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;16;5;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;16.5;1;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;17;2;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;17.5;2;0;0;5 -"P5029";"ENGR-ENC";0;"N";2.8;137;18;2;0;0;5 -"P5029";"SARD-PIL";0;"N";1.5;22;19;2;0;0;5 -"P5029";"SARD-PIL";0;"N";1.5;22;19.5;1;0;0;5 -"P5029";"SARD-PIL";0;"N";1.5;22;20;3;0;0;5 -"P5029";"SARD-PIL";0;"N";1.5;22;20.5;5;0;0;5 -"P5029";"SARD-PIL";0;"N";1.5;22;21;7;0;0;5 -"P5029";"SARD-PIL";0;"N";1.5;22;21.5;2;0;0;5 -"P5029";"SARD-PIL";0;"N";1.5;22;22;0;0;0;5 -"P5029";"SARD-PIL";0;"N";1.5;22;22.5;2;0;0;5 -"P5029";"SCOM-JAP";0;"N";0.7;11;17;1;0;1;1 -"P5029";"SCOM-JAP";0;"N";0.7;11;19;3;0;1;1 -"P5029";"SCOM-JAP";0;"N";0.7;11;20;4;0;1;1 -"P5029";"SCOM-JAP";0;"N";0.7;11;21;2;0;1;1 -"P5029";"SCOM-JAP";0;"N";0.7;11;23;1;0;1;1 -"P5029";"SCOM-SCO";0;"N";4.5;21;23;6;0;1;1 -"P5029";"SCOM-SCO";0;"N";4.5;21;24;5;0;1;1 -"P5029";"SCOM-SCO";0;"N";4.5;21;34;1;0;1;1 -"P5029";"SCOM-SCO";0;"N";4.5;21;35;4;0;1;1 -"P5029";"SCOM-SCO";0;"N";4.5;21;37;3;0;1;1 -"P5029";"SCOM-SCO";0;"N";4.5;21;39;1;0;1;1 -"P5029";"SCOM-SCO";0;"N";4.5;21;44;1;0;1;1 -"P5030";"ENGR-ENC";0;"N";0.4;105;8;1;0;0;5 -"P5030";"ENGR-ENC";0;"N";0.4;105;8.5;19;0;0;5 -"P5030";"ENGR-ENC";0;"N";0.4;105;9;55;0;0;5 -"P5030";"ENGR-ENC";0;"N";0.4;105;9.5;23;0;0;5 -"P5030";"ENGR-ENC";0;"N";0.4;105;10;7;0;0;5 -"P5030";"LIZA-RAM";0;"N";0.4;1;38;1;0;1;1 -"P5030";"SARD-PIL";0;"N";3;142;11;4;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;11.5;18;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;12;39;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;12.5;34;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;13;12;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;13.5;7;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;14;2;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;14.5;0;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;15;1;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;15.5;1;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;16;0;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;16.5;1;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;17;1;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;17.5;2;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;18;3;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;18.5;1;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;19;0;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;19.5;3;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;20;5;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;20.5;2;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;21;2;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;21.5;2;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;22;0;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;22.5;1;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;23;0;0;0;5 -"P5030";"SARD-PIL";0;"N";3;142;23.5;1;0;0;5 -"P5030";"SPRA-SPR";0;"N";0.4;74;8.5;1;0;0;5 -"P5030";"SPRA-SPR";0;"N";0.4;74;9;15;0;0;5 -"P5030";"SPRA-SPR";0;"N";0.4;74;9.5;46;0;0;5 -"P5030";"SPRA-SPR";0;"N";0.4;74;10;12;0;0;5 -"P5031";"DICE-LAB";0;"N";3.5;1;71;1;0;1;1 -"P5031";"ENGR-ENC";0;"N";2.13;92;13;2;0.03;0;5 -"P5031";"ENGR-ENC";0;"N";2.13;92;13.5;12;0.22;0;5 -"P5031";"ENGR-ENC";0;"N";2.13;92;14;27;0.56;0;5 -"P5031";"ENGR-ENC";0;"N";2.13;92;14.5;27;0.65;0;5 -"P5031";"ENGR-ENC";0;"N";2.13;92;15;16;0.38;0;5 -"P5031";"ENGR-ENC";0;"N";2.13;92;15.5;2;0.06;0;5 -"P5031";"ENGR-ENC";0;"N";2.13;92;16.5;4;0.14;0;5 -"P5031";"ENGR-ENC";0;"N";2.13;92;17.5;2;0.08;0;5 -"P5031";"SARD-PIL";0;"N";3;45;19;1;0;0;5 -"P5031";"SARD-PIL";0;"N";3;45;19.5;7;0;0;5 -"P5031";"SARD-PIL";0;"N";3;45;20;8;0;0;5 -"P5031";"SARD-PIL";0;"N";3;45;20.5;10;0;0;5 -"P5031";"SARD-PIL";0;"N";3;45;21;5;0;0;5 -"P5031";"SARD-PIL";0;"N";3;45;21.5;10;0;0;5 -"P5031";"SARD-PIL";0;"N";3;45;22;1;0;0;5 -"P5031";"SARD-PIL";0;"N";3;45;22.5;3;0;0;5 -"P5032";"ENGR-ENC";0;"N";1.4;101;11.5;5;0;0;5 -"P5032";"ENGR-ENC";0;"N";1.4;101;12;17;0;0;5 -"P5032";"ENGR-ENC";0;"N";1.4;101;12.5;36;0;0;5 -"P5032";"ENGR-ENC";0;"N";1.4;101;13;26;0;0;5 -"P5032";"ENGR-ENC";0;"N";1.4;101;13.5;10;0;0;5 -"P5032";"ENGR-ENC";0;"N";1.4;101;14;3;0;0;5 -"P5032";"ENGR-ENC";0;"N";1.4;101;14.5;2;0;0;5 -"P5032";"ENGR-ENC";0;"N";1.4;101;15;1;0;0;5 -"P5032";"ENGR-ENC";0;"N";1.4;101;15.5;1;0;0;5 -"P5033";"BELO-BEO";0;"N";6.6;25;45;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;46;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;47;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;48;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;54;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;55;3;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;56;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;57;4;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;59;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;60;2;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;61;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;62;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;64;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;67;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;68;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;70;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;72;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;74;1;0;1;1 -"P5033";"BELO-BEO";0;"N";6.6;25;76;1;0;1;1 -"P5033";"DICE-LAB";0;"N";2.2;4;34;1;0;1;1 -"P5033";"DICE-LAB";0;"N";2.2;4;36;1;0;1;1 -"P5033";"DICE-LAB";0;"N";2.2;4;37;1;0;1;1 -"P5033";"DICE-LAB";0;"N";2.2;4;38;1;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;26;1;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;27;1;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;28;2;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;29;3;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;30;1;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;31;2;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;33;2;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;35;2;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;37;1;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;38;1;0;1;1 -"P5033";"DICE-PUN";0;"N";5.3;17;39;1;0;1;1 -"P5033";"ENGR-ENC";0;"N";1;99;10;4;0;0;5 -"P5033";"ENGR-ENC";0;"N";1;99;10.5;4;0;0;5 -"P5033";"ENGR-ENC";0;"N";1;99;11;14;0;0;5 -"P5033";"ENGR-ENC";0;"N";1;99;11.5;16;0;0;5 -"P5033";"ENGR-ENC";0;"N";1;99;12;17;0;0;5 -"P5033";"ENGR-ENC";0;"N";1;99;12.5;19;0;0;5 -"P5033";"ENGR-ENC";0;"N";1;99;13;15;0;0;5 -"P5033";"ENGR-ENC";0;"N";1;99;13.5;8;0;0;5 -"P5033";"ENGR-ENC";0;"N";1;99;14;2;0;0;5 -"P5033";"LIZA-RAM";0;"N";1.5;2;38;1;0;1;1 -"P5033";"LIZA-RAM";0;"N";1.5;2;48;1;0;1;1 -"P5033";"SARD-PIL";0;"N";8.9;129;13.5;1;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;14;1;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;14.5;1;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;15;5;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;15.5;1;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;16;3;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;16.5;2;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;17;2;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;17.5;2;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;18;1;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;18.5;5;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;19;5;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;19.5;5;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;20;6;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;20.5;7;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;21;14;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;21.5;10;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;22;10;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;22.5;15;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;23;8;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;23.5;7;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;24;7;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;24.5;8;0;0;5 -"P5033";"SARD-PIL";0;"N";8.9;129;25;3;0;0;5 -"P5033";"SPON-CAN";0;"N";2.3;3;29;1;0;1;1 -"P5033";"SPON-CAN";0;"N";2.3;3;35;1;0;1;1 -"P5033";"SPON-CAN";0;"N";2.3;3;36;1;0;1;1 -"P5034";"BELO-BEO";0;"N";0.4;1;66;1;0;1;1 -"P5034";"ENGR-ENC";0;"N";1.3;87;11.5;1;0;0;5 -"P5034";"ENGR-ENC";0;"N";1.3;87;12;10;0;0;5 -"P5034";"ENGR-ENC";0;"N";1.3;87;12.5;27;0;0;5 -"P5034";"ENGR-ENC";0;"N";1.3;87;13;30;0;0;5 -"P5034";"ENGR-ENC";0;"N";1.3;87;13.5;12;0;0;5 -"P5034";"ENGR-ENC";0;"N";1.3;87;14;4;0;0;5 -"P5034";"ENGR-ENC";0;"N";1.3;87;14.5;3;0;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;15;1;0.02;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;15.5;6;0.17;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;16;11;0.34;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;16.5;21;0.73;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;17;16;0.59;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;17.5;12;0.51;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;18;13;0.6;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;18.5;20;0.99;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;19;16;0.86;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;19.5;15;0.86;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;20;8;0.48;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;20.5;3;0.19;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;21;2;0.14;0;5 -"P5034";"SARD-PIL";0;"N";6.66;146;21.5;2;0.15;0;5 -"P5034";"TRAC-MED";0;"N";0.9;5;25;2;0;1;1 -"P5034";"TRAC-MED";0;"N";0.9;5;26;1;0;1;1 -"P5034";"TRAC-MED";0;"N";0.9;5;27;2;0;1;1 -"P5035";"DICE-LAB";0;"N";10.95;11;37;1;0;1;1 -"P5035";"DICE-LAB";0;"N";10.95;11;39;2;0;1;1 -"P5035";"DICE-LAB";0;"N";10.95;11;42;1;0;1;1 -"P5035";"DICE-LAB";0;"N";10.95;11;45;3;0;1;1 -"P5035";"DICE-LAB";0;"N";10.95;11;47;1;0;1;1 -"P5035";"DICE-LAB";0;"N";10.95;11;49;1;0;1;1 -"P5035";"DICE-LAB";0;"N";10.95;11;55;1;0;1;1 -"P5035";"DICE-LAB";0;"N";10.95;11;59;1;0;1;1 -"P5035";"SARD-PIL";0;"N";5.65;118;16;6;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;16.5;12;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;17;16;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;17.5;15;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;18;14;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;18.5;16;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;19;11;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;19.5;13;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;20;8;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;20.5;3;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;21;1;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;21.5;2;0;0;5 -"P5035";"SARD-PIL";0;"N";5.65;118;22.5;1;0;0;5 -"P5035";"SCOM-JAP";0;"N";4.35;28;20;1;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;21;5;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;22;5;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;23;3;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;24;1;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;25;2;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;26;1;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;27;2;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;28;1;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;30;1;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;31;1;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;32;1;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;33;2;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;35;1;0;1;1 -"P5035";"SCOM-JAP";0;"N";4.35;28;36;1;0;1;1 -"P5035";"SCOM-SCO";0;"N";1.1;4;30;2;0;1;1 -"P5035";"SCOM-SCO";0;"N";1.1;4;36;2;0;1;1 -"P5035";"TRAC-MED";0;"N";0.6;6;22;2;0;1;1 -"P5035";"TRAC-MED";0;"N";0.6;6;23;3;0;1;1 -"P5035";"TRAC-MED";0;"N";0.6;6;24;1;0;1;1 -"P5036";"ENGR-ENC";0;"N";1.73;91;12;1;0.01;0;5 -"P5036";"ENGR-ENC";0;"N";1.73;91;12.5;6;0.08;0;5 -"P5036";"ENGR-ENC";0;"N";1.73;91;13;11;0.17;0;5 -"P5036";"ENGR-ENC";0;"N";1.73;91;13.5;11;0.18;0;5 -"P5036";"ENGR-ENC";0;"N";1.73;91;14;24;0.45;0;5 -"P5036";"ENGR-ENC";0;"N";1.73;91;14.5;21;0.43;0;5 -"P5036";"ENGR-ENC";0;"N";1.73;91;15;14;0.31;0;5 -"P5036";"ENGR-ENC";0;"N";1.73;91;15.5;1;0.02;0;5 -"P5036";"ENGR-ENC";0;"N";1.73;91;16;2;0.06;0;5 -"P5036";"ENGR-ENC";0;"N";1.73;91;17;0;NA;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;16.5;2;0;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;17;1;0;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;17.5;10;0;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;18;14;0;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;18.5;17;0;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;19;16;0;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;19.5;16;0;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;20;7;0;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;20.5;5;0;0;5 -"P5036";"SARD-PIL";0;"N";4.9;90;21;2;0;0;5 -"P5036";"SPRA-SPR";0;"N";1.15;69;11.5;1;0;0;5 -"P5036";"SPRA-SPR";0;"N";1.15;69;12;10;0;0;5 -"P5036";"SPRA-SPR";0;"N";1.15;69;12.5;31;0;0;5 -"P5036";"SPRA-SPR";0;"N";1.15;69;13;22;0;0;5 -"P5036";"SPRA-SPR";0;"N";1.15;69;13.5;5;0;0;5 -"P5037";"ENGR-ENC";0;"N";1.15;89;11;1;0;0;5 -"P5037";"ENGR-ENC";0;"N";1.15;89;11.5;6;0;0;5 -"P5037";"ENGR-ENC";0;"N";1.15;89;12;23;0;0;5 -"P5037";"ENGR-ENC";0;"N";1.15;89;12.5;22;0;0;5 -"P5037";"ENGR-ENC";0;"N";1.15;89;13;19;0;0;5 -"P5037";"ENGR-ENC";0;"N";1.15;89;13.5;8;0;0;5 -"P5037";"ENGR-ENC";0;"N";1.15;89;14;5;0;0;5 -"P5037";"ENGR-ENC";0;"N";1.15;89;14.5;4;0;0;5 -"P5037";"ENGR-ENC";0;"N";1.15;89;15;1;0;0;5 -"P5038";"ENGR-ENC";0;"N";1.02;74;11.5;4;0.04;0;5 -"P5038";"ENGR-ENC";0;"N";1.02;74;12;13;0.15;0;5 -"P5038";"ENGR-ENC";0;"N";1.02;74;12.5;28;0.37;0;5 -"P5038";"ENGR-ENC";0;"N";1.02;74;13;18;0.26;0;5 -"P5038";"ENGR-ENC";0;"N";1.02;74;13.5;8;0.13;0;5 -"P5038";"ENGR-ENC";0;"N";1.02;74;14;2;0.04;0;5 -"P5038";"ENGR-ENC";0;"N";1.02;74;14.5;1;0.02;0;5 -"P5038";"ENGR-ENC";0;"N";1.02;74;15;0;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;15;4;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;15.5;6;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;16;20;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;16.5;17;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;17;16;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;17.5;9;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;18;4;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;18.5;5;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;19;4;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;19.5;4;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;20;1;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;21;1;0;0;5 -"P5038";"SARD-PIL";0;"N";3.7;93;22;2;0;0;5 -"P5038";"SPRA-SPR";0;"N";0.85;69;10.5;1;0;0;5 -"P5038";"SPRA-SPR";0;"N";0.85;69;11;30;0;0;5 -"P5038";"SPRA-SPR";0;"N";0.85;69;11.5;27;0;0;5 -"P5038";"SPRA-SPR";0;"N";0.85;69;12;11;0;0;5 -"P5039";"ENGR-ENC";0;"N";1.25;75;12.5;5;0;0;5 -"P5039";"ENGR-ENC";0;"N";1.25;75;13;11;0;0;5 -"P5039";"ENGR-ENC";0;"N";1.25;75;13.5;27;0;0;5 -"P5039";"ENGR-ENC";0;"N";1.25;75;14;17;0;0;5 -"P5039";"ENGR-ENC";0;"N";1.25;75;14.5;12;0;0;5 -"P5039";"ENGR-ENC";0;"N";1.25;75;15;1;0;0;5 -"P5039";"ENGR-ENC";0;"N";1.25;75;15.5;2;0;0;5 -"P5039";"MOLA-MOL";0;"N";4.1;1;40;1;0;1;1 -"P5040";"DICE-LAB";0;"N";1.5;1;52;1;0;1;1 -"P5040";"ENGR-ENC";0;"N";0.9;73;11.5;9;0;0;5 -"P5040";"ENGR-ENC";0;"N";0.9;73;12;12;0;0;5 -"P5040";"ENGR-ENC";0;"N";0.9;73;12.5;26;0;0;5 -"P5040";"ENGR-ENC";0;"N";0.9;73;13;14;0;0;5 -"P5040";"ENGR-ENC";0;"N";0.9;73;13.5;8;0;0;5 -"P5040";"ENGR-ENC";0;"N";0.9;73;14;1;0;0;5 -"P5040";"ENGR-ENC";0;"N";0.9;73;14.5;2;0;0;5 -"P5040";"ENGR-ENC";0;"N";0.9;73;15.5;1;0;0;5 -"P5040";"ZEUS-FAB";0;"N";2.7;1;52;1;0;1;1 -"P5041";"ENGR-ENC";0;"N";1.5;94;12;3;0;0;5 -"P5041";"ENGR-ENC";0;"N";1.5;94;12.5;14;0;0;5 -"P5041";"ENGR-ENC";0;"N";1.5;94;13;20;0;0;5 -"P5041";"ENGR-ENC";0;"N";1.5;94;13.5;22;0;0;5 -"P5041";"ENGR-ENC";0;"N";1.5;94;14;25;0;0;5 -"P5041";"ENGR-ENC";0;"N";1.5;94;14.5;6;0;0;5 -"P5041";"ENGR-ENC";0;"N";1.5;94;15;3;0;0;5 -"P5041";"ENGR-ENC";0;"N";1.5;94;16;1;0;0;5 -"P5042";"DICE-LAB";0;"N";9.5;9;38;1;0;1;1 -"P5042";"DICE-LAB";0;"N";9.5;9;39;1;0;1;1 -"P5042";"DICE-LAB";0;"N";9.5;9;42;1;0;1;1 -"P5042";"DICE-LAB";0;"N";9.5;9;45;2;0;1;1 -"P5042";"DICE-LAB";0;"N";9.5;9;46;1;0;1;1 -"P5042";"DICE-LAB";0;"N";9.5;9;47;1;0;1;1 -"P5042";"DICE-LAB";0;"N";9.5;9;50;1;0;1;1 -"P5042";"DICE-LAB";0;"N";9.5;9;62;1;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;26;1;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;28;2;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;29;5;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;30;4;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;32;1;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;34;3;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;35;2;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;36;2;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;38;2;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;40;1;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;42;1;0;1;1 -"P5042";"DIPL-SAR";0;"N";16.7;25;43;1;0;1;1 -"P5042";"SARD-PIL";0;"N";4.53;85;16;1;0.03;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;16.5;3;0.1;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;17;1;0.04;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;17.5;3;0.13;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;18;14;0.65;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;18.5;16;0.78;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;19;20;1.04;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;19.5;10;0.56;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;20;7;0.43;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;20.5;4;0.27;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;21;3;0.2;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;21.5;0;0;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;22;2;0.17;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;22.5;0;0;0;5 -"P5042";"SARD-PIL";0;"N";4.53;85;23;1;0.1;0;5 -"P5043";"ENGR-ENC";0;"N";1.3;82;12.5;6;0;0;5 -"P5043";"ENGR-ENC";0;"N";1.3;82;13;20;0;0;5 -"P5043";"ENGR-ENC";0;"N";1.3;82;13.5;32;0;0;5 -"P5043";"ENGR-ENC";0;"N";1.3;82;14;21;0;0;5 -"P5043";"ENGR-ENC";0;"N";1.3;82;14.5;2;0;0;5 -"P5043";"ENGR-ENC";0;"N";1.3;82;15.5;1;0;0;5 -"P5044";"BELO-BEO";0;"N";3.5;8;66;1;0;1;1 -"P5044";"BELO-BEO";0;"N";3.5;8;68;1;0;1;1 -"P5044";"BELO-BEO";0;"N";3.5;8;70;2;0;1;1 -"P5044";"BELO-BEO";0;"N";3.5;8;72;1;0;1;1 -"P5044";"BELO-BEO";0;"N";3.5;8;73;2;0;1;1 -"P5044";"BELO-BEO";0;"N";3.5;8;76;1;0;1;1 -"P5044";"ENGR-ENC";0;"N";1.7;78;13.5;8;0;0;5 -"P5044";"ENGR-ENC";0;"N";1.7;78;14;19;0;0;5 -"P5044";"ENGR-ENC";0;"N";1.7;78;14.5;21;0;0;5 -"P5044";"ENGR-ENC";0;"N";1.7;78;15;13;0;0;5 -"P5044";"ENGR-ENC";0;"N";1.7;78;15.5;6;0;0;5 -"P5044";"ENGR-ENC";0;"N";1.7;78;16;3;0;0;5 -"P5044";"ENGR-ENC";0;"N";1.7;78;16.5;2;0;0;5 -"P5044";"ENGR-ENC";0;"N";1.7;78;17;2;0;0;5 -"P5044";"ENGR-ENC";0;"N";1.7;78;17.5;2;0;0;5 -"P5044";"ENGR-ENC";0;"N";1.7;78;18;2;0;0;5 -"P5044";"MOLA-MOL";0;"N";5.75;2;35;1;0;1;1 -"P5044";"MOLA-MOL";0;"N";5.75;2;36;1;0;1;1 -"P5044";"SCOM-JAP";0;"N";6.9;13;32;1;0;1;1 -"P5044";"SCOM-JAP";0;"N";6.9;13;33;1;0;1;1 -"P5044";"SCOM-JAP";0;"N";6.9;13;34;1;0;1;1 -"P5044";"SCOM-JAP";0;"N";6.9;13;37;1;0;1;1 -"P5044";"SCOM-JAP";0;"N";6.9;13;38;3;0;1;1 -"P5044";"SCOM-JAP";0;"N";6.9;13;39;1;0;1;1 -"P5044";"SCOM-JAP";0;"N";6.9;13;40;2;0;1;1 -"P5044";"SCOM-JAP";0;"N";6.9;13;41;2;0;1;1 -"P5044";"SCOM-JAP";0;"N";6.9;13;42;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;47;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;52;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;54;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;65;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;66;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;68;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;71;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;78;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;80;1;0;1;1 -"P5045";"BELO-BEO";0;"N";5.2;11;83;2;0;1;1 -"P5045";"DICE-LAB";0;"N";5.35;1;78;1;0;1;1 -"P5045";"ENGR-ENC";0;"N";2.91;73;15;0;0;0;5 -"P5045";"ENGR-ENC";0;"N";2.91;73;15.5;0;0;0;5 -"P5045";"ENGR-ENC";0;"N";2.91;73;16;4;0.12;0;5 -"P5045";"ENGR-ENC";0;"N";2.91;73;16.5;4;0.13;0;5 -"P5045";"ENGR-ENC";0;"N";2.91;73;17;19;0.73;0;5 -"P5045";"ENGR-ENC";0;"N";2.91;73;17.5;17;0.66;0;5 -"P5045";"ENGR-ENC";0;"N";2.91;73;18;20;0.83;0;5 -"P5045";"ENGR-ENC";0;"N";2.91;73;18.5;8;0.36;0;5 -"P5045";"ENGR-ENC";0;"N";2.91;73;19;1;0.05;0;5 -"P5045";"SCOM-SCO";0;"N";0.6;1;40;1;0;1;1 -"P5046";"ENGR-ENC";0;"N";1.15;79;12;1;0;0;5 -"P5046";"ENGR-ENC";0;"N";1.15;79;12.5;12;0;0;5 -"P5046";"ENGR-ENC";0;"N";1.15;79;13;30;0;0;5 -"P5046";"ENGR-ENC";0;"N";1.15;79;13.5;25;0;0;5 -"P5046";"ENGR-ENC";0;"N";1.15;79;14;8;0;0;5 -"P5046";"ENGR-ENC";0;"N";1.15;79;14.5;2;0;0;5 -"P5046";"ENGR-ENC";0;"N";1.15;79;15;1;0;0;5 -"P5046";"SARD-PIL";0;"N";1.95;34;18;3;0;0;5 -"P5046";"SARD-PIL";0;"N";1.95;34;18.5;7;0;0;5 -"P5046";"SARD-PIL";0;"N";1.95;34;19;7;0;0;5 -"P5046";"SARD-PIL";0;"N";1.95;34;19.5;7;0;0;5 -"P5046";"SARD-PIL";0;"N";1.95;34;20;5;0;0;5 -"P5046";"SARD-PIL";0;"N";1.95;34;20.5;3;0;0;5 -"P5046";"SARD-PIL";0;"N";1.95;34;21;1;0;0;5 -"P5046";"SARD-PIL";0;"N";1.95;34;21.5;1;0;0;5 -"P5047";"ENGR-ENC";0;"N";2.9;124;13;1;0;0;5 -"P5047";"ENGR-ENC";0;"N";2.9;124;14;9;0;0;5 -"P5047";"ENGR-ENC";0;"N";2.9;124;14.5;26;0;0;5 -"P5047";"ENGR-ENC";0;"N";2.9;124;15;51;0;0;5 -"P5047";"ENGR-ENC";0;"N";2.9;124;15.5;30;0;0;5 -"P5047";"ENGR-ENC";0;"N";2.9;124;16;4;0;0;5 -"P5047";"ENGR-ENC";0;"N";2.9;124;17;2;0;0;5 -"P5047";"ENGR-ENC";0;"N";2.9;124;18;1;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;13.5;4;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;14;13;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;14.5;18;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;15;24;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;15.5;16;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;16;4;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;16.5;2;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;17;5;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;17.5;4;0;0;5 -"P5048";"ENGR-ENC";0;"N";2.2;91;18.5;1;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;16.5;3;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;17;5;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;17.5;2;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;18;3;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;18.5;1;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;19;9;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;19.5;15;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;20;17;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;20.5;20;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;21;14;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;21.5;12;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;22;2;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;22.5;2;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;23;1;0;0;5 -"P5048";"SARD-PIL";0;"N";6.7;107;23.5;1;0;0;5 -"P5049";"TRAC-TRU";0;"N";11.4;36;29;2;0;1;1 -"P5049";"TRAC-TRU";0;"N";11.4;36;30;2;0;1;1 -"P5049";"TRAC-TRU";0;"N";11.4;36;31;8;0;1;1 -"P5049";"TRAC-TRU";0;"N";11.4;36;32;10;0;1;1 -"P5049";"TRAC-TRU";0;"N";11.4;36;33;7;0;1;1 -"P5049";"TRAC-TRU";0;"N";11.4;36;34;3;0;1;1 -"P5049";"TRAC-TRU";0;"N";11.4;36;35;1;0;1;1 -"P5049";"TRAC-TRU";0;"N";11.4;36;36;2;0;1;1 -"P5049";"TRAC-TRU";0;"N";11.4;36;37;1;0;1;1 -"P5050";"ENGR-ENC";0;"N";1.8;76;13.5;1;0;0;5 -"P5050";"ENGR-ENC";0;"N";1.8;76;14;3;0;0;5 -"P5050";"ENGR-ENC";0;"N";1.8;76;14.5;12;0;0;5 -"P5050";"ENGR-ENC";0;"N";1.8;76;15;25;0;0;5 -"P5050";"ENGR-ENC";0;"N";1.8;76;15.5;22;0;0;5 -"P5050";"ENGR-ENC";0;"N";1.8;76;16;8;0;0;5 -"P5050";"ENGR-ENC";0;"N";1.8;76;16.5;2;0;0;5 -"P5050";"ENGR-ENC";0;"N";1.8;76;17;1;0;0;5 -"P5050";"ENGR-ENC";0;"N";1.8;76;18;1;0;0;5 -"P5050";"ENGR-ENC";0;"N";1.8;76;19;1;0;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;17;0;0;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;17.5;3;0.11;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;18.5;3;0.15;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;19;6;0.31;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;19.5;12;0.69;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;20;18;1.08;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;20.5;16;1.05;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;21;13;0.92;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;21.5;6;0.46;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;22;6;0.48;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;22.5;6;0.49;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;23;1;0.09;0;5 -"P5050";"SARD-PIL";0;"N";5.94;91;23.5;1;0.08;0;5 -"P5050";"SCOM-JAP";0;"N";0.85;6;22;1;0;1;1 -"P5050";"SCOM-JAP";0;"N";0.85;6;23;1;0;1;1 -"P5050";"SCOM-JAP";0;"N";0.85;6;24;1;0;1;1 -"P5050";"SCOM-JAP";0;"N";0.85;6;25;2;0;1;1 -"P5050";"SCOM-JAP";0;"N";0.85;6;36;1;0;1;1 -"P5051";"DICE-LAB";0;"N";2.5;1;61;1;0;1;1 -"P5051";"SARD-PIL";0;"N";4.39;62;18;1;0.05;0;5 -"P5051";"SARD-PIL";0;"N";4.39;62;18.5;6;0.31;0;5 -"P5051";"SARD-PIL";0;"N";4.39;62;19;3;0.17;0;5 -"P5051";"SARD-PIL";0;"N";4.39;62;19.5;7;0.42;0;5 -"P5051";"SARD-PIL";0;"N";4.39;62;20;12;0.78;0;5 -"P5051";"SARD-PIL";0;"N";4.39;62;20.5;12;0.85;0;5 -"P5051";"SARD-PIL";0;"N";4.39;62;21;11;0.87;0;5 -"P5051";"SARD-PIL";0;"N";4.39;62;21.5;4;0.33;0;5 -"P5051";"SARD-PIL";0;"N";4.39;62;22;4;0.39;0;5 -"P5051";"SARD-PIL";0;"N";4.39;62;22.5;2;0.2;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;11.5;1;0;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;12.5;6;0;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;13;9;0;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;13.5;13;0;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;14;25;0;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;14.5;9;0;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;15;2;0;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;15.5;2;0;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;16;1;0;0;5 -"P5052";"ENGR-ENC";0;"N";1.2;69;16.5;1;0;0;5 -"P5052";"SARD-PIL";0;"N";4.2;74;17.5;3;0;0;5 -"P5052";"SARD-PIL";0;"N";4.2;74;18;6;0;0;5 -"P5052";"SARD-PIL";0;"N";4.2;74;18.5;9;0;0;5 -"P5052";"SARD-PIL";0;"N";4.2;74;19;21;0;0;5 -"P5052";"SARD-PIL";0;"N";4.2;74;19.5;20;0;0;5 -"P5052";"SARD-PIL";0;"N";4.2;74;20;8;0;0;5 -"P5052";"SARD-PIL";0;"N";4.2;74;20.5;2;0;0;5 -"P5052";"SARD-PIL";0;"N";4.2;74;21;4;0;0;5 -"P5052";"SARD-PIL";0;"N";4.2;74;23;1;0;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;14;4;0.08;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;14.5;15;0.35;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;15;16;0.41;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;15.5;6;0.16;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;16;3;0.09;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;16.5;3;0.09;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;17;3;0.11;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;17.5;3;0.13;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;18;8;0.39;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;18.5;12;0.6;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;19;16;0.86;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;19.5;19;1.12;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;20;13;0.82;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;20.5;12;0.82;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;21;6;0.43;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;21.5;5;0.38;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;22;2;0.17;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;22.5;4;0.35;0;5 -"P5053";"SARD-PIL";0;"N";7.5;151;23;1;0.1;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;10;1;0.005;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;10.5;1;0.005;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;11;4;0.03;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;11.5;16;0.17;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;12;38;0.44;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;12.5;43;0.57;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;13;47;0.7;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;13.5;7;0.11;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;14;10;0.19;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;14.5;4;0.08;0;5 -"P5054";"ENGR-ENC";0;"N";2.31;171;15;0;0;0;5 -"P5055";"DICE-LAB";0;"N";10.85;4;54;1;0;1;1 -"P5055";"DICE-LAB";0;"N";10.85;4;64;2;0;1;1 -"P5055";"DICE-LAB";0;"N";10.85;4;73;1;0;1;1 -"P5055";"SARD-PIL";0;"N";4.75;84;17.5;3;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;18;5;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;18.5;15;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;19;24;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;19.5;13;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;20;14;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;20.5;3;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;21;2;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;21.5;2;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;22;2;0;0;5 -"P5055";"SARD-PIL";0;"N";4.75;84;22.5;1;0;0;5 -"P5056";"ENGR-ENC";0;"N";1.3;84;11.5;1;0;0;5 -"P5056";"ENGR-ENC";0;"N";1.3;84;12;5;0;0;5 -"P5056";"ENGR-ENC";0;"N";1.3;84;12.5;11;0;0;5 -"P5056";"ENGR-ENC";0;"N";1.3;84;13;21;0;0;5 -"P5056";"ENGR-ENC";0;"N";1.3;84;13.5;29;0;0;5 -"P5056";"ENGR-ENC";0;"N";1.3;84;14;10;0;0;5 -"P5056";"ENGR-ENC";0;"N";1.3;84;14.5;6;0;0;5 -"P5056";"ENGR-ENC";0;"N";1.3;84;16;1;0;0;5 -"P5057";"DICE-LAB";0;"N";16.4;9;47;1;0;1;1 -"P5057";"DICE-LAB";0;"N";16.4;9;50;1;0;1;1 -"P5057";"DICE-LAB";0;"N";16.4;9;53;1;0;1;1 -"P5057";"DICE-LAB";0;"N";16.4;9;55;1;0;1;1 -"P5057";"DICE-LAB";0;"N";16.4;9;56;1;0;1;1 -"P5057";"DICE-LAB";0;"N";16.4;9;57;1;0;1;1 -"P5057";"DICE-LAB";0;"N";16.4;9;59;1;0;1;1 -"P5057";"DICE-LAB";0;"N";16.4;9;60;1;0;1;1 -"P5057";"DICE-LAB";0;"N";16.4;9;70;1;0;1;1 -"P5057";"ENGR-ENC";0;"N";1.24;91;10.5;1;0.005;0;5 -"P5057";"ENGR-ENC";0;"N";1.24;91;11;3;0.02;0;5 -"P5057";"ENGR-ENC";0;"N";1.24;91;11.5;9;0.09;0;5 -"P5057";"ENGR-ENC";0;"N";1.24;91;12;25;0.29;0;5 -"P5057";"ENGR-ENC";0;"N";1.24;91;12.5;24;0.32;0;5 -"P5057";"ENGR-ENC";0;"N";1.24;91;13;15;0.23;0;5 -"P5057";"ENGR-ENC";0;"N";1.24;91;13.5;7;0.13;0;5 -"P5057";"ENGR-ENC";0;"N";1.24;91;14;7;0.14;0;5 -"P5057";"ENGR-ENC";0;"N";1.24;91;16.5;0;0;0;5 -"P5058";"ENGR-ENC";0;"N";1;89;10.5;1;0;0;5 -"P5058";"ENGR-ENC";0;"N";1;89;11;3;0;0;5 -"P5058";"ENGR-ENC";0;"N";1;89;11.5;8;0;0;5 -"P5058";"ENGR-ENC";0;"N";1;89;12;29;0;0;5 -"P5058";"ENGR-ENC";0;"N";1;89;12.5;25;0;0;5 -"P5058";"ENGR-ENC";0;"N";1;89;13;21;0;0;5 -"P5058";"ENGR-ENC";0;"N";1;89;13.5;2;0;0;5 -"P5058";"EUTR-GUR";0;"N";0.25;1;32;1;0;1;1 -"P5059";"DICE-LAB";0;"N";2.7;3;42;2;0;1;1 -"P5059";"DICE-LAB";0;"N";2.7;3;46;1;0;1;1 -"P5059";"ENGR-ENC";0;"N";1.3;142;10;10;0;0;5 -"P5059";"ENGR-ENC";0;"N";1.3;142;10.5;16;0;0;5 -"P5059";"ENGR-ENC";0;"N";1.3;142;11;35;0;0;5 -"P5059";"ENGR-ENC";0;"N";1.3;142;11.5;31;0;0;5 -"P5059";"ENGR-ENC";0;"N";1.3;142;12;32;0;0;5 -"P5059";"ENGR-ENC";0;"N";1.3;142;12.5;11;0;0;5 -"P5059";"ENGR-ENC";0;"N";1.3;142;13;6;0;0;5 -"P5059";"ENGR-ENC";0;"N";1.3;142;13.5;1;0;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;17.5;2;0.09;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;18;7;0.34;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;18.5;14;0.72;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;19;23;1.27;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;19.5;24;1.42;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;20;19;1.22;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;20.5;12;0.82;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;21;10;0.74;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;21.5;1;0.09;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;22;4;0.34;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;22.5;2;0.21;0;5 -"P5060";"SARD-PIL";0;"N";7.28;118;23;0;0;0;5 -"P5061";"CLUP-HAR";0;"N";0.5;2;29.5;1;0;0;5 -"P5061";"CLUP-HAR";0;"N";0.5;2;31.5;1;0;0;5 -"P5061";"ENGR-ENC";0;"N";0.85;75;10;5;0;0;5 -"P5061";"ENGR-ENC";0;"N";0.85;75;10.5;8;0;0;5 -"P5061";"ENGR-ENC";0;"N";0.85;75;11;17;0;0;5 -"P5061";"ENGR-ENC";0;"N";0.85;75;11.5;29;0;0;5 -"P5061";"ENGR-ENC";0;"N";0.85;75;12;13;0;0;5 -"P5061";"ENGR-ENC";0;"N";0.85;75;12.5;2;0;0;5 -"P5061";"ENGR-ENC";0;"N";0.85;75;13;1;0;0;5 -"P5061";"LOLI-VUL";0;"N";0.35;1;16;1;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;12;1;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;13;2;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;14;1;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;18;1;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;19;10;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;20;34;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;21;25;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;22;7;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;23;2;0;1;1 -"P5061";"MICR-POU";0;"N";4.6;84;24;1;0;1;1 -"P5061";"SARD-PIL";0;"N";0.3;3;22.5;2;0;0;5 -"P5061";"SARD-PIL";0;"N";0.3;3;23;1;0;0;5 -"P5061";"SCOM-SCO";0;"N";6.25;66;20;2;0;1;1 -"P5061";"SCOM-SCO";0;"N";6.25;66;21;18;0;1;1 -"P5061";"SCOM-SCO";0;"N";6.25;66;22;20;0;1;1 -"P5061";"SCOM-SCO";0;"N";6.25;66;23;8;0;1;1 -"P5061";"SCOM-SCO";0;"N";6.25;66;24;7;0;1;1 -"P5061";"SCOM-SCO";0;"N";6.25;66;25;6;0;1;1 -"P5061";"SCOM-SCO";0;"N";6.25;66;26;1;0;1;1 -"P5061";"SCOM-SCO";0;"N";6.25;66;27;2;0;1;1 -"P5061";"SCOM-SCO";0;"N";6.25;66;29;1;0;1;1 -"P5061";"SCOM-SCO";0;"N";6.25;66;33;1;0;1;1 -"P5063";"ENGR-ENC";0;"N";0.02;1;15;1;0;0;5 -"P5063";"MERL-MCC";0;"N";0.3;1;29;1;0;1;1 -"P5063";"MERL-MNG";0;"N";0.2;2;25;1;0;1;1 -"P5063";"MERL-MNG";0;"N";0.2;2;26;1;0;1;1 -"P5063";"MICR-POU";0;"N";0.19;1;30;1;0;1;1 -"P5063";"MICR-POU";0;"N";0.19;1;32;0;NA;1;1 -"P5063";"SPRA-SPR";0;"N";0.89;72;10.5;1;0;0;5 -"P5063";"SPRA-SPR";0;"N";0.89;72;11;6;0;0;5 -"P5063";"SPRA-SPR";0;"N";0.89;72;11.5;19;0;0;5 -"P5063";"SPRA-SPR";0;"N";0.89;72;12;23;0;0;5 -"P5063";"SPRA-SPR";0;"N";0.89;72;12.5;15;0;0;5 -"P5063";"SPRA-SPR";0;"N";0.89;72;13;5;0;0;5 -"P5063";"SPRA-SPR";0;"N";0.89;72;13.5;1;0;0;5 -"P5063";"SPRA-SPR";0;"N";0.89;72;14;2;0;0;5 -"P5063";"TRAC-TRU";0;"N";0.43;9;15;2;0;1;1 -"P5063";"TRAC-TRU";0;"N";0.43;9;16;2;0;1;1 -"P5063";"TRAC-TRU";0;"N";0.43;9;17;1;0;1;1 -"P5063";"TRAC-TRU";0;"N";0.43;9;18;1;0;1;1 -"P5063";"TRAC-TRU";0;"N";0.43;9;19;1;0;1;1 -"P5063";"TRAC-TRU";0;"N";0.43;9;20;2;0;1;1 Added: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/subsample_all.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,617 +0,0 @@ -"operationID";"baracoudacode";"sizeCategory";"sampleWeight";"numberSampled";"meanLength";"meanWeight";"noPerKg";"sortedWeight" -"P0523";"ALLO-TEZ";"0";0.02;4;0;6;160;0.02 -"P0435";"ALLO-TEZ";"0";0.21;36;6.4;6;166.66;0.03 -"P0385";"ALLO-TEZ";"0";0.03;7;0;5;200;0.03 -"P0443";"ALLO-TEZ";"0";0.66;180;0;4;272.72;0.66 -"P5021";"ALOP-VUL";"0";18.6;NA;0;NA;NA;18.6 -"P0442";"ALOP-VUL";"0";108;1;312;108000;0.00925925925925926;108 -"P0473";"AMMO-TOB";"0";5.14;156;23;33;30.25;5.14 -"P0474";"AMMO-TOB";"0";0.1;2;25.5;52;19.04;0.1 -"P0480";"AMMO-TOB";"0";1;5000;3;0.2;5000;1 -"P0480";"AMMO-TOB";"G";0.44;10;25;42;23.52;0.08 -"P0468";"AMMO-TOB";"0";0.08;2;25;40;25;0.08 -"P0510";"ARGE-SIL";"0";0.14;1;26;140;7.14;0.14 -"P0489";"ARGE-SPH";"0";0.1;2;20;50;20;0.1 -"P0385";"ASPI-OBS";"0";0.16;1;28;160;6.25;0.16 -"P0449";"BELO-BEO";"0";1.82;2;83;910;1.09;1.82 -"P5044";"BELO-BEO";"0";3.5;8;71;438;2.2;3.5 -"P5033";"BELO-BEO";"0";39.6;150;59.28;264;3.78;39.6 -"P0405";"BELO-BEO";"0";0.56;1;74;565;1.76;0.56 -"P0510";"BELO-BEO";"0";1.12;2;76;560;1.78;1.12 -"P0511";"BELO-BEO";"0";2.44;6;68.166;407;2.45;2.44 -"P0410";"BELO-BEO";"0";4.5;7;73.285;643;1.55;4.5 -"P0501";"BELO-BEO";"0";3.02;5;75.6;604;1.65;3.02 -"P0509";"BELO-BEO";"0";6.62;14;71.5;473;2.11;6.62 -"P0505";"BELO-BEO";"0";9.88;17;71.941;581;1.72;9.88 -"P5034";"BELO-BEO";"0";2.4;6;66;400;2.5;2.4 -"P5045";"BELO-BEO";"0";5.2;11;67.909;473;2.11;5.2 -"P0442";"BELO-BEO";"0";12.62;30;67.5;421;2.37;12.62 -"P0494";"BELO-BEO";"0";2.96;5;76.2;592;1.68;2.96 -"P0377";"BOOP-BOO";"0";0.52;3;25.333;173;5.76;0.52 -"P0443";"BOOP-BOO";"0";0.18;1;27;180;5.55;0.18 -"P5016";"BOOP-BOO";"0";2;10;29;200;5;2 -"P5001";"BOOP-BOO";"0";1.4;5;30.6;280;3.57;1.4 -"P0512";"CAPR-APE";"0";1244.57;21099;13.378;59;16.95;302 -"P0384";"CAPR-APE";"0";2.42;113;9.137;21;46.77;0.62 -"P0510";"CAPR-APE";"0";3.66;123;10.576;30;33.71;3.66 -"P0464";"CAPR-APE";"0";18.9;1163;8.732;16;61.53;18.9 -"P0484";"CARI-DAX";"0";2.36;6743;0;0.35000035000035;2857.14;2.36 -"P0410";"CENT-NIR";"0";0.21;1;28;210;4.76;0.21 -"P0480";"CEPO-RUB";"0";0.41;5;49;80;12.5;0.08 -"P0489";"CLUP-HAR";"0";2.08;11;26.909;189;5.28;2.08 -"P0484";"CLUP-HAR";"0";0.28;2;25.25;142;7.01;0.28 -"P5061";"CLUP-HAR";"0";0.5;2;30.5;250;4;0.5 -"P5025";"DICE-LAB";"0";1.5;1;53;1500;0.66;1.5 -"P5042";"DICE-LAB";"0";9.5;9;46;1056;0.94;9.5 -"P5033";"DICE-LAB";"0";13.2;24;36.25;550;1.81;13.2 -"P5059";"DICE-LAB";"0";2.7;2;43.3;900;1.1;2.7 -"P5017";"DICE-LAB";"0";1.2;1;51;1200;0.83;1.2 -"P0442";"DICE-LAB";"0";0.69;1;41;695;1.43;0.69 -"P5051";"DICE-LAB";"0";2.5;1;61;2500;0.4;2.5 -"P5057";"DICE-LAB";"0";37.35;20;56.333;1822;0.54;37.35 -"P5040";"DICE-LAB";"0";1.5;1;52;1500;0.6;1.5 -"P5022";"DICE-LAB";"0";2.1;NA;58;NA;NA;2.1 -"P5045";"DICE-LAB";"0";5.35;1;78;5350;0.18;5.35 -"P5055";"DICE-LAB";"0";10.85;4;63.8;2712;0.3;10.85 -"P5035";"DICE-LAB";"0";10.95;11;45.6;995;1;10.95 -"P5031";"DICE-LAB";"0";3.5;1;71;3500;0.28;3.5 -"P5023";"DICE-PUN";"0";2.1;5;35;420;2.38;2.1 -"P5033";"DICE-PUN";"0";31.8;102;31.647;312;3.2;31.8 -"P5042";"DIPL-SAR";"0";47.6;71;32.96;668;1.49;47.6 -"P0372";"DIVE-RS1";"0";0.75;NA;0;NA;NA;0.75 -"P0474";"DIVE-RS1";"0";0.16;14;0;11;87.5;0.16 -"P0449";"DIVE-RS1";"0";3.34;217;0;15;64.87;3.34 -"P0442";"DIVE-RS1";"0";5.45;27;0;199;5.03;1.39 -"P0444";"DIVE-RS1";"0";1.52;4;0;380;2.63;1.52 -"P0464";"DIVE-RS1";"0";0.09;7;0;14;73.68;0.09 -"P0410";"DIVE-RS1";"0";0.02;2;0;10;100;0.02 -"P0523";"DIVE-RS1";"0";0.49;2;0;245;4.08;0.49 -"P0484";"DIVE-RS1";"0";0.09;3;0;30;33.33;0.09 -"P0493";"DIVE-RS1";"0";0.24;36;0;7;150;0.24 -"P0511";"DIVE-RS1";"0";0.5;55;0;9;108.91;0.5 -"P0383";"DIVE-RS2";"0";2.34;1170;0;2;500;2.34 -"P0464";"DIVE-RS2";"0";0.19;31;0;6;163.15;0.19 -"P0505";"DIVE-RS2";"0";0.18;34;0;5;188.88;0.18 -"P0395";"DIVE-RS2";"0";0.83;291;0;3;350;0.83 -"P0501";"DIVE-RS2";"0";0.39;57;0;7;144.3;0.39 -"P0400";"DIVE-RS2";"0";0.34;104;0;3;305.88;0.34 -"P0494";"DIVE-RS2";"0";27;4355;0;6;161.29;27 -"P0463";"DIVE-RS2";"0";0.73;134;0;6;181.81;0.73 -"P0510";"DIVE-RS2";"0";0.32;43;0;7;134.37;0.32 -"P0500";"DIVE-RS2";"0";0.11;20;0;6;181.81;0.11 -"P0511";"DIVE-RS2";"0";0.05;8;0;7;145.45;0.05 -"P5045";"DIVE-RS2";"0";5;NA;0;NA;NA;5 -"P0495";"DIVE-RS2";"0";6.57;1195;0;6;181.81;2.16 -"P0489";"DIVE-RS3";"0";0.67;13500;0;0.05;20000;0.67 -"P0506";"DIVE-RS3";"0";0.27;NA;NA;NA;NA;0.27 -"P5039";"ENGR-ENC";"0";594.75;35685;13.71;17.0918748219454;58.5073323095039;594.75 -"P5025";"ENGR-ENC";"0";532.5;36927;12.916;14.038978864714;71.2302518321635;532.5 -"P5020";"ENGR-ENC";"0";1002;35836;15.703;26.7425052388511;37.3936544489188;1002 -"P5031";"ENGR-ENC";"0";1500;64789;14.451;20.332360311076;49.1826814349365;1500 -"P0557";"ENGR-ENC";"0";2.01;103;14.1;19;51.4;2.01 -"P0450";"ENGR-ENC";"0";72.2;3944;13.988;18;54.62;72.2 -"P0379";"ENGR-ENC";"0";525.62;32608;13.186;16;62.03;189.6 -"P0405";"ENGR-ENC";"0";31.88;2820;12.077;11;88.45;31.88 -"P0377";"ENGR-ENC";"0";25.6;2572;11.891;10;100.48;25.6 -"P5026";"ENGR-ENC";"0";495;155716;8.284;3.24454974411665;308.209175036784;495 -"P0389";"ENGR-ENC";"0";39.9;2576;13.31;15;64.56;39.9 -"P0500";"ENGR-ENC";"0";1.1;26;17.865;42;23.63;1.1 -"P5023";"ENGR-ENC";"0";302;54167;9.664;5.39335312054347;185.413411221113;302 -"P0454";"ENGR-ENC";"0";116;8864;13.04;13;76.41;116 -"P0506";"ENGR-ENC";"0";0.04;1;17.5;40;25;0.04 -"P0494";"ENGR-ENC";"0";72.49;2048;16.835;35;28.25;72.49 -"P5003";"ENGR-ENC";"0";253.23;9767;15.37;24.9172448865162;40.1328479354129;253.23 -"P5013";"ENGR-ENC";"0";194;8041;15.02;23.094318088314;43.300693970523;194 -"P0378";"ENGR-ENC";"0";41;3426;11.785;12;83.55;41 -"P5036";"ENGR-ENC";"0";257.4;13501;14.027;18.4302812892862;54.2585316145617;257.4 -"P5054";"ENGR-ENC";"0";2009.7;148449;12.546;12.7556702246552;78.3965077795066;2009.7 -"P0404";"ENGR-ENC";"0";68.24;3163;14.647;22;46.34;68.24 -"P0417";"ENGR-ENC";"0";54.51;2385;14.41;23;43.75;10.64 -"P0509";"ENGR-ENC";"0";14.51;425;16.726;34;29.26;14.51 -"P5044";"ENGR-ENC";"0";193.2;8864;14.78;21.8994223848381;45.6633048318362;193.2 -"P0484";"ENGR-ENC";"0";5.97;674;11.513;9.5;108.215;0.35 -"P5058";"ENGR-ENC";"0";19.7;1753;12.31;11.9812560879736;83.4637030255757;19.7 -"P5028";"ENGR-ENC";"0";277.2;11088;15.296;24.5237589597655;40.7767831041169;277.2 -"P5059";"ENGR-ENC";"0";1404;153360;11.43;9.38127013891481;106.595374100983;1404 -"P0455";"ENGR-ENC";"0";191.5;11066;13.748;17;57.78;191.5 -"P0553";"ENGR-ENC";"0";72.2;3651;14.227;20;50.56;72.2 -"P0561";"ENGR-ENC";"0";7.38;356;14.442;21;48.24;7.38 -"P5004";"ENGR-ENC";"0";968;37878;15.627;26.3179914936753;37.996820549179;968 -"P0410";"ENGR-ENC";"0";104;3581;15.992;29;34.43;104 -"P0468";"ENGR-ENC";"0";290.5;19218;13.186;15;66.15;290.5 -"P0385";"ENGR-ENC";"0";2.36;170;12.892;14;72.16;2.36 -"P0489";"ENGR-ENC";"0";1.05;24;17.708;44;22.85;1.05 -"P0384";"ENGR-ENC";"0";982.86;60771;13.456;16;61.83;251.6 -"P0436";"ENGR-ENC";"0";67.23;4233;13.603;16;62.95;33.8 -"P0554";"ENGR-ENC";"0";84.8;4698;13.792;18;55.4;84.8 -"P0474";"ENGR-ENC";"0";263.8;18531;12.671;14;70.24;263.8 -"P0422";"ENGR-ENC";"0";26.24;2742;11.662;10;104.5;26.24 -"P0480";"ENGR-ENC";"0";1036.73;140418;10.724;7;135.44;197.74 -"P5032";"ENGR-ENC";"0";431.2;31108;12.732;13.3900795866821;74.6821550631119;431.2 -"P5019";"ENGR-ENC";"0";995.8;34616;16.26;30.000589870918;33.3326779340889;995.8 -"P5046";"ENGR-ENC";"0";274.95;18887;13.23;15.1964310491955;65.8049246407064;274.95 -"P0535";"ENGR-ENC";"0";493.01;52024;11.494;9;105.52;288.7 -"P5047";"ENGR-ENC";"0";309;132120;15.02;23.094318088314;43.300693970523;309 -"P5048";"ENGR-ENC";"0";708;29285;15.12;23.6053291167872;42.3633152942925;708 -"P0501";"ENGR-ENC";"0";52.96;1848;15.79;29;34.89;52.96 -"P0390";"ENGR-ENC";"0";1137.95;62737;13.746;18;55.13;385.3 -"P0540";"ENGR-ENC";"0";146.5;14074;11.69;10;96.06;146.5 -"P5034";"ENGR-ENC";"0";13.8;924;12.879;13.9067717911802;71.9074142450665;13.8 -"P5012";"ENGR-ENC";"0";566.5;17510;16.647;32.4206897060531;30.8445011215568;566.5 -"P0464";"ENGR-ENC";"0";0.65;20;15.925;32;30.76;0.65 -"P0441";"ENGR-ENC";"0";81.28;6226;12.832;13;76.6;81.28 -"P5052";"ENGR-ENC";"0";20.4;1173;13.81;17.5065080978042;57.1216141113504;20.4 -"P0545";"ENGR-ENC";"0";178.6;11069;13.26;16;61.97;178.6 -"P0435";"ENGR-ENC";"0";2632.73;355907;10.698;7;135.18;366 -"P0372";"ENGR-ENC";"0";16.03;941;13.696;17;58.66;16.03 -"P0511";"ENGR-ENC";"0";0.53;15;17.066;35;28.3;0.53 -"P0463";"ENGR-ENC";"0";117.1;5545;14.734;21;47.35;117.1 -"P0460";"ENGR-ENC";"0";274.5;19151;13.063;14;69.76;274.5 -"P5038";"ENGR-ENC";"0";74.8;5400;12.655;13.1248437358907;76.1913833126589;74.8 -"P0444";"ENGR-ENC";"0";92.8;7810;12.215;12;84.16;92.8 -"P0550";"ENGR-ENC";"0";10.92;521;14.339;21;47.74;10.92 -"P5027";"ENGR-ENC";"0";304;12261;15.342;24.7678449250799;40.3749297940492;304 -"P0523";"ENGR-ENC";"0";374.1;55787;10.241;7;149.12;374.1 -"P0396";"ENGR-ENC";"0";19.62;850;14.865;23;43.33;19.62 -"P0449";"ENGR-ENC";"0";1.13;46;15.467;25;40.7;1.13 -"P5002";"ENGR-ENC";"0";531;23292;14.849;22.2384313750841;44.96720038988;531 -"P5008";"ENGR-ENC";"0";293;8992;16.432;31.0600494343728;32.195698919054;293 -"P5045";"ENGR-ENC";"0";66.1;1658;17.5;38.2296036786385;26.1577391281921;66.1 -"P5029";"ENGR-ENC";"0";908.7;44461;14.478;20.4579232534063;48.8808168655876;908.7 -"P5061";"ENGR-ENC";"0";33.55;2960;11.31;9.06032913264554;110.371266359063;33.55 -"P0399";"ENGR-ENC";"0";29.9;1379;14.713;22;46.12;29.9 -"P5063";"ENGR-ENC";"0";0.04;2;15;22.9930491550666;43.4914044351376;0.04 -"P5007";"ENGR-ENC";"0";8.9;1176;13.181;15.0115875356761;66.6152062613918;8.9 -"P0442";"ENGR-ENC";"0";1193.31;91892;12.322;13;77;304.1 -"P5050";"ENGR-ENC";"0";143.5;6059;15.269;24.3812745094879;41.0150830962858;143.5 -"P0542";"ENGR-ENC";"0";148.2;14644;11.542;10;98.8;148.2 -"P5018";"ENGR-ENC";"0";510;13826;16.927;34.2542439188082;29.1934629288643;510 -"P0443";"ENGR-ENC";"0";37.7;3002;12.52;13;79.62;37.7 -"P0505";"ENGR-ENC";"0";103.1;2856;17.095;36;27.69;103.1 -"P5040";"ENGR-ENC";"0";1383.2;112192;12.62;13.0055012871638;76.8905386974189;1383.2 -"P5041";"ENGR-ENC";"0";967.05;60601;13.47;16.1247522812747;62.016456597679;967.05 -"P0409";"ENGR-ENC";"0";39;1502;15.423;26;38.51;39 -"P5033";"ENGR-ENC";"0";16.8;1663;12.045;11.1514242303072;89.674644184212;16.8 -"P0479";"ENGR-ENC";"0";79.6;6895;12.161;12;86.62;79.6 -"P0423";"ENGR-ENC";"0";3148.8;269898;12.33;12;85.71;403.7 -"P5056";"ENGR-ENC";"0";1483.9;95882;13.29;15.4249227662138;64.8301463259426;1483.9 -"P5057";"ENGR-ENC";"0";532.5;38922;12.467;12.4926703471449;80.0469373010026;532.5 -"P0493";"ENGR-ENC";"0";0.04;3;13.333;16;61.22;0.04 -"P0559";"ENGR-ENC";"0";2.86;149;13.883;19;51.94;2.86 -"P0563";"ENGR-ENC";"0";243.3;13188;13.833;18;54.2;243.3 -"P5015";"ENGR-ENC";"0";18.1;1034;14.345;19.844599330115;50.3915439845871;18.1 -"P0461";"ENGR-ENC";"0";59;3016;14.17;20;51.12;59 -"P0429";"ENGR-ENC";"0";82.6;4198;14.152;20;50.82;82.6 -"P5005";"ENGR-ENC";"0";243.5;7568;16.03;28.6235720658451;34.9362405817003;243.5 -"P5030";"ENGR-ENC";"0";559;146738;9.076;4.38472307740054;228.064573827738;559 -"P5043";"ENGR-ENC";"0";149.1;9404;13.48;16.1642681529091;61.8648484756812;149.1 -"P5014";"ENGR-ENC";"0";394.5;12657;16.324;30.3918161824195;32.9035946386929;394.5 -"P5016";"ENGR-ENC";"0";41;2184;13.995;18.2919711689167;54.6687937984117;41 -"P0473";"ENGR-ENC";"0";0.57;46;12.521;12;80;0.57 -"P5011";"ENGR-ENC";"0";684.2;49138;15.139;23.7033039489267;42.1882114896172;684.2 -"P5037";"ENGR-ENC";"0";262.3;20299;12.69;13.2449471547651;75.5004899842304;262.3 -"P0430";"ENGR-ENC";"0";128.32;7292;13.936;18;56.82;68.7 -"P0379";"EUTR-GUR";"0";0.94;8;25.333;113;8.82;0.34 -"P0390";"EUTR-GUR";"G";0.73;1;46;735;1.36;0.73 -"P0430";"EUTR-GUR";"0";1.83;9;29.8;196;5.1;0.98 -"P0399";"EUTR-GUR";"0";0.1;1;24;100;10;0.1 -"P0441";"EUTR-GUR";"0";0.49;5;24.2;98;10.2;0.49 -"P0390";"EUTR-GUR";"0";1.55;21;21.571;75;13.33;0.52 -"P5058";"EUTR-GUR";"0";0.25;1;32;270.415515011242;3.69801266749959;0.25 -"P0454";"EUTR-GUR";"0";0.96;5;29.4;193;5.18;0.96 -"P0436";"EUTR-GUR";"0";0.78;4;30;198;5.06;0.39 -"P0385";"GALE-GAL";"0";2.76;2;65.5;1380;0.72;2.76 -"P0443";"HYPE-LAN";"0";0.03;1;26;35;28.57;0.03 -"P0377";"ILLE-COI";"0";0.29;1;18;295;3.38;0.29 -"P0430";"ILLE-COI";"0";0.07;4;8;20;50;0.04 -"P0460";"ILLE-COI";"0";0.25;3;9.666;85;11.76;0.25 -"P0444";"ILLE-COI";"0";0.05;4;7.5;14;72.72;0.05 -"P0479";"ILLE-COI";"0";0.9;1;31;900;1.11;0.9 -"P0468";"ILLE-COI";"0";0.02;2;16;12;80;0.02 -"P0489";"ILLE-COI";"0";0.28;1;20;280;3.57;0.28 -"P5023";"LIZA-RAM";"0";12.3;24;39.791;512;1.95;12.3 -"P5007";"LIZA-RAM";"0";5;11;38.181;455;2.2;5 -"P5026";"LIZA-RAM";"0";8.7;6;51.166;1450;0.68;8.7 -"P5030";"LIZA-RAM";"0";26;65;38;400;2.5;26 -"P5033";"LIZA-RAM";"0";9;12;43;750;1.33;9 -"P5061";"LOLI-VUL";"0";0.35;1;16;350;2.8;0.35 -"P0372";"LOPH-BUD";"0";0.004;2;5.5;2;500;0.004 -"P0400";"LOPH-BUD";"0";0.02;3;7;8;120;0.02 -"P0410";"LOPH-BUD";"0";0.01;3;7;5;187.5;0.01 -"P0511";"LOPH-PIS";"0";0.03;1;12;30;33.33;0.03 -"P0554";"MERL-MCC";"0";1.61;11;27;146;6.83;1.61 -"P0422";"MERL-MCC";"0";0.12;1;25;120;8.33;0.12 -"P0553";"MERL-MCC";"0";1.75;20;23.1;88;11.39;1.75 -"P0389";"MERL-MCC";"0";1.01;9;24.555;113;8.86;1.01 -"P0417";"MERL-MCC";"0";4.27;15;33;278;3.59;0.83 -"P0489";"MERL-MCC";"0";10.26;16;43.5;641;1.55;10.26 -"P0523";"MERL-MCC";"0";0.11;1;25;115;8.69;0.11 -"P0485";"MERL-MCC";"0";65.52;47;59.106;1394;0.71;65.52 -"P0461";"MERL-MCC";"0";1.18;3;35.333;393;2.54;1.18 -"P0474";"MERL-MCC";"0";3.58;38;23.368;94;10.61;3.58 -"P0545";"MERL-MCC";"0";3.46;25;26.04;138;7.22;3.46 -"P0463";"MERL-MCC";"0";3.94;8;38.75;492;2.03;3.94 -"P0430";"MERL-MCC";"G";7.08;10;43.2;708;1.41;7.08 -"P0550";"MERL-MCC";"0";0.18;1;29;180;5.55;0.18 -"P0384";"MERL-MCC";"0";1.87;20;22;96;10.41;0.48 -"P0493";"MERL-MCC";"0";0.1;1;26;100;10;0.1 -"P0480";"MERL-MCC";"0";10.74;105;23.8;102;9.75;2.05 -"P0455";"MERL-MCC";"0";1.12;2;39.5;560;1.78;1.12 -"P5013";"MERL-MCC";"0";99.2;185;39.274;537;1.86;99.2 -"P0396";"MERL-MCC";"0";12.16;81;24.407;150;6.66;12.16 -"P0378";"MERL-MCC";"0";5.98;58;23.396;103;9.69;5.98 -"P0479";"MERL-MCC";"0";0.8;6;26.666;134;7.45;0.8 -"P0436";"MERL-MCC";"0";3.21;18;28.888;179;5.57;1.61 -"P5009";"MERL-MCC";"0";1.6;4;40.25;400;2.5;1.6 -"P0484";"MERL-MCC";"0";23.74;106;27.264;224;4.46;23.74 -"P0512";"MERL-MCC";"0";2.9;3;49.333;967;1.03;2.9 -"P0390";"MERL-MCC";"0";1.03;12;22.75;88;11.42;0.35 -"P0430";"MERL-MCC";"0";2.57;13;29.285;197;5.07;1.38 -"P0454";"MERL-MCC";"0";0.56;4;26.25;140;7.14;0.56 -"P0379";"MERL-MCC";"0";7.04;36;28.769;195;5.11;2.54 -"P0535";"MERL-MCC";"0";1.05;10;23.833;103;9.67;0.62 -"P5007";"MERL-MCC";"0";2.9;3;51;967;1.03;2.9 -"P0377";"MERL-MCC";"0";17.2;50;33.42;344;2.9;17.2 -"P5016";"MERL-MCC";"0";9;25;34.8;360;2.77;9 -"P0404";"MERL-MCC";"0";0.96;5;29.4;192;5.2;0.96 -"P0510";"MERL-MCC";"0";5.38;4;56;1345;0.74;5.38 -"P0506";"MERL-MCC";"0";0.8;5;29.4;160;6.25;0.8 -"P0399";"MERL-MCC";"0";9.2;52;27.173;177;5.65;9.2 -"P5015";"MERL-MCC";"0";35.6;157;26.77;227;4.41;35.6 -"P0500";"MERL-MCC";"0";21.52;35;43.4;615;1.62;21.52 -"P5063";"MERL-MCC";"0";0.6;3;29;300;3.33;0.6 -"P0464";"MERL-MCC";"0";1.63;4;39.25;409;2.44;1.63 -"P0441";"MERL-MCC";"0";0.63;5;26.2;126;7.93;0.63 -"P0409";"MERL-MCC";"0";0.48;2;33.5;240;4.16;0.48 -"P0385";"MERL-MCC";"0";2.73;48;19.625;57;17.58;2.73 -"P0417";"MERL-MCC";"G";6.9;12;41.416;575;1.73;6.9 -"P0460";"MERL-MCC";"0";1.02;10;24.1;102;9.75;1.02 -"P0429";"MERL-MCC";"0";3.26;7;36.571;466;2.14;3.26 -"P0450";"MERL-MCC";"0";1.64;16;23.875;102;9.75;1.64 -"P5027";"MERL-MCC";"0";2.2;3;41;733;1.36;2.2 -"P0384";"MERL-MCC";"G";4.3;8;40.625;538;1.86;4.3 -"P0423";"MERL-MCC";"0";0.46;1;40;460;2.17;0.46 -"P0480";"MERL-MNG";"0";1.12;10;23.5;108;9.3;0.21 -"P0443";"MERL-MNG";"0";2.05;16;25.187;128;7.78;2.05 -"P5063";"MERL-MNG";"0";0.4;4;25.5;100;10;0.4 -"P0535";"MERL-MNG";"0";0.39;2;31;230;4.34;0.23 -"P0485";"MICR-POU";"0";0.21;2;26;108;9.3;0.21 -"P0377";"MICR-POU";"0";0.58;14;19.285;41;24.13;0.58 -"P0454";"MICR-POU";"0";0.46;7;22.142;66;15.21;0.46 -"P0480";"MICR-POU";"0";1.73;26;20.8;66;15.15;0.33 -"P0500";"MICR-POU";"0";0.53;9;21.333;59;16.98;0.53 -"P0489";"MICR-POU";"0";308.8;5597;21.109;55;18.12;308.8 -"P0474";"MICR-POU";"0";0.05;1;23;55;18.18;0.05 -"P0455";"MICR-POU";"0";0.28;6;20.166;47;21.42;0.28 -"P0554";"MICR-POU";"0";0.14;1;27;140;7.14;0.14 -"P0510";"MICR-POU";"0";0.62;11;20.363;56;17.74;0.62 -"P0395";"MICR-POU";"0";1.17;1898;4.18;1;1612.9;1.17 -"P0383";"MICR-POU";"0";23.31;34281;4.5;1;1470.58;23.31 -"P0545";"MICR-POU";"0";0.1;1;25;105;9.52;0.1 -"P0396";"MICR-POU";"0";0.2;1;31;200;5;0.2 -"P0493";"MICR-POU";"0";0.42;8;20.375;52;19.04;0.42 -"P5063";"MICR-POU";"0";0.38;2;30;156.353935643066;6.39574562601903;0.38 -"P0444";"MICR-POU";"0";0.2;3;21.666;68;14.63;0.2 -"P0460";"MICR-POU";"0";0.37;6;21.166;62;16;0.37 -"P0449";"MICR-POU";"0";0.001;1;5;1;1000;0.001 -"P0506";"MICR-POU";"0";0.16;3;20;53;18.75;0.16 -"P0553";"MICR-POU";"0";0.23;1;32;235;4.25;0.23 -"P0484";"MICR-POU";"0";32.06;462;21.686;69;14.4;32.06 -"P0479";"MICR-POU";"0";2.5;90;13.9;28;36;2.5 -"P0430";"MICR-POU";"0";0.67;15;20.375;45;22.22;0.36 -"P0378";"MICR-POU";"0";0.19;1;31;195;5.12;0.19 -"P0450";"MICR-POU";"0";1.03;11;24.181;94;10.67;1.03 -"P5061";"MICR-POU";"0";4.6;84;20.1;45.1378507422727;22.1543556805525;4.6 -"P0389";"MOLA-MOL";"0";21.32;5;40.4;4264;0.23;21.32 -"P0500";"MOLA-MOL";"0";33.88;4;49.5;8470;0.11;33.88 -"P0372";"MOLA-MOL";"0";12.12;3;39.666;4040;0.24;12.12 -"P5001";"MOLA-MOL";"0";17.7;5;38.8;3756.68251535955;0.266192310878389;17.7 -"P0404";"MOLA-MOL";"0";4.06;1;41;4060;0.24;4.06 -"P0436";"MOLA-MOL";"0";4;1;39;4000;0.25;4 -"P0405";"MOLA-MOL";"0";4.16;1;41;4160;0.24;4.16 -"P0390";"MOLA-MOL";"0";6.66;2;38.5;3330;0.3;6.66 -"P0495";"MOLA-MOL";"0";7.4;1;47;7400;0.13;7.4 -"P0559";"MOLA-MOL";"0";6.36;1;49;6360;0.15;6.36 -"P5039";"MOLA-MOL";"0";4.1;1;40;4092.57348681261;0.24434503209833;4.1 -"P0509";"MOLA-MOL";"0";9.2;1;55;9200;0.1;9.2 -"P5044";"MOLA-MOL";"0";5.75;2;35.5;2925.96414213706;0.341767687990059;5.75 -"P0400";"MOLA-MOL";"0";4.76;1;42;4760;0.21;4.76 -"P0473";"MOLA-MOL";"0";25.02;3;50.333;8340;0.11;25.02 -"P0494";"MOLA-MOL";"0";8.1;2;38;4050;0.24;8.1 -"P0399";"MOLA-MOL";"0";8.86;2;42;4430;0.22;8.86 -"P0383";"MOLA-MOL";"0";4.92;1;42;4920;0.2;4.92 -"P0410";"MOLA-MOL";"0";3.66;1;38;3660;0.27;3.66 -"P5011";"MOLA-MOL";"0";5.7;1;45;5699.20924128333;0.175462938394384;5.7 -"P0395";"MOLA-MOL";"0";5.02;1;43;5020;0.19;5.02 -"P5028";"MOLA-MOL";"0";20;4;40.75;4312.00292082176;0.231910789107124;20 -"P0390";"MUST-AST";"0";2.62;2;67.5;1310;0.76;2.62 -"P0489";"MYCT-OPX";"0";0.004;3;5;1;750;0.004 -"P0479";"MYCT-OPX";"0";0.004;5;0;1;1250;0.004 -"P0383";"MYCT-OPX";"0";0.09;97;5;1;1000;0.09 -"P0395";"MYCT-OPX";"0";3.6;2687;5;1;746.26;3.6 -"P5010";"MYCT-OPX";"0";2.3;NA;NA;NA;NA;2.3 -"P0510";"MYCT-OPX";"0";0.01;9;5.111;1;900;0.01 -"P0485";"PETR-MAR";"0";0.08;1;34;85;11.76;0.08 -"P0389";"POLL-POL";"0";3.14;1;83;3140;0.31;3.14 -"P0505";"PRIO-GLA";"0";15.72;1;158;15720;0.06;15.72 -"P5022";"PRIO-GLA";"0";10;1;143;10000;0.1;10 -"P0509";"PRIO-GLA";"0";5;1;114;5000;0.2;5 -"P0545";"SARD-PIL";"0";1.57;22;20.59;72;13.96;1.57 -"P0449";"SARD-PIL";"0";18.66;301;20.021;62;16.12;18.66 -"P5036";"SARD-PIL";"0";58.05;1066;18.8;51.6668301395515;19.3547774713295;58.05 -"P0389";"SARD-PIL";"0";17.9;266;20.305;67;14.87;17.9 -"P0422";"SARD-PIL";"0";0.83;26;16.134;32;31.13;0.83 -"P0405";"SARD-PIL";"0";5.66;173;16.335;33;30.59;5.66 -"P5025";"SARD-PIL";"0";2445;57791;17.615;42.6207340097964;23.4627587542286;2445 -"P0553";"SARD-PIL";"0";0.18;2;22.5;90;11.11;0.18 -"P0390";"SARD-PIL";"0";17.72;310;19.171;57;17.5;6 -"P0443";"SARD-PIL";"0";96.8;2112;17.779;46;21.82;96.8 -"P5053";"SARD-PIL";"0";781.25;15719;18.175;46.752271864791;21.3893348946128;781.25 -"P5034";"SARD-PIL";"0";1410;30887;17.941;44.9950927627379;22.2246458135572;1410 -"P0494";"SARD-PIL";"0";168.1;2552;20.265;66;15.18;168.1 -"P5023";"SARD-PIL";"0";408;5537;17.561;42.235626207777;23.6766940563525;408 -"P5031";"SARD-PIL";"0";45;675;20.666;68.3459627281601;14.6314421522952;45 -"P0436";"SARD-PIL";"0";565.9;8790;20.162;64;15.53;284.5 -"P0417";"SARD-PIL";"0";325.84;4708;20.574;69;14.44;63.6 -"P0489";"SARD-PIL";"0";0.25;3;23.333;83;12;0.25 -"P5028";"SARD-PIL";"0";23.4;282;22.031;82.5720810525841;12.1106309451396;23.4 -"P5052";"SARD-PIL";"0";973.25;17147;19.24;55.324147959281;18.0752896680127;973.25 -"P0441";"SARD-PIL";"0";0.31;8;17.5;39;25.39;0.31 -"P0455";"SARD-PIL";"0";17.6;277;20.608;64;15.72;17.6 -"P5042";"SARD-PIL";"0";2562.15;48023;18.941;52.820836903648;18.9319226771081;2562.15 -"P5048";"SARD-PIL";"0";557;8895;20.03;62.3130842556756;16.0479939637865;557 -"P0378";"SARD-PIL";"0";39;632;20.054;62;16.2;39 -"P5050";"SARD-PIL";"0";955.5;14626;20.434;66.1024964624812;15.1280216862548;955.5 -"P0559";"SARD-PIL";"0";2.93;40;20.462;73;13.62;2.93 -"P0493";"SARD-PIL";"0";0.07;1;20.5;70;14.28;0.07 -"P0377";"SARD-PIL";"0";0.86;14;20.571;61;16.27;0.86 -"P0460";"SARD-PIL";"0";0.13;3;18.166;45;22.22;0.13 -"P0379";"SARD-PIL";"0";26.05;363;20.885;72;13.92;9.4 -"P0429";"SARD-PIL";"0";53;770;20.462;69;14.53;53 -"P0396";"SARD-PIL";"0";0.43;8;18.937;54;18.6;0.43 -"P0561";"SARD-PIL";"0";33.98;453;21;75;13.32;33.98 -"P5029";"SARD-PIL";"0";19.5;286;20.681;68.4927232521737;14.6000911121352;19.5 -"P5021";"SARD-PIL";"0";1050;21252;18.61;50.1383488919737;19.9448131440181;1050 -"P5055";"SARD-PIL";"0";654;11565;19.32;56.0069864984517;17.8549152975343;654 -"P5026";"SARD-PIL";"0";2293.5;109228;13.919;21.2453153579023;47.0692001108868;2293.5 -"P0404";"SARD-PIL";"0";0.05;1;19;50;20;0.05 -"P0399";"SARD-PIL";"0";70.1;977;20.919;72;13.93;70.1 -"P5011";"SARD-PIL";"0";6.6;121;19.318;55.9898479375051;17.8603807089489;6.6 -"P0385";"SARD-PIL";"0";1.78;23;21.239;77;12.92;1.78 -"P0384";"SARD-PIL";"0";19.14;277;20.859;69;14.48;4.9 -"P5015";"SARD-PIL";"0";10;155;20.455;66.3035323173344;15.0821527156941;10 -"P5060";"SARD-PIL";"0";399.3;6468;19.622;58.6349422299656;17.0546769889874;399.3 -"P0505";"SARD-PIL";"0";77.9;1056;21.166;74;13.55;77.9 -"P0500";"SARD-PIL";"0";1.71;27;20.222;63;15.78;1.71 -"P5030";"SARD-PIL";"0";331.5;15691;13.552;19.6316139068487;50.9382470919083;331.5 -"P5013";"SARD-PIL";"0";92.8;1777;20.25;64.3582637963558;15.5380201548666;92.8 -"P5016";"SARD-PIL";"0";1510.5;26360;19.483;57.415480066726;17.4169056644278;1510.5 -"P0450";"SARD-PIL";"0";1.59;26;19.884;61;16.35;1.59 -"P5007";"SARD-PIL";"0";53.6;1790;15.853;31.210884950826;32.0401040078017;53.6 -"P0423";"SARD-PIL";"0";115.43;2480;17.954;47;21.48;14.8 -"P5017";"SARD-PIL";"0";638.4;12502;18.471;49.0393058428137;20.3918057732161;638.4 -"P5051";"SARD-PIL";"0";1264;17831;20.298;64.8103074080706;15.4296444499733;1264 -"P0509";"SARD-PIL";"0";82.4;1712;18.232;48;20.77;82.4 -"P0430";"SARD-PIL";"0";5.67;84;20.333;68;14.8;3.04 -"P5035";"SARD-PIL";"0";1607.25;33567;18.19;46.8664343363724;21.3372323745123;1607.25 -"P5046";"SARD-PIL";"0";5.85;102;19.32;56.0069864984517;17.8549152975343;5.85 -"P5033";"SARD-PIL";"0";85.8;1244;20.953;71.1902747531818;14.0468624888304;85.8 -"P0463";"SARD-PIL";"0";0.12;3;17.5;42;24;0.12 -"P0557";"SARD-PIL";"0";5.56;72;21.263;77;12.93;5.56 -"P5038";"SARD-PIL";"0";794.2;19962;17.059;38.7651920973024;25.7963380521875;794.2 -"P0550";"SARD-PIL";"0";1.38;17;22.205;81;12.27;1.38 -"P0473";"SARD-PIL";"0";77.2;1312;19.644;59;16.99;77.2 -"P0484";"SARD-PIL";"0";0.3;4;22;75;13.33;0.3 -"P5012";"SARD-PIL";"0";45;579;21.104;72.7177083933358;13.7518084947194;45 -"P0409";"SARD-PIL";"0";34.2;492;20.83;70;14.38;34.2 -"P5006";"SARD-PIL";"0";1025;20686;18.657;50.5136217682042;19.7966402921726;1025 -"P0511";"SARD-PIL";"0";89;1251;20.951;71;14.05;89 -"P5061";"SARD-PIL";"0";0.3;3;22.67;89.8551397587927;11.1290239232213;0.3 -"P0385";"SARD-SAR";"0";1.44;1;53;1440;0.69;1.44 -"P0399";"SARD-SAR";"0";5.2;1;76;5200;0.19;5.2 -"P5007";"SARD-SAR";"0";7.5;10;42.3;750;1.33;7.5 -"P5001";"SARD-SAR";"0";6.6;5;50.8;1320;0.75;6.6 -"P0494";"SCOM-JAP";"0";7.3;81;21.392;90;11.15;7.3 -"P0423";"SCOM-JAP";"0";7.25;101;20.769;72;13.97;0.93 -"P0422";"SCOM-JAP";"0";0.22;1;31;220;4.54;0.22 -"P0404";"SCOM-JAP";"0";0.24;1;32;240;4.16;0.24 -"P0545";"SCOM-JAP";"0";1.78;21;21.333;85;11.76;1.78 -"P0390";"SCOM-JAP";"0";10.98;145;20.346;76;13.17;3.72 -"P0396";"SCOM-JAP";"0";7.94;24;32.375;331;3.02;7.94 -"P0561";"SCOM-JAP";"0";0.17;2;21.5;85;11.76;0.17 -"P0473";"SCOM-JAP";"0";0.08;1;21;85;11.76;0.08 -"P0409";"SCOM-JAP";"0";2.99;40;20.775;75;13.37;2.99 -"P5011";"SCOM-JAP";"0";38.5;605;19.981;61.0899196542291;16.3693127386651;38.5 -"P5018";"SCOM-JAP";"0";0.3;3;22;82.9280555183539;12.0586452166201;0.3 -"P0554";"SCOM-JAP";"0";0.91;11;21.181;83;12.08;0.91 -"P5012";"SCOM-JAP";"0";1.5;15;23;95.4981944170947;10.4714021673796;1.5 -"P5008";"SCOM-JAP";"0";0.5;1;38;470.240531501175;2.12657126089843;0.5 -"P0379";"SCOM-JAP";"0";24.61;252;22.296;98;10.24;8.88 -"P5004";"SCOM-JAP";"0";11;120;22.25;85.9571922610683;11.63369781743;11 -"P0435";"SCOM-JAP";"0";0.43;14;15.5;30;33.33;0.06 -"P5013";"SCOM-JAP";"0";11.2;144;20.805;69.4531935816964;14.39818600744;11.2 -"P0378";"SCOM-JAP";"0";0.18;2;22.5;92;10.81;0.18 -"P0563";"SCOM-JAP";"0";0.16;1;26;165;6.06;0.16 -"P0410";"SCOM-JAP";"0";1.64;17;22.352;96;10.36;1.64 -"P5017";"SCOM-JAP";"0";12;57;29.684;214.667790434392;4.65836070691577;12 -"P5044";"SCOM-JAP";"0";6.9;13;37.9;466.322792718637;2.14443732027348;6.9 -"P5050";"SCOM-JAP";"0";8.5;60;25.833;138.090536015967;7.24162588437179;8.5 -"P0436";"SCOM-JAP";"0";86.12;354;30.844;244;4.1;43.3 -"P0384";"SCOM-JAP";"0";115.94;1395;21.011;83;12.03;29.68 -"P0464";"SCOM-JAP";"0";0.29;1;33;290;3.44;0.29 -"P5029";"SCOM-JAP";"0";9.1;143;19.909;60.3937350530295;16.5580088584013;9.1 -"P0429";"SCOM-JAP";"0";33.6;331;22.423;102;9.85;33.6 -"P0441";"SCOM-JAP";"0";47.8;157;33.108;305;3.28;47.8 -"P0455";"SCOM-JAP";"0";1.21;5;27.6;242;4.13;1.21 -"P0559";"SCOM-JAP";"0";0.21;2;23;108;9.3;0.21 -"P0553";"SCOM-JAP";"0";3.72;36;22.694;103;9.67;3.72 -"P0405";"SCOM-JAP";"0";9.28;41;30.195;226;4.41;9.28 -"P0399";"SCOM-JAP";"0";0.38;6;19.666;63;15.78;0.38 -"P0430";"SCOM-JAP";"0";0.67;7;21.75;90;11.11;0.36 -"P0377";"SCOM-JAP";"0";40.2;129;33.26;310;3.22;40.2 -"P5027";"SCOM-JAP";"0";11;170;20.764;69.0195631769244;14.4886457399999;11 -"P0500";"SCOM-JAP";"0";15.62;113;24.826;139;7.21;15.62 -"P0550";"SCOM-JAP";"0";14.64;180;21.313;81;12.28;14.64 -"P0557";"SCOM-JAP";"0";4.1;15;29.466;273;3.65;4.1 -"P5035";"SCOM-JAP";"0";65.25;420;25.6;134.174725152547;7.45296849956706;65.25 -"P0509";"SCOM-JAP";"0";0.27;2;24.5;135;7.4;0.27 -"P5014";"SCOM-JAP";"0";2;14;23.928;108.277179044146;9.23555645638205;2 -"P0501";"SCOM-JAP";"0";0.09;1;23;90;11.11;0.09 -"P0417";"SCOM-JAP";"0";383.74;3667;22.763;105;9.55;74.9 -"P0390";"SCOM-SCO";"0";4.43;18;32.5;250;4;1.5 -"P0377";"SCOM-SCO";"0";36.07;102;36.333;354;2.82;36.07 -"P0429";"SCOM-SCO";"0";126.5;1026;24.705;123;8.11;126.5 -"P0480";"SCOM-SCO";"0";1.2;16;23.666;77;13.04;0.23 -"P0443";"SCOM-SCO";"0";3.02;13;31.23;232;4.3;3.02 -"P0505";"SCOM-SCO";"0";27.5;155;28.295;178;5.62;27.5 -"P0379";"SCOM-SCO";"0";262.81;686;36.673;383;2.61;94.8 -"P0509";"SCOM-SCO";"0";15.68;131;24.112;119;8.37;15.68 -"P0542";"SCOM-SCO";"0";0.25;2;25.5;125;8;0.25 -"P0559";"SCOM-SCO";"0";0.33;5;17;67;14.92;0.33 -"P0422";"SCOM-SCO";"0";2.75;7;36.428;394;2.54;2.75 -"P5045";"SCOM-SCO";"0";0.6;1;40;462.97650045879;2.15993684130629;0.6 -"P5018";"SCOM-SCO";"0";7.3;33;36.06;340.294659514817;2.9386297199779;7.3 -"P0474";"SCOM-SCO";"0";8.12;36;30.444;226;4.43;8.12 -"P5024";"SCOM-SCO";"0";2.2;6;35.5;324.843503784319;3.07840541168388;2.2 -"P0396";"SCOM-SCO";"0";1.46;5;34.4;292;3.42;1.46 -"P5013";"SCOM-SCO";"0";8;28;32.571;251.561486829118;3.97517128955151;8 -"P0385";"SCOM-SCO";"0";1.09;4;32.75;272;3.66;1.09 -"P0489";"SCOM-SCO";"0";9.22;61;25.852;151;6.61;9.22 -"P0384";"SCOM-SCO";"0";30.93;102;34.384;305;3.28;7.92 -"P5027";"SCOM-SCO";"0";4;40;22.25;81.1488225462803;12.3230377055648;4 -"P5035";"SCOM-SCO";"0";16.5;60;33;261.526774116694;3.82370028222731;16.5 -"P5014";"SCOM-SCO";"0";1.4;3;38;397.577484289197;2.51523297851697;1.4 -"P0378";"SCOM-SCO";"0";9.72;32;34.468;304;3.29;9.72 -"P0430";"SCOM-SCO";"0";12.51;47;32.6;268;3.73;6.7 -"P5004";"SCOM-SCO";"0";13;90;23.222;92.1327794138501;10.8539002769917;13 -"P0461";"SCOM-SCO";"0";4.78;18;32.444;266;3.76;4.78 -"P0501";"SCOM-SCO";"0";11.01;44;30.863;250;3.99;11.01 -"P0399";"SCOM-SCO";"0";0.49;1;37;495;2.02;0.49 -"P0383";"SCOM-SCO";"0";0.58;780;4.5;1;1333.33;0.58 -"P0510";"SCOM-SCO";"0";0.33;1;36;330;3.03;0.33 -"P0554";"SCOM-SCO";"0";0.14;15;11.333;10;103.44;0.14 -"P0455";"SCOM-SCO";"0";1.86;6;34.666;310;3.22;1.86 -"P0404";"SCOM-SCO";"0";1.94;6;34.5;323;3.09;1.94 -"P0484";"SCOM-SCO";"0";2.6;29;22.551;90;11.15;2.6 -"P0557";"SCOM-SCO";"0";1.34;12;23.5;112;8.95;1.34 -"P0494";"SCOM-SCO";"0";1.91;11;28;174;5.75;1.91 -"P5017";"SCOM-SCO";"0";1.8;6;34;285.764535765068;3.49938454512115;1.8 -"P5008";"SCOM-SCO";"0";2.4;6;36.5;352.771048236213;2.83469974364338;2.4 -"P0563";"SCOM-SCO";"0";0.89;6;25.833;148;6.74;0.89 -"P5012";"SCOM-SCO";"0";1.5;15;24;101.602511764071;9.84227636342373;1.5 -"P0511";"SCOM-SCO";"0";3.18;32;23.312;99;10.06;3.18 -"P0410";"SCOM-SCO";"0";1.86;20;22.45;93;10.75;1.86 -"P0523";"SCOM-SCO";"0";0.01;2;8.5;5;200;0.01 -"P0561";"SCOM-SCO";"0";0.14;1;27;140;7.14;0.14 -"P5061";"SCOM-SCO";"0";11.5;121;22.8;87.2503701258992;11.4612694313736;11.5 -"P0550";"SCOM-SCO";"0";1.24;9;26.333;138;7.25;1.24 -"P0506";"SCOM-SCO";"0";0.49;2;31.5;248;4.04;0.49 -"P0545";"SCOM-SCO";"0";0.71;3;30;238;4.19;0.71 -"P0493";"SCOM-SCO";"0";4.62;18;32.111;257;3.89;4.62 -"P0372";"SCOM-SCO";"0";0.06;1;22;65;15.38;0.06 -"P0500";"SCOM-SCO";"0";68.52;182;36.258;376;2.66;68.52 -"P0409";"SCOM-SCO";"0";352.7;1430;30.698;247;4.05;352.7 -"P0449";"SCOM-SCO";"0";0.2;2;23.5;100;10;0.2 -"P0405";"SCOM-SCO";"0";0.48;1;37;480;2.08;0.48 -"P0512";"SCOM-SCO";"0";8.24;37;30.135;223;4.49;8.24 -"P0553";"SCOM-SCO";"0";0.65;8;19.25;81;12.3;0.65 -"P0395";"SCOM-SCO";"0";0.09;83;5;1;923.07;0.09 -"P5029";"SCOM-SCO";"0";58.5;273;29.809;193.369776166642;5.17143899022885;58.5 -"P0404";"SCYL-CAN";"0";0.29;1;44;295;3.38;0.29 -"P0385";"SEPI-OLZ";"0";0.01;6;0;2;400;0.01 -"P5007";"SPON-CAN";"0";3.5;12;26.666;292;3.42;3.5 -"P0389";"SPON-CAN";"0";0.73;1;35;730;1.36;0.73 -"P5001";"SPON-CAN";"0";2.4;6;31.833;400;2.5;2.4 -"P5016";"SPON-CAN";"0";1;5;25;200;5;1 -"P5033";"SPON-CAN";"0";13.8;18;33.333;767;1.3;13.8 -"P0422";"SPRA-SPR";"0";0.57;51;11.343;11;89.47;0.57 -"P0535";"SPRA-SPR";"0";3.72;291;11.648;13;78.04;2.18 -"P0423";"SPRA-SPR";"0";313.55;29288;11.047;11;93.4;40.2 -"P0480";"SPRA-SPR";"0";21.76;15422;13;8;439.58;0.57 -"P0484";"SPRA-SPR";"0";0.01;1;13;16;62.5;0.01 -"P5030";"SPRA-SPR";"0";97.5;18038;9.466;5;185;97.5 -"P0443";"SPRA-SPR";"0";72.3;6120;11.186;12;84.65;72.3 -"P0523";"SPRA-SPR";"0";2.42;212;11.037;11;87.77;2.42 -"P5026";"SPRA-SPR";"0";33;9900;9.258;3;300;33 -"P0542";"SPRA-SPR";"0";1.32;119;11.152;11;90.07;1.32 -"P5023";"SPRA-SPR";"0";122;12607;10.717;10;103.33;122 -"P0435";"SPRA-SPR";"0";54.66;5579;10.818;10;102.05;7.6 -"P5038";"SPRA-SPR";"0";166.1;13483;11.347;12;81.17;166.1 -"P5036";"SPRA-SPR";"0";47.02;2821;12.644;17;60;47.02 -"P5063";"SPRA-SPR";"0";250;20225;12.013;12;80.89;250 -"P0377";"TODA-EBL";"0";0.11;2;0;55;18.18;0.11 -"P0489";"TODA-EBL";"0";0.15;2;10;78;12.9;0.15 -"P0559";"TODA-EBL";"0";0.02;1;0;20;50;0.02 -"P0450";"TODA-EBL";"0";0.13;1;12;130;7.69;0.13 -"P0506";"TODA-EBL";"0";0.25;1;15;250;4;0.25 -"P0484";"TODA-EBL";"0";0.1;1;12;105;9.52;0.1 -"P0523";"TRAC-DRA";"0";0.04;1;19;40;25;0.04 -"P0422";"TRAC-DRA";"0";0.34;3;26.333;113;8.82;0.34 -"P0443";"TRAC-DRA";"0";0.16;1;29;160;6.25;0.16 -"P0389";"TRAC-DRA";"0";0.25;4;21.25;62;16;0.25 -"P0404";"TRAC-DRA";"0";0.1;1;25;100;10;0.1 -"P5024";"TRAC-MED";"0";13.9;35;37.742;397;2.51;13.9 -"P5001";"TRAC-MED";"0";140;523;32.521;268;3.73;140 -"P5035";"TRAC-MED";"0";9;90;22.8;100;10;9 -"P0563";"TRAC-MED";"0";0.2;2;23;102;9.75;0.2 -"P0489";"TRAC-MED";"0";1.36;1;57;1360;0.73;1.36 -"P5017";"TRAC-MED";"0";13.2;129;23.069;102;9.77;13.2 -"P0443";"TRAC-MED";"0";0.4;4;23.5;100;10;0.4 -"P0545";"TRAC-MED";"0";3.74;40;21.525;94;10.69;3.74 -"P5034";"TRAC-MED";"0";5.4;30;26;180;5.55;5.4 -"P0389";"TRAC-TRU";"0";0.06;2;15.5;30;33.33;0.06 -"P0535";"TRAC-TRU";"0";0.11;10;10.666;11;92.3;0.06 -"P0474";"TRAC-TRU";"0";17.5;535;15.389;33;30.56;17.5 -"P0443";"TRAC-TRU";"0";9.46;265;15.733;36;28.03;9.46 -"P0501";"TRAC-TRU";"0";12.3;35;33.714;351;2.84;12.3 -"P0390";"TRAC-TRU";"0";1.21;65;12.863;19;53.65;0.41 -"P0399";"TRAC-TRU";"0";160.5;8170;12.945;20;50.9;160.5 -"P0479";"TRAC-TRU";"0";0.04;1;17;45;22.22;0.04 -"P0377";"TRAC-TRU";"0";229.6;1127;28.668;204;4.9;229.6 -"P0545";"TRAC-TRU";"0";5.54;156;16.333;36;28.15;5.54 -"P0554";"TRAC-TRU";"0";309;9787;15.269;32;31.67;309 -"P0464";"TRAC-TRU";"0";172.6;2933;18.927;59;16.99;172.6 -"P0557";"TRAC-TRU";"0";22.14;68;16.852;326;3.07;22.14 -"P5022";"TRAC-TRU";"0";10.2;22;38.545;492.863793320725;2.02895812910579;10.2 -"P0396";"TRAC-TRU";"0";65.6;1813;15.992;36;27.63;65.6 -"P0489";"TRAC-TRU";"0";54.5;466;23.666;117;8.55;54.5 -"P0450";"TRAC-TRU";"0";1.04;18;18.555;58;17.22;1.04 -"P5014";"TRAC-TRU";"0";3.1;9;33.555;324.263703696314;3.08390975801763;3.1 -"P0553";"TRAC-TRU";"0";26.8;121;16.148;221;4.51;26.8 -"P0542";"TRAC-TRU";"0";0.01;1;11;10;100;0.01 -"P0385";"TRAC-TRU";"0";4.72;177;14.135;27;37.5;4.72 -"P0430";"TRAC-TRU";"0";425.31;11000;16.333;39;25.86;227.7 -"P0379";"TRAC-TRU";"0";372.04;9570;16.28;39;25.72;134.2 -"P0523";"TRAC-TRU";"0";0.02;3;9.666;8;120;0.02 -"P0429";"TRAC-TRU";"0";171.1;5012;15.482;34;29.29;171.1 -"P5009";"TRAC-TRU";"0";15.2;252;18.015;49.5636304306247;20.1760845868569;15.2 -"P5013";"TRAC-TRU";"0";3.6;68;17.411;44.7133520247831;22.3646842546212;3.6 -"P0455";"TRAC-TRU";"0";141;2958;17.441;48;20.97;141 -"P5049";"TRAC-TRU";"0";97.1;306;32.3;289.004961187136;3.46014821300068;97.1 -"P0378";"TRAC-TRU";"0";1.46;80;11.6;18;54.79;1.46 -"P0512";"TRAC-TRU";"0";2.92;24;22.5;118.5;8.44;0.22 -"P0473";"TRAC-TRU";"0";47;3528;11.328;13;75.07;47 -"P0417";"TRAC-TRU";"0";1228.59;34879;15.595;35;28.38;239.8 -"P0559";"TRAC-TRU";"0";6.48;159;16.5;41;24.6;6.48 -"P0550";"TRAC-TRU";"0";1.24;35;16.285;35;28.22;1.24 -"P0399";"TRAC-TRU";"G";0.5;3;30.333;167;6;0.5 -"P0461";"TRAC-TRU";"0";56.8;1094;18.15;52;19.26;56.8 -"P0429";"TRAC-TRU";"G";0.22;1;31;225;4.44;0.22 -"P0561";"TRAC-TRU";"0";0.16;3;17;53;18.75;0.16 -"P0400";"TRAC-TRU";"0";0.81;2;36;408;2.45;0.81 -"P0435";"TRAC-TRU";"0";0.5;58;9.875;9;114.28;0.07 -"P0463";"TRAC-TRU";"0";10.56;208;18.02;51;19.68;10.56 -"P0495";"TRAC-TRU";"0";908.69;14881;19.021;61;16.37;298.7 -"P0500";"TRAC-TRU";"0";26.08;352;20.412;74;13.5;26.08 -"P5015";"TRAC-TRU";"0";10.8;605;12.345;15.8297006992034;63.1723883478303;10.8 -"P0510";"TRAC-TRU";"0";86.24;1013;20.784;85;11.74;86.24 -"P0409";"TRAC-TRU";"0";94.5;3194;15.383;30;33.79;94.5 -"P5063";"TRAC-TRU";"0";0.86;18;17.333;44.1111677340291;22.6699960887356;0.86 -"P0396";"TRAC-TRU";"G";1.12;5;29.6;224;4.46;1.12 -"P0384";"TRAC-TRU";"G";1.64;8;30;210;4.76;0.42 -"P0384";"TRAC-TRU";"0";329.31;17522;12.694;19;53.2;84.3 -"P0474";"ZEUS-FAB";"0";0.85;1;38;850;1.17;0.85 -"P0390";"ZEUS-FAB";"0";0.64;1;34;640;1.56;0.64 -"P5040";"ZEUS-FAB";"0";2.7;1;52;2700;0.3;2.7 -"P0553";"ZEUS-FAB";"0";1.66;1;48;1665;0.6;1.66 -"P0489";"ZEUS-FAB";"0";2.82;1;53;2820;0.35;2.82 Added: trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/catchesData/totalsample.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,252 +0,0 @@ -"title";"transectAbstract";"stratum";"comment";"voyageName";"vesselName";"dateCreated";"timeCoverageStart";"timeCoverageEnd";"geospatialLonMin";"geospatialLatMin";"geospatialVerticalMin";"geospatialLonMax";"geospatialLatMax";"geospatialVerticalMax";"linestring" -"Arlequin2 / la colombine942OBS01 SUR";"942OBS";"SUR";"942OBS,P5001,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-04-27 09:10:00;2011-04-27 09:10:00;2011-04-27 10:39:00;-1.5896666667;43.7055;110;-1.541;43.7606666667;110;"-176453.0000037 4851310.5,-171051 4857434.0000037" -"Arlequin2 / la colombine942OBS02 SUR";"942OBS";"SUR";"942OBS,P5002,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-04-27 15:13:00;2011-04-27 15:13:00;2011-04-27 16:33:00;-2.0301666667;43.8573333333;200;-2.0135;43.8708333333;200;"-225348.5000037 4869662.4999963,-223498.5 4868163.9999963" -"Arlequin2 / la colombine942OBS03 SUR";"942OBS";"SUR";"942OBS,P5003,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-04-27 17:51:00;2011-04-27 17:51:00;2011-04-27 18:39:00;-2.1398333333;43.8628333333;300;-2.1308333333;43.9021666667;300;"-236522.4999963 4868774.4999963,-237521.4999963 4873140.5000037" -"Arlequin2 / la colombine942OBS04 SUR";"942OBS";"SUR";"942OBS,P5004,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-04-28 10:57:00;2011-04-28 10:57:00;2011-04-28 11:17:00;-2.405;44.0686666667;900;-2.3825;44.0723333333;900;"-264457.5 4892028.9999963,-266955 4891622.0000037" -"Arlequin2 / la colombine942OBS05 SUR";"942OBS";"SUR";"942OBS,P5005,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-04-28 13:42:00;2011-04-28 13:42:00;2011-04-28 14:12:00;-2.0381666667;44.0498333333;140;-1.9953333333;44.065;140;"-226236.5000037 4891215,-221481.9999963 4889531.4999963" -"Arlequin2 / la colombine942OBS06 CLA";"942OBS";"CLA";"942OBS,P5006,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-04-28 18:17:00;2011-04-28 18:17:00;2011-04-28 18:42:00;-1.4325;44.0608333333;40;-1.4246666667;44.0831666667;40;"-158138.0000037 4893231.5000037,-159007.5 4890752.4999963" -"Arlequin2 / la colombine942OBS07 CLA";"942OBS";"CLA";"942OBS,P5007,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-04-29 05:28:00;2011-04-29 05:28:00;2011-04-29 06:04:00;-1.4;44.2615;40;-1.3510833333;44.2638333333;40;"-149970.2499963 4913285.4999963,-155400 4913026.5" -"Arlequin2 / la colombine942OBS08 SUR";"942OBS";"SUR";"942OBS,P5008,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-04-29 16:20:00;2011-04-29 16:20:00;2011-04-29 16:41:00;-2.0898333333;44.2561666667;400;-2.0666666667;44.2631666667;400;"-229400.0000037 4912434.5000037,-231971.4999963 4913211.5000037" -"Arlequin2 / la colombine942OBS09 CLA";"942OBS";"CLA";"942OBS,P5009,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-04-29 19:27:00;2011-04-29 19:27:00;2011-04-29 19:45:00;-1.966;44.4488333333;130;-1.9456666667;44.4591666667;130;"-218226 4933820.4999963,-215969.0000037 4934967.5000037" -"Arlequin2 / la colombine942OBS10 NUL";"942OBS";"NUL";"942OBS,P5010,NUL";"PELGAS2011";"Arlequin2 / la colombine";2011-04-30 07:32:00;2011-04-30 07:32:00;2011-04-30 08:05:00;-2.4816666667;44.29;1100;-2.4366666667;44.2996666667;1100;"-270470.0000037 4917263.0000037,-275465.0000037 4916190" -"Arlequin2 / la colombine942OBS11 SUR";"942OBS";"SUR";"942OBS,P5011,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-04-30 17:30:00;2011-04-30 17:30:00;2011-04-30 17:55:00;-2.035;44.4635;150;-2.0041666667;44.4851666667;150;"-222462.5000037 4935448.5,-225885 4937853.5000037" -"Arlequin2 / la colombine942OBS12 SUR";"942OBS";"SUR";"942OBS,P5012,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-05-01 09:34:00;2011-05-01 09:34:00;2011-05-01 10:02:00;-2.3023333333;44.6625;1200;-2.2616666667;44.6683333333;1200;"-255558.9999963 4958184.9999963,-251045.0000037 4957537.5" -"Arlequin2 / la colombine942OBS13 CLA";"942OBS";"CLA";"942OBS,P5013,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-01 14:57:00;2011-05-01 14:57:00;2011-05-01 15:56:00;-2.073;44.866;140;-1.9936666667;44.8696666667;140;"-221297.0000037 4980126,-230103 4980533.0000037" -"Arlequin2 / la colombine942OBS14 SUR";"942OBS";"SUR";"942OBS,P5014,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-05-01 19:00:00;2011-05-01 19:00:00;2011-05-01 19:27:00;-2.434;44.8713333333;2100;-2.4058333333;44.8895833333;2100;"-267047.4999963 4980717.9999963,-270174 4982743.7499963" -"Arlequin2 / la colombine942OBS15 CLA";"942OBS";"CLA";"942OBS,P5015,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-02 05:50:00;2011-05-02 05:50:00;2011-05-02 06:28:00;-1.729;44.4605;105;-1.6775;44.4688333333;105;"-191919 4935115.5,-186202.5 4936040.4999963" -"Arlequin2 / la colombine942OBS16 CLA";"942OBS";"CLA";"942OBS,P5016,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-02 08:30:00;2011-05-02 08:30:00;2011-05-02 09:00:00;-1.4506666667;44.4468333333;55;-1.4263333333;44.4528333333;55;"-158322.9999963 4934264.4999963,-161024.0000037 4933598.4999963" -"Arlequin2 / la colombine942OBS17 CLA";"942OBS";"CLA";"942OBS,P5017,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-02 16:51:00;2011-05-02 16:51:00;2011-05-02 17:59:00;-1.5058333333;44.8606666667;40;-1.415;44.8678333333;40;"-167147.4999963 4979534.0000037,-157065 4980329.4999963" -"Arlequin2 / la colombine942OBS18 SUR";"942OBS";"SUR";"942OBS,P5018,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-05-03 07:00:00;2011-05-03 07:00:00;2011-05-03 07:39:00;-2.4111666667;44.9941666667;300;-2.403;44.9941666667;300;"-267639.5000037 4994352.5000037,-266733 4994352.5000037" -"Arlequin2 / la colombine942OBS19 SUR";"942OBS";"SUR";"942OBS,P5019,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-05-03 09:51:00;2011-05-03 09:51:00;2011-05-03 10:19:00;-2.6836666667;44.979;100;-2.6556666667;45.0025;100;"-294779.0000037 4992669,-297887.0000037 4995277.5" -"Arlequin2 / la colombine942OBS20 SUR";"942OBS";"SUR";"942OBS,P5020,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-05-03 16:55:00;2011-05-03 16:55:00;2011-05-03 18:08:00;-2.9458333333;44.9798333333;2000;-2.8425;44.9965;2000;"-326987.4999963 4992761.4999963,-315517.5 4994611.5" -"Arlequin2 / la colombine942OBS21 CLA";"942OBS";"CLA";"942OBS,P5021,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-04 13:47:00;2011-05-04 13:47:00;2011-05-04 14:35:00;-1.6806666667;45.2205;70;-1.6611666667;45.2465;70;"-184389.5000037 5019475.5,-186554.0000037 5022361.5" -"Arlequin2 / la colombine942OBS22 SUR";"942OBS";"SUR";"942OBS,P5022,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-05-04 18:30:00;2011-05-04 18:30:00;2011-05-04 19:21:00;-2.1908333333;45.1796666667;110;-2.1888333333;45.189;110;"-242960.4999963 5014943.0000037,-243182.4999963 5015979" -"Arlequin2 / la colombine942OBS23 CLA";"942OBS";"CLA";"942OBS,P5023,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-05 05:29:00;2011-05-05 05:29:00;2011-05-05 05:47:00;-1.3298333333;45.4995;30;-1.3286666667;45.5151666667;30;"-147482.0000037 5050444.5,-147611.4999963 5052183.5000037" -"Arlequin2 / la colombine942OBS24 NUL";"942OBS";"NUL";"942OBS,P5024,NUL";"PELGAS2011";"Arlequin2 / la colombine";2011-05-05 09:38:00;2011-05-05 09:38:00;2011-05-05 10:28:00;-1.824;45.281;70;-1.7706666667;45.3063333333;70;"-196544.0000037 5029002.9999963,-202464 5026191" -"Arlequin2 / la colombine942OBS25 CLA";"942OBS";"CLA";"942OBS,P5025,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-05 15:44:00;2011-05-05 15:44:00;2011-05-05 16:31:00;-1.71;45.5380833333;50;-1.641;45.5505;50;"-189810 5054727.2499963,-182151 5056105.5" -"Arlequin2 / la colombine942OBS26 CLA";"942OBS";"CLA";"942OBS,P5026,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-05 19:14:00;2011-05-05 19:14:00;2011-05-05 19:29:00;-1.4098333333;45.6468333333;25;-1.3968333333;45.655;25;"-155048.4999963 5067705,-156491.4999963 5066798.4999963" -"Arlequin2 / la colombine942OBS27 CLA";"942OBS";"CLA";"942OBS,P5027,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-06 08:52:00;2011-05-06 08:52:00;2011-05-06 09:32:00;-2.6109166667;45.1505;130;-2.572;45.163;130;"-289811.7500037 5011705.5,-285492 5013093" -"Arlequin2 / la colombine942OBS28 SUR";"942OBS";"SUR";"942OBS,P5028,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-05-06 14:31:00;2011-05-06 14:31:00;2011-05-06 15:20:00;-3.0805;45.2468333333;180;-3.016;45.2515;180;"-341935.5 5022916.5,-334776 5022398.4999963" -"Arlequin2 / la colombine942OBS29 CLA";"942OBS";"CLA";"942OBS,P5029,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-06 16:24:00;2011-05-06 16:24:00;2011-05-06 17:00:00;-2.9083333333;45.2533333333;140;-2.872;45.2555;140;"-322824.9999963 5023360.5,-318792 5023119.9999963" -"Arlequin2 / la colombine942OBS30 CLA";"942OBS";"CLA";"942OBS,P5030,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-07 05:09:00;2011-05-07 05:09:00;2011-05-07 05:16:00;-1.4135;45.8685;25;-1.4111666667;45.87625;25;"-156898.5 5091403.5,-156639.5000037 5092263.75" -"Arlequin2 / la colombine942OBS31 SUR";"942OBS";"SUR";"942OBS,P5031,SUR";"PELGAS2011";"Arlequin2 / la colombine";2011-05-07 16:29:00;2011-05-07 16:29:00;2011-05-07 17:26:00;-3.096;45.4286666667;140;-3.0144166667;45.4443333333;140;"-334600.2500037 5042582.0000037,-343656 5044320.9999963" -"Arlequin2 / la colombine942OBS32 CLA";"942OBS";"CLA";"942OBS,P5032,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-08 05:26:00;2011-05-08 05:26:00;2011-05-08 05:48:00;-2.0513333333;45.8415;70;-2.0231666667;45.8491666667;70;"-227697.9999963 5088406.5,-224571.5000037 5089257.5000037" -"Arlequin2 / la colombine942OBS33 CLA";"942OBS";"CLA";"942OBS,P5033,CLA";"PELGAS2011";"Arlequin2 / la colombine";2011-05-08 09:39:00;2011-05-08 09:39:00;2011-05-08 09:55:00;-1.5255;46.0338333333;20;-1.523;46.0481666667;20;"-169053 5109755.4999963,-169330.5 5111346.5000037" -"Etoile Polaire_3725OBS62 NUL";"725OBS";"NUL";"725OBS,P5062,NUL";"PELGAS2011";"Etoile Polaire_3";2011-05-18 12:27:00;2011-05-18 12:27:00;2011-05-18 13:00:00;-3.88975;47.7972833333;30;-3.88975;47.7972833333;30;"-431762.25 5305498.4499963,-431762.25 5305498.4499963" -"Etoile Polaire_3725OBS63 CLA";"725OBS";"CLA";"725OBS,P5063,CLA";"PELGAS2011";"Etoile Polaire_3";2011-05-19 04:11:00;2011-05-19 04:11:00;2011-05-19 04:45:00;-4.4009666667;47.8541833333;33;-4.4009666667;47.8541833333;33;"-488507.3000037 5311814.3499963,-488507.3000037 5311814.3499963" -"Jeremi-Simon / Promethee942OBS34 CLA";"942OBS";"CLA";"942OBS,P5034,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-10 09:30:00;2011-05-10 09:30:00;2011-05-10 09:42:00;-1.742;46.1691666667;30;-1.7271666667;46.1755;30;"-191715.5000037 5124777.5000037,-193362 5125480.5" -"Jeremi-Simon / Promethee942OBS35 CLA";"942OBS";"CLA";"942OBS,P5035,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-10 12:14:00;2011-05-10 12:14:00;2011-05-10 12:35:00;-2.0196666667;46.3398333333;30;-1.9840833333;46.35;30;"-224183.0000037 5144850,-220233.2499963 5143721.4999963" -"Jeremi-Simon / Promethee942OBS36 CLA";"942OBS";"CLA";"942OBS,P5036,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-10 15:25:00;2011-05-10 15:25:00;2011-05-10 15:37:00;-2.1815;46.2598333333;40;-2.1583333333;46.2636666667;40;"-242146.5 5134841.4999963,-239574.9999963 5135267.0000037" -"Jeremi-Simon / Promethee942OBS37 SUR";"942OBS";"SUR";"942OBS,P5037,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-10 17:50:00;2011-05-10 17:50:00;2011-05-10 18:33:00;-2.5783333333;46.0985;100;-2.5176666667;46.1308333333;100;"-279461.0000037 5120522.4999963,-286194.9999963 5116933.5" -"Jeremi-Simon / Promethee942OBS38 CLA";"942OBS";"CLA";"942OBS,P5038,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-11 05:59:00;2011-05-11 05:59:00;2011-05-11 06:08:00;-2.055;46.5376666667;30;-2.0366666667;46.5405833333;30;"-228105 5165681.0000037,-226070.0000037 5166004.7499963" -"Jeremi-Simon / Promethee942OBS39 SUR";"942OBS";"SUR";"942OBS,P5039,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-11 09:59:00;2011-05-11 09:59:00;2011-05-11 10:18:00;-2.7261666667;46.2618333333;95;-2.6991666667;46.2776666667;95;"-299607.5000037 5136821.0000037,-302604.5000037 5135063.4999963" -"Jeremi-Simon / Promethee942OBS40 CLA";"942OBS";"CLA";"942OBS,P5040,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-11 10:44:00;2011-05-11 10:44:00;2011-05-11 11:08:00;-2.7228333333;46.2679166667;90;-2.68775;46.2855;90;"-302234.4999963 5135738.7500037,-298340.25 5137690.5" -"Jeremi-Simon / Promethee942OBS41 SUR";"942OBS";"SUR";"942OBS,P5041,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-11 12:10:00;2011-05-11 12:10:00;2011-05-11 12:31:00;-2.8198333333;46.4254166667;90;-2.7885;46.4586666667;90;"-309523.5 5156912.0000037,-313001.4999963 5153221.2500037" -"Jeremi-Simon / Promethee942OBS42 CLA";"942OBS";"CLA";"942OBS,P5042,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-11 18:08:00;2011-05-11 18:08:00;2011-05-11 18:30:00;-2.3651666667;46.6328333333;40;-2.3269166667;46.6471666667;40;"-262533.5000037 5176244.4999963,-258287.7500037 5177835.5000037" -"Jeremi-Simon / Promethee942OBS43 CLA";"942OBS";"CLA";"942OBS,P5043,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-12 08:49:00;2011-05-12 08:49:00;2011-05-12 09:26:00;-2.9769166667;45.67775;130;-2.9270833333;45.7035;130;"-324906.2499963 5073088.5,-330437.7500037 5070230.25" -"Jeremi-Simon / Promethee942OBS44 SUR";"942OBS";"SUR";"942OBS,P5044,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-12 11:55:00;2011-05-12 11:55:00;2011-05-12 12:49:00;-3.2261666667;45.5728333333;130;-3.2196666667;45.6043333333;130;"-358104.5000037 5058584.4999963,-357383.0000037 5062080.9999963" -"Jeremi-Simon / Promethee942OBS45 SUR";"942OBS";"SUR";"942OBS,P5045,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-12 17:17:00;2011-05-12 17:17:00;2011-05-12 17:41:00;-3.60475;45.7028333333;200;-3.5801666667;45.7271666667;200;"-400127.25 5073014.4999963,-397398.5000037 5075715.5000037" -"Jeremi-Simon / Promethee942OBS46 CLA";"942OBS";"CLA";"942OBS,P5046,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-13 07:28:00;2011-05-13 07:28:00;2011-05-13 08:10:00;-2.8195;46.0105;110;-2.7511666667;46.0376666667;110;"-312964.5 5107165.5,-305379.5000037 5110181.0000037" -"Jeremi-Simon / Promethee942OBS47 SUR";"942OBS";"SUR";"942OBS,P5047,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-13 13:48:00;2011-05-13 13:48:00;2011-05-13 14:37:00;-3.4535;45.9943333333;135;-3.4463333333;45.9980833333;135;"-382542.9999963 5105787.2499963,-383338.5 5105370.9999963" -"Jeremi-Simon / Promethee942OBS48 SUR";"942OBS";"SUR";"942OBS,P5048,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-13 16:45:00;2011-05-13 16:45:00;2011-05-13 17:01:00;-3.7349166667;45.8784166667;200;-3.7078333333;45.8845;200;"-414575.7500037 5092504.2500037,-411569.4999963 5093179.5" -"Jeremi-Simon / Promethee942OBS49 SUR";"942OBS";"SUR";"942OBS,P5049,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-13 19:24:00;2011-05-13 19:24:00;2011-05-13 19:52:00;-4.0945833333;45.7156666667;3300;-4.0488333333;45.738;3300;"-449420.4999963 5076918,-454498.7499963 5074439.0000037" -"Jeremi-Simon / Promethee942OBS50 SUR";"942OBS";"SUR";"942OBS,P5050,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-14 05:52:00;2011-05-14 05:52:00;2011-05-14 06:11:00;-4.0075;46.0056666667;700;-3.978;46.0093333333;700;"-444832.5 5106629.0000037,-441558 5107035.9999963" -"Jeremi-Simon / Promethee942OBS51 SUR";"942OBS";"SUR";"942OBS,P5051,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-14 17:22:00;2011-05-14 17:22:00;2011-05-14 17:31:00;-4.0624166667;46.2195;150;-4.0563333333;46.2293333333;150;"-450928.2500037 5131455.9999963,-450252.9999963 5130364.5" -"Jeremi-Simon / Promethee942OBS52 CLA";"942OBS";"CLA";"942OBS,P5052,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-15 09:39:00;2011-05-15 09:39:00;2011-05-15 10:09:00;-2.6296666667;46.7716666667;50;-2.6275;46.781;50;"-291652.5 5192691,-291893.0000037 5191655.0000037" -"Jeremi-Simon / Promethee942OBS53 CLA";"942OBS";"CLA";"942OBS,P5053,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-15 14:06:00;2011-05-15 14:06:00;2011-05-15 14:26:00;-2.5128333333;47.0348333333;35;-2.4841666667;47.0525;35;"-275742.5000037 5222827.5,-278924.4999963 5220866.4999963" -"Jeremi-Simon / Promethee942OBS54 CLA";"942OBS";"CLA";"942OBS,P5054,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-16 05:58:00;2011-05-16 05:58:00;2011-05-16 06:04:00;-2.7315833333;47.2006666667;35;-2.724;47.20425;35;"-303205.7499963 5239274.0000037,-302364 5239671.75" -"Jeremi-Simon / Promethee942OBS55 CLA";"942OBS";"CLA";"942OBS,P5055,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-16 07:38:00;2011-05-16 07:38:00;2011-05-16 08:04:00;-2.955;47.1078333333;50;-2.9088333333;47.1233333333;50;"-322880.4999963 5230689.9999963,-328005 5228969.4999963" -"Jeremi-Simon / Promethee942OBS56 SUR";"942OBS";"SUR";"942OBS,P5056,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-16 17:06:00;2011-05-16 17:06:00;2011-05-16 17:36:00;-3.4235833333;47.1163333333;90;-3.3805;47.1343333333;90;"-380017.7499963 5229912.9999963,-375235.5 5231910.9999963" -"Jeremi-Simon / Promethee942OBS57 SUR";"942OBS";"SUR";"942OBS,P5057,SUR";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-16 19:24:00;2011-05-16 19:24:00;2011-05-16 19:59:00;-3.2013333333;47.2145833333;60;-3.1501666667;47.2333333333;60;"-355347.9999963 5240818.7499963,-349668.5000037 5242899.9999963" -"Jeremi-Simon / Promethee942OBS58 CLA";"942OBS";"CLA";"942OBS,P5058,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-17 07:23:00;2011-05-17 07:23:00;2011-05-17 07:59:00;-3.844;47.156;105;-3.7969166667;47.181;105;"-426684 5234316,-421457.7500037 5237091" -"Jeremi-Simon / Promethee942OBS59 CLA";"942OBS";"CLA";"942OBS,P5059,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-17 11:41:00;2011-05-17 11:41:00;2011-05-17 11:50:00;-3.479;47.3521666667;80;-3.4666666667;47.3583333333;80;"-384800.0000037 5256774.9999963,-386169 5256090.5000037" -"Jeremi-Simon / Promethee942OBS60 CLA";"942OBS";"CLA";"942OBS,P5060,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-17 14:00:00;2011-05-17 14:00:00;2011-05-17 14:10:00;-3.392;47.5171666667;45;-3.3826666667;47.5281666667;45;"-375476.0000037 5274405.5000037,-376512 5275626.5000037" -"Jeremi-Simon / Promethee942OBS61 CLA";"942OBS";"CLA";"942OBS,P5061,CLA";"PELGAS2011";"Jeremi-Simon / Promethee";2011-05-18 07:07:00;2011-05-18 07:07:00;2011-05-18 07:37:00;-4.1079166667;47.4966666667;100;-4.072;47.5225;100;"-455978.7500037 5272130.0000037,-451992 5274997.5" -"PELGAS1157x52 cul ouvert1 CLA";"57x52 cul ouvert";"CLA";"57x52 cul ouvert,P0522,CLA";"PELGAS2011";"THALASSA II";2011-05-27 13:03:19;2011-05-27 13:03:19;2011-05-27 14:20:45;-1.6822975;45.7029332;51.33;-1.6526835;45.7907128;51.61;"-186735.0225 5082769.1208,-186251.0958 5081322.813,-183919.3632 5074420.6887,-183447.8685 5073025.5852" -"PELGAS1157x52 cul ouvert2 CLA";"57x52 cul ouvert";"CLA";"57x52 cul ouvert,P0540,CLA";"PELGAS2011";"THALASSA II";2011-05-29 07:13:36;2011-05-29 07:13:36;2011-05-29 09:45:07;-1.812378;45.7049792;43.15;-1.6157368;45.78285;54.64;"-179346.7848 5081896.35,-181279.761 5081161.3302,-201173.958 5073252.6912,-201173.958 5073252.6912" -"PELGAS1157x52 cul ouvert3 CLA";"57x52 cul ouvert";"CLA";"57x52 cul ouvert,P0542,CLA";"PELGAS2011";"THALASSA II";2011-05-29 16:02:41;2011-05-29 16:02:41;2011-05-29 18:10:54;-1.8293162;45.697887;0;-1.6577318;45.7662047;62.44;"-203054.0982 5072465.457,-199063.8258 5074134.9747,-186753.0267 5078903.7012,-184008.2298 5080048.7217" -"PELGAS1157x52 cul ouvert4 CLA";"57x52 cul ouvert";"CLA";"57x52 cul ouvert,P0550,CLA";"PELGAS2011";"THALASSA II";2011-05-31 06:14:53;2011-05-31 06:14:53;2011-05-31 10:38:03;-1.6076397;44.2804227;41.7;-1.3944412;44.4432638;99.57;"-178167.1212 4933202.2818,-178448.0067 4930108.1235,-156774.18 4915470.498,-154782.9732 4915126.9197" -"PELGAS1157x52 cul ouvert5 CLA";"57x52 cul ouvert";"CLA";"57x52 cul ouvert,P0557,CLA";"PELGAS2011";"THALASSA II";2011-06-01 06:24:12;2011-06-01 06:24:12;2011-06-01 10:11:26;-1.5807383;44.171812;71.07;-1.5107642;44.3567295;96.49;"-175236.8322 4923596.9745,-175461.9513 4922805.2115,-168033.1653 4903651.3512,-167694.8262 4903071.132" -"PELGAS1157x52 cul ouvert6 CLA";"57x52 cul ouvert";"CLA";"57x52 cul ouvert,P0559,CLA";"PELGAS2011";"THALASSA II";2011-06-01 16:50:17;2011-06-01 16:50:17;2011-06-01 19:45:44;-1.544388;44.1903917;71.68;-1.5089298;44.3466772;84.8;"-171427.068 4905133.4787,-171344.8725 4905817.827,-167654.3667 4920719.6103,-167491.2078 4922481.1692" -"PELGAS1157x52 cul ouvert7 CLA";"57x52 cul ouvert";"CLA";"57x52 cul ouvert,P0561,CLA";"PELGAS2011";"THALASSA II";2011-06-02 06:51:05;2011-06-02 06:51:05;2011-06-02 07:52:25;-1.4436755;44.503201;56.43;-1.442357;44.5586472;57.77;"-160118.4102 4939855.311,-160247.9805 4942564.3548,-160101.627 4946009.8392,-160101.627 4946009.8392" -"PELGAS1157x521 CLA";"57x52";"CLA";"57x52,P0405,CLA";"PELGAS2011";"THALASSA II";2011-05-02 17:58:21;2011-05-02 17:58:21;2011-05-02 18:56:47;-1.2885043;44.8195708;24.81;-1.2807723;44.9175472;28.93;"-142165.7253 4985847.7392,-142657.7328 4984334.5983,-142628.4288 4983746.9088,-142370.1762 4976120.5317,-142551.306 4975717.7682,-143023.9773 4974972.3588" -"PELGAS1157x522 CLA";"57x52";"CLA";"57x52,P0422,CLA";"PELGAS2011";"THALASSA II";2011-05-05 06:49:50;2011-05-05 06:49:50;2011-05-05 07:42:19;-1.5017447;45.3964938;39.98;-1.4046475;45.4340465;47.57;"-166693.6617 5039010.8118,-164956.0122 5039730.0363,-163777.3365 5040180.3522,-156772.8702 5042746.3947,-156462.825 5042853.3432,-155915.8725 5043179.1615" -"PELGAS1157x523 CLA";"57x52";"CLA";"57x52,P0443,CLA";"PELGAS2011";"THALASSA II";2011-05-10 12:43:00;2011-05-10 12:43:00;2011-05-10 13:24:40;-1.9724197;46.3363915;29.08;-1.8874198;46.3682763;37.82;"-218938.5867 5143339.4565,-217405.3548 5143859.436,-216429.2763 5144260.6788,-210740.0823 5146491.5235,-209588.5128 5146843.1937,-209503.5978 5146878.6693" -"PELGAS1176x701 SUR";"76x70";"SUR";"76x70,P0372,SUR";"PELGAS2011";"THALASSA II";2011-04-26 16:10:16;2011-04-26 16:10:16;2011-04-26 17:13:04;-2.2815727;43.6618312;945.2;-2.1443565;43.6689083;1551.6;"-238023.5715 4847248.8213,-239934.1368 4846965.9822,-241867.2795 4846938.7872,-251970.3663 4847038.332,-253187.8365 4846518.186,-253254.5697 4846463.2632" -"PELGAS1176x7010 SUR";"76x70";"SUR";"76x70,P0395,SUR";"PELGAS2011";"THALASSA II";2011-04-30 08:10:51;2011-04-30 08:10:51;2011-04-30 09:09:32;-2.5678162;44.2663897;1114.8;-2.4222628;44.2679052;1143.7;"-285027.5982 4913569.2567,-282912.0825 4913592.6,-280732.9305 4913616.2208,-271271.7678 4913651.6853,-270351.933 4913674.9065,-268871.1708 4913737.4772" -"PELGAS1176x7011 CLA";"76x70";"CLA";"76x70,P0396,CLA";"PELGAS2011";"THALASSA II";2011-04-30 18:30:21;2011-04-30 18:30:21;2011-04-30 19:22:25;-2.0138693;44.4664032;124.61;-1.8841163;44.4688195;143.28;"-209136.9093 4935770.7552,-210912.321 4935796.3962,-213020.1333 4935803.9553,-221068.8987 4935792.1782,-223537.683 4936038.9645,-223539.4923 4936038.4872" -"PELGAS1176x7012 CLA";"76x70";"CLA";"76x70,P0399,CLA";"PELGAS2011";"THALASSA II";2011-05-01 10:35:59;2011-05-01 10:35:59;2011-05-01 11:53:04;-1.9608768;44.6671477;116.37;-1.8043955;44.6685735;142.62;"-200287.9005 4958211.6585,-202230.5892 4958153.2503,-204192.6807 4958154.9042,-216044.0952 4958053.3947,-216795.6873 4958107.596,-217657.3248 4958198.9268" -"PELGAS1176x7013 NUL";"76x70";"NUL";"76x70,P0400,NUL";"PELGAS2011";"THALASSA II";2011-05-01 17:10:40;2011-05-01 17:10:40;2011-05-01 18:08:30;-2.5107745;44.8398187;2320.96;-2.3882112;44.8700878;2669.71;"-278695.9695 4980579.7458,-276862.749 4980410.1822,-276038.8182 4980291.9117,-266157.3873 4978361.3553,-265606.6497 4977621.2517,-265091.4432 4977219.8757" -"PELGAS1176x7014 CLA";"76x70";"CLA";"76x70,P0404,CLA";"PELGAS2011";"THALASSA II";2011-05-02 10:59:50;2011-05-02 10:59:50;2011-05-02 12:12:36;-1.6691328;44.6667415;71.21;-1.5227553;44.6679967;96.17;"-185273.7408 4958147.6337,-183224.7807 4958008.3065,-181259.8698 4958009.2278,-169821.8637 4958034.9687,-169025.8383 4958052.6732,-170414.6148 4958027.4318" -"PELGAS1176x7015 CLA";"76x70";"CLA";"76x70,P0409,CLA";"PELGAS2011";"THALASSA II";2011-05-03 05:56:21;2011-05-03 05:56:21;2011-05-03 06:53:02;-2.350551;45.0146373;119.83;-2.2226728;45.0190788;147.98;"-260911.161 4996697.3898,-259083.8457 4996624.7403,-257326.6047 4996633.1652,-248909.7633 4997025.3615,-248160.8352 4997024.2293,-246716.6808 4997117.7468" -"PELGAS1176x7016 SUR";"76x70";"SUR";"76x70,P0410,SUR";"PELGAS2011";"THALASSA II";2011-05-03 10:11:15;2011-05-03 10:11:15;2011-05-03 11:31:10;-2.6215875;44.982665;681.04;-2.4329692;45.009132;1837.23;"-270059.5812 4993075.815,-272071.9113 4994122.0677,-273333.8925 4994449.0848,-288573.3045 4996013.652,-289666.4547 4995787.1787,-290996.2125 4995482.1285" -"PELGAS1176x7017 CLA";"76x70";"CLA";"76x70,P0417,CLA";"PELGAS2011";"THALASSA II";2011-05-04 17:51:47;2011-05-04 17:51:47;2011-05-04 18:51:40;-2.3928312;45.1488743;118.59;-2.2587222;45.1643467;129.14;"-265604.2632 5011525.0473,-263782.398 5011599.8058,-261956.0928 5011756.1493,-252783.963 5013036.5232,-251025.5232 5013154.05,-250718.1642 5013242.4837" -"PELGAS1176x702 CLA";"76x70";"CLA";"76x70,P0377,CLA";"PELGAS2011";"THALASSA II";2011-04-27 06:31:39;2011-04-27 06:31:39;2011-04-27 07:32:48;-1.8623337;43.6584373;120.17;-1.7325612;43.6671347;403.21;"-192314.2932 4847051.9517,-193957.293 4847013.1683,-196001.7465 4846993.2882,-205418.7867 4847001.258,-206208.3075 4846813.4238,-206719.0407 4846086.5403" -"PELGAS1176x7020 CLA";"76x70";"CLA";"76x70,P0423,CLA";"PELGAS2011";"THALASSA II";2011-05-05 15:39:20;2011-05-05 15:39:20;2011-05-05 16:30:36;-1.7040965;45.5251245;49.19;-1.5957788;45.5764733;60.33;"-177131.4468 5058988.5363,-178854.3555 5058220.9158,-179875.9773 5057825.9667,-187281.642 5054962.9437,-188019.0372 5054572.6677,-189154.7115 5053288.8195" -"PELGAS1176x7021 CLA";"76x70";"CLA";"76x70,P0429,CLA";"PELGAS2011";"THALASSA II";2011-05-06 07:25:49;2011-05-06 07:25:49;2011-05-06 08:23:42;-2.5916513;45.1674712;127.27;-2.4868643;45.223091;134.82;"-287673.2943 5013589.3032,-286481.6982 5014071.0987,-284839.7862 5014707.6948,-277218.6372 5017992.762,-276742.758 5018349.6492,-276041.9373 5019763.101" -"PELGAS1176x7022 CLA";"76x70";"CLA";"76x70,P0430,CLA";"PELGAS2011";"THALASSA II";2011-05-06 16:05:41;2011-05-06 16:05:41;2011-05-06 17:13:24;-2.8031877;45.3028577;130.47;-2.6747238;45.3649185;140;"-296894.3418 5035505.9535,-298751.3052 5034998.9943,-300509.8005 5034514.8012,-310210.4568 5030614.1613,-311063.0922 5029957.1967,-311153.8347 5028617.2047" -"PELGAS1176x7023 CLA";"76x70";"CLA";"76x70,P0435,CLA";"PELGAS2011";"THALASSA II";2011-05-07 07:04:49;2011-05-07 07:04:49;2011-05-07 07:47:25;-1.7913777;45.713379;54.64;-1.7047352;45.752702;63.36;"-198842.9247 5074185.069,-197404.3758 5074667.475,-195745.947 5075422.8078,-190375.3008 5077609.3857,-189835.6965 5077896.798,-189225.6072 5078549.922" -"PELGAS1176x7024 CLA";"76x70";"CLA";"76x70,P0436,CLA";"PELGAS2011";"THALASSA II";2011-05-07 12:40:49;2011-05-07 12:40:49;2011-05-07 13:46:27;-2.4469547;45.4591737;105.58;-2.3121087;45.522262;118.3;"-271611.9717 5045968.2807,-269576.4315 5046730.5843,-267375.8898 5047526.2212,-257610.354 5051426.7945,-257200.1868 5051671.8048,-256644.0657 5052971.082" -"PELGAS1176x7025 CLA";"76x70";"CLA";"76x70,P0441,CLA";"PELGAS2011";"THALASSA II";2011-05-08 06:22:08;2011-05-08 06:22:08;2011-05-08 07:21:37;-2.3262128;45.7326873;89.5;-2.2129033;45.7859103;104.18;"-245632.2663 5082236.0433,-247245.6957 5081384.085,-248416.4127 5080834.5018,-257111.7753 5077260.7458,-257631.6993 5076977.7735,-258209.6208 5076328.2903" -"PELGAS1176x7027 SUR";"76x70";"SUR";"76x70,P0442,SUR";"PELGAS2011";"THALASSA II";2011-05-08 16:48:56;2011-05-08 16:48:56;2011-05-08 17:52:01;-2.1964855;46.0146635;59.67;-2.0620947;46.0641357;77.54;"-243809.8905 5107627.6485,-241623.8232 5108472.8247,-240133.3707 5109032.9418,-230882.2755 5112558.435,-229881.6993 5112871.3662,-228892.5117 5113119.0627" -"PELGAS1176x7028 SUR";"76x70";"SUR";"76x70,P0444,SUR";"PELGAS2011";"THALASSA II";2011-05-10 18:08:06;2011-05-10 18:08:06;2011-05-10 18:59:31;-2.6605323;46.070546;99.39;-2.5480557;46.114385;109.77;"-295319.0853 5113830.606,-293367.45 5114572.0305,-291961.635 5115153.393,-284433.9147 5118044.8653,-283772.3103 5118322.6872,-282834.1827 5118696.735" -"PELGAS1176x7029 SUR";"76x70";"SUR";"76x70,P0449,SUR";"PELGAS2011";"THALASSA II";2011-05-11 07:48:46;2011-05-11 07:48:46;2011-05-11 08:46:02;-2.4132268;46.3933122;51.45;-2.2932678;46.4399692;61.15;"-267868.1748 5149657.6542,-265543.6017 5150628.7932,-264636.432 5151137.3175,-256109.0568 5154382.0362,-255395.7708 5154580.3932,-254552.7258 5154836.5812" -"PELGAS1176x703 CLA";"76x70";"CLA";"76x70,P0378,CLA";"PELGAS2011";"THALASSA II";2011-04-27 12:55:28;2011-04-27 12:55:28;2011-04-27 13:55:31;-1.8163302;43.8663945;104.87;-1.6735877;43.8686382;119.47;"-201612.6522 4869418.8402,-199605.6612 4869260.7318,-197054.6037 4869204.9432,-188171.5068 4869169.7895,-187166.9013 4869205.1097,-185768.2347 4869256.9245" -"PELGAS1176x7030 CLA";"76x70";"CLA";"76x70,P0450,CLA";"PELGAS2011";"THALASSA II";2011-05-11 14:01:18;2011-05-11 14:01:18;2011-05-11 14:53:30;-2.9953413;46.3871398;104.88;-2.8834058;46.4431943;109.13;"-320058.0438 5155194.5673,-321985.026 5154360.0027,-323918.313 5153646.6945,-331013.5773 5150757.3978,-331089.7788 5150725.9737,-332482.8843 5148972.5178" -"PELGAS1176x7031 CLA";"76x70";"CLA";"76x70,P0454,CLA";"PELGAS2011";"THALASSA II";2011-05-12 07:05:26;2011-05-12 07:05:26;2011-05-12 07:54:23;-2.6643848;45.822963;0;-2.5688493;45.8623152;115.15;"-295746.7128 5086348.893,-294690.8475 5087312.2953,-293155.329 5088043.9185,-286517.3292 5090685.9072,-285752.3172 5090716.9872,-285142.2723 5090513.7573" -"PELGAS1176x7032 CLA";"76x70";"CLA";"76x70,P0455,CLA";"PELGAS2011";"THALASSA II";2011-05-12 11:53:52;2011-05-12 11:53:52;2011-05-12 12:50:31;-3.2525177;45.588295;137.78;-3.1454785;45.6312985;145.53;"-361029.4647 5060300.745,-360163.1652 5061136.9857,-358571.07 5061941.4915,-351224.9235 5064993.6585,-350279.7585 5065074.1335,-349148.1135 5064643.287" -"PELGAS1176x7033 CLA";"76x70";"CLA";"76x70,P0460,CLA";"PELGAS2011";"THALASSA II";2011-05-13 07:26:04;2011-05-13 07:26:04;2011-05-13 08:17:17;-2.8635707;45.9931083;110.55;-2.751762;46.0336402;118.51;"-305445.582 5109734.0622,-307388.1375 5109158.4828,-308915.442 5108503.2498,-315836.7027 5105789.6772,-316640.9088 5105544.345,-317856.3477 5105235.0213" -"PELGAS1176x7034 CLA";"76x70";"CLA";"76x70,P0461,CLA";"PELGAS2011";"THALASSA II";2011-05-13 13:44:58;2011-05-13 13:44:58;2011-05-13 14:47:52;-3.4756925;45.9683187;135.48;-3.3508018;46.0101655;146.09;"-385801.8675 5102483.3757,-384389.9475 5103039.0972,-382724.6367 5103832.503,-374505.4863 5107128.3705,-373587.9492 5107102.7517,-371938.9998 5106499.8663" -"PELGAS1176x7035 CLA";"76x70";"CLA";"76x70,P0463,CLA";"PELGAS2011";"THALASSA II";2011-05-14 07:04:19;2011-05-14 07:04:19;2011-05-14 08:03:26;-3.8088337;46.0635425;144.02;-3.6899332;46.122605;151.87;"-409582.5852 5119609.155,-411549.372 5118688.0215,-413842.299 5117699.3223,-421417.2165 5114764.1382,-422472.0273 5114027.5977,-422780.5407 5113053.2175" -"PELGAS1176x7036 CLA";"76x70";"CLA";"76x70,P0464,CLA";"PELGAS2011";"THALASSA II";2011-05-14 18:17:12;2011-05-14 18:17:12;2011-05-14 19:15:39;-4.0658263;46.1847407;147.29;-3.952778;46.2272748;455.91;"-451306.7193 5126506.2177,-450590.6805 5127358.5978,-448712.6382 5128030.1922,-440563.6953 5131227.5028,-439434.0372 5131138.281,-438758.358 5130949.248" -"PELGAS1176x7037 CLA";"76x70";"CLA";"76x70,P0468,CLA";"PELGAS2011";"THALASSA II";2011-05-15 07:08:30;2011-05-15 07:08:30;2011-05-15 07:50:01;-3.1033452;46.572012;102.79;-3.0107173;46.6142235;109.27;"-334189.6203 5174178.8085,-336223.3845 5173324.8078,-337964.3418 5172648.8178,-343273.4385 5170500.8457,-343877.3562 5170108.1055,-344471.3172 5169493.332" -"PELGAS1176x7038 CLA";"76x70";"CLA";"76x70,P0473,CLA";"PELGAS2011";"THALASSA II";2011-05-16 07:04:19;2011-05-16 07:04:19;2011-05-16 08:07:44;-3.0315428;47.0709295;47.84;-2.902397;47.1193555;56.97;"-336501.2508 5224873.1745,-334845.3972 5225537.3097,-333510.4002 5226068.5557,-324177.0318 5229742.356,-322166.4888 5230248.4605,-322166.067 5230247.1618" -"PELGAS1176x7039 CLA";"76x70";"CLA";"76x70,P0474,CLA";"PELGAS2011";"THALASSA II";2011-05-16 11:46:49;2011-05-16 11:46:49;2011-05-16 12:39:19;-3.3675692;46.9404882;96.2;-3.2488483;46.9880827;105.88;"-373800.1812 5210394.1902,-371854.107 5211190.0713,-370096.1445 5211897.7518,-362478.1257 5214992.3097,-361866.6933 5215201.9998,-360622.1613 5215677.1797" -"PELGAS1176x704 CLA";"76x70";"CLA";"76x70,P0379,CLA";"PELGAS2011";"THALASSA II";2011-04-27 16:39:37;2011-04-27 16:39:37;2011-04-27 17:33:31;-2.0281513;43.866496;121.48;-1.8900952;43.8691178;238.72;"-225124.7943 4869472.0758,-222189.8433 4869308.3508,-220236.6318 4869181.056,-211967.8977 4869293.8875,-210403.6635 4869310.2267,-209800.5672 4869327.6648" -"PELGAS1176x7040 CLA";"76x70";"CLA";"76x70,P0479,CLA";"PELGAS2011";"THALASSA II";2011-05-17 07:21:17;2011-05-17 07:21:17;2011-05-17 08:11:19;-3.9146918;47.1082192;111.41;-3.8045323;47.1750937;114.95;"-422303.0853 5236435.4007,-424362.2352 5235277.482,-426302.9037 5234288.139,-432519.2367 5230962.6567,-434026.539 5229853.7223,-434530.7898 5229012.3312" -"PELGAS1176x7041 CLA";"76x70";"CLA";"76x70,P0480,CLA";"PELGAS2011";"THALASSA II";2011-05-17 15:24:51;2011-05-17 15:24:51;2011-05-17 16:14:04;-3.6762278;47.4952177;73.86;-3.5821943;47.544304;88.44;"-408061.2858 5271969.1647,-406347.1905 5272603.0635,-404910.8505 5273264.2017,-399231.8685 5276914.1703,-398461.3287 5277251.4993,-397623.5673 5277417.744" -"PELGAS1176x7042 CLA";"76x70";"CLA";"76x70,P0484,CLA";"PELGAS2011";"THALASSA II";2011-05-18 07:41:01;2011-05-18 07:41:01;2011-05-18 08:35:18;-4.101942;47.4873888;97.56;-4.009956;47.5604683;103.55;"-445105.116 5279211.9813,-447443.2422 5277266.7618,-449071.0017 5276079.0063,-454377.8895 5272212.8763,-455312.9757 5271110.8128,-455315.562 5271100.1568" -"PELGAS1176x7043 CLA";"76x70";"CLA";"76x70,P0485,CLA";"PELGAS2011";"THALASSA II";2011-05-18 18:20:32;2011-05-18 18:20:32;2011-05-18 19:19:08;-4.8355088;47.2580117;125.59;-4.749719;47.31726;130.9;"-536741.4768 5245639.2987,-535520.9097 5246468.9127,-534203.6838 5247531.3603,-528588.6933 5251962.8355,-528038.544 5252180.8617,-527218.809 5252215.86" -"PELGAS1176x7044 CLA";"76x70";"CLA";"76x70,P0489,CLA";"PELGAS2011";"THALASSA II";2011-05-19 13:15:33;2011-05-19 13:15:33;2011-05-19 14:08:45;-5.0486845;47.689233;118.26;-4.9486678;47.7533722;125.64;"-560403.9795 5293504.863,-558846.7827 5294555.034,-557454.1545 5295574.9242,-551066.3043 5300387.9397,-550450.0212 5300624.3142,-549302.1258 5300542.9623" -"PELGAS1176x7045 CLA";"76x70";"CLA";"76x70,P0493,CLA";"PELGAS2011";"THALASSA II";2011-05-20 11:17:24;2011-05-20 11:17:24;2011-05-20 12:18:42;-3.9550978;46.4663138;135.55;-3.8267858;46.5067558;143.03;"-439015.8558 5157760.8318,-437496.066 5158285.9173,-435560.6478 5158879.5453,-426554.0412 5162249.8938,-425012.895 5161955.0445,-424773.2238 5161825.1412" -"PELGAS1176x7046 SUR";"76x70";"SUR";"76x70,P0494,SUR";"PELGAS2011";"THALASSA II";2011-05-20 15:29:41;2011-05-20 15:29:41;2011-05-20 16:23:35;-4.3018458;46.3305682;155.22;-4.1639483;46.3718998;339.31;"-477504.8838 5142693.0702,-474949.2975 5143372.1793,-473299.893 5143868.1717,-464401.4115 5147225.8995,-463639.9848 5147280.8778,-462198.2613 5147192.1" -"PELGAS1176x7047 CLA";"76x70";"CLA";"76x70,P0495,CLA";"PELGAS2011";"THALASSA II";2011-05-20 17:23:27;2011-05-20 17:23:27;2011-05-20 18:21:10;-4.253129;46.3335;153.13;-4.1378057;46.3965855;177.73;"-459296.4327 5150020.9905,-461028.3102 5148749.5632,-463020.1053 5147725.7325,-470922.9945 5144622.4167,-471769.3473 5143624.227,-472097.319 5143018.5" -"PELGAS1176x7048 CLA";"76x70";"CLA";"76x70,P0500,CLA";"PELGAS2011";"THALASSA II";2011-05-21 11:41:44;2011-05-21 11:41:44;2011-05-21 13:07:19;-4.7578432;46.5004423;199.54;-4.668185;46.5982782;203.98;"-528120.5952 5172408.8802,-527624.9802 5171157.7992,-527507.8197 5169227.6313,-519928.5177 5162603.0847,-518613.3342 5161824.7638,-518168.535 5161549.0953" -"PELGAS1176x7049 SUR";"76x70";"SUR";"76x70,P0501,SUR";"PELGAS2011";"THALASSA II";2011-05-21 19:00:00;2011-05-21 19:00:00;2011-05-21 20:20:33;-5.308464;46.230533;3469.52;-5.2154532;46.3281213;4470.96;"-578915.3052 5142421.4643,-580248.7482 5141407.5792,-581171.4912 5140606.8807,-582457.1265 5139366.2448,-584371.155 5137469.8098,-588791.0418 5133018.0438,-589163.358 5132388.1188,-589239.504 5131589.163" -"PELGAS1176x705 SUR";"76x70";"SUR";"76x70,P0383,SUR";"PELGAS2011";"THALASSA II";2011-04-28 06:25:57;2011-04-28 06:25:57;2011-04-28 07:21:02;-3.045986;44.0653118;1466.72;-2.913562;44.0667465;1714.64;"-323405.382 4891383.4647,-325406.934 4891404.7545,-326560.6458 4891408.8615,-336263.7663 4891386.5727,-337013.6712 4891347.7338,-338104.446 4891249.6098" -"PELGAS1176x7050 SUR";"76x70";"SUR";"76x70,P0505,SUR";"PELGAS2011";"THALASSA II";2011-05-22 05:45:10;2011-05-22 05:45:10;2011-05-22 06:53:04;-5.0391885;46.4960177;0;-4.9275653;46.5748143;1404.54;"-546959.7483 5169804.3873,-548035.5825 5168897.1732,-549337.3683 5168004.045,-558269.1165 5162906.259,-559003.77 5162178.9648,-559349.9235 5161057.9647" -"PELGAS1176x7051 NUL";"76x70";"NUL";"76x70,P0506,NUL";"PELGAS2011";"THALASSA II";2011-05-22 12:05:37;2011-05-22 12:05:37;2011-05-22 13:22:21;-4.4057432;46.8537532;133.27;-4.2612517;46.9310295;143.79;"-472998.9387 5209344.2745,-474911.5353 5208154.3545,-476866.1787 5207045.8752,-486969.9648 5201828.7198,-488187.324 5201224.0695,-489037.4952 5200766.6052" -"PELGAS1176x7052 SUR";"76x70";"SUR";"76x70,P0509,SUR";"PELGAS2011";"THALASSA II";2011-05-24 17:23:57;2011-05-24 17:23:57;2011-05-24 18:30:39;-5.1306105;46.7309763;190.03;-4.9933477;46.8243673;921.15;"-569497.7655 5187138.3693,-567987.4662 5188107.477,-566175.3357 5189242.5297,-556528.6365 5196072.1488,-554261.5947 5197503.3495,-554263.1043 5197504.7703" -"PELGAS1176x7053 CLA";"76x70";"CLA";"76x70,P0510,CLA";"PELGAS2011";"THALASSA II";2011-05-25 07:27:42;2011-05-25 07:27:42;2011-05-25 08:34:33;-5.2637042;46.9231093;158.25;-5.1542625;47.0116518;311.77;"-584271.1662 5208465.1323,-582292.6467 5210033.7843,-580271.9028 5211653.2188,-573297.6285 5217000.4773,-572534.5035 5217716.4162,-572123.1375 5218293.3498" -"PELGAS1176x7054 SUR";"76x70";"SUR";"76x70,P0511,SUR";"PELGAS2011";"THALASSA II";2011-05-25 13:04:56;2011-05-25 13:04:56;2011-05-25 14:07:39;-5.5507878;46.9967828;170.81;-5.4512717;47.0788477;1139.61;"-605091.1587 5225752.0947,-606963.7842 5224406.2863,-608023.2015 5223737.3448,-615597.342 5217743.589,-615861.5442 5217400.5213,-616137.4458 5216642.8908" -"PELGAS1176x7055 CLA";"76x70";"CLA";"76x70,P0512,CLA";"PELGAS2011";"THALASSA II";2011-05-25 15:07:48;2011-05-25 15:07:48;2011-05-25 15:39:12;-5.484334;47.0574093;79.52;-5.413577;47.1056103;82.43;"-608761.074 5223372.4323,-607434.0912 5224492.9662,-605983.0992 5225705.1195,-603251.0118 5227742.0472,-601897.4778 5228357.9862,-600907.047 5228722.7433" -"PELGAS1176x7056 CLA";"76x70";"CLA";"76x70,P0523,CLA";"PELGAS2011";"THALASSA II";2011-05-27 15:30:59;2011-05-27 15:30:59;2011-05-27 15:46:53;-1.7299877;45.7345267;50.77;-1.6770243;45.7595562;55.87;"-186149.6973 5079310.7382,-187911.9888 5078514.9015,-188718.537 5078134.4823,-190794.0705 5077343.7405,-191123.0745 5077231.8747,-192028.6347 5076532.4637" -"PELGAS1176x7057 CLA";"76x70";"CLA";"76x70,P0535,CLA";"PELGAS2011";"THALASSA II";2011-05-28 16:43:48;2011-05-28 16:43:48;2011-05-28 17:20:31;-1.9252288;45.6562365;63.29;-1.8414218;45.6879498;71.53;"-205829.7087 5070941.5713,-204397.8198 5071362.4278,-205586.2968 5070877.8795,-211251.5592 5068721.9265,-212280.3405 5068329.2307,-213700.3968 5067842.2515" -"PELGAS1176x7058 CLA";"76x70";"CLA";"76x70,P0545,CLA";"PELGAS2011";"THALASSA II";2011-05-30 16:59:20;2011-05-30 16:59:20;2011-05-30 17:39:30;-1.5660237;44.2663007;65.4;-1.4830722;44.2686315;91.58;"-173828.6307 4913575.5393,-173761.62 4913572.3758,-172875.5958 4913559.3777,-166465.9785 4913818.0965,-165904.041 4913812.3023,-164621.0142 4913802.0792" -"PELGAS1176x7059 CLA";"76x70";"CLA";"76x70,P0553,CLA";"PELGAS2011";"THALASSA II";2011-05-31 16:00:50;2011-05-31 16:00:50;2011-05-31 16:48:07;-1.5874398;44.2424503;92.84;-1.570825;44.3163878;98.62;"-174361.575 4910911.9833,-174710.5923 4912059.135,-175022.4468 4913118.2748,-176176.0698 4918015.7835,-176205.8178 4918490.7525,-175941.6267 4919119.0458" -"PELGAS1176x706 CLA";"76x70";"CLA";"76x70,P0384,CLA";"PELGAS2011";"THALASSA II";2011-04-28 13:13:08;2011-04-28 13:13:08;2011-04-28 14:24:03;-1.9784785;44.0622012;119.17;-1.822899;44.0668072;139.39;"-202341.789 4891288.2933,-204059.8803 4891361.3757,-206292.5343 4891338.2433,-217664.2512 4891415.5992,-218518.6182 4891301.0472,-219611.1135 4890904.3332" -"PELGAS1176x7060 CLA";"76x70";"CLA";"76x70,P0554,CLA";"PELGAS2011";"THALASSA II";2011-05-31 17:28:44;2011-05-31 17:28:44;2011-05-31 18:03:21;-1.543161;44.2750642;81.25;-1.5356088;44.32775;85.86;"-171290.871 4920380.25,-171153.4752 4919438.8368,-171066.8397 4918600.698,-170818.6548 4915122.9348,-170452.5768 4914532.1262,-170452.5768 4914532.1262" -"PELGAS1176x7061 CLA";"76x70";"CLA";"76x70,P0563,CLA";"PELGAS2011";"THALASSA II";2011-06-02 17:34:41;2011-06-02 17:34:41;2011-06-02 18:32:34;-1.4603552;44.436339;57.27;-1.4359327;44.5321583;64.21;"-159388.5297 4943069.5713,-159607.5327 4941807.2682,-159752.4543 4941056.553,-161688.15 4933406.0112,-161780.3688 4933124.9703,-162099.4272 4932433.629" -"PELGAS1176x707 CLA";"76x70";"CLA";"76x70,P0385,CLA";"PELGAS2011";"THALASSA II";2011-04-28 18:50:26;2011-04-28 18:50:26;2011-04-28 19:36:31;-1.6945545;44.0598607;81.8;-1.5795458;44.0665727;108.78;"-175329.5838 4891380.8007,-176984.7603 4891353.8943,-178925.1513 4891389.5697,-185910.57 4891379.391,-187246.0665 4891024.857,-188095.5495 4890644.5377" -"PELGAS1176x708 CLA";"76x70";"CLA";"76x70,P0389,CLA";"PELGAS2011";"THALASSA II";2011-04-29 06:19:53;2011-04-29 06:19:53;2011-04-29 07:23:00;-1.5917088;44.2657525;44.94;-1.4498057;44.2666267;91.15;"-176679.6768 4913574.507,-174871.0983 4913566.4373,-172879.1145 4913594.4315,-163026.366 4913595.5637,-161635.7802 4913501.3802,-160928.4327 4913498.5275" -"PELGAS1176x709 CLA";"76x70";"CLA";"76x70,P0390,CLA";"PELGAS2011";"THALASSA II";2011-04-29 10:07:58;2011-04-29 10:07:58;2011-04-29 11:26:04;-1.7977285;44.2634748;101.13;-1.6408157;44.2682853;119.26;"-199193.0853 4913548.2,-196894.3863 4913573.6523,-194977.05 4913565.294,-182130.5427 4913528.664,-197814.7317 4913779.6683,-199547.8635 4913245.7028" -"PELGAS11ACOU1 R1";"ACOU";"R1";"ACOU,R1";"PELGAS2011";"THALASSA II";2011-04-26 08:27:01;2011-04-26 08:27:01;2011-04-26 19:36:12;-3.4998475;43.665663;673.1;-2.0023385;43.6676747;1839.03;"-388483.0725 4846888.593,-247253.721 4847085.3738,-254922.489 4846987.4385,-237818.0217 4847111.8917,-247575.5655 4846993.821,-222259.5735 4846999.7817" -"PELGAS11ACOU1 R1 INTER";"ACOU";"IR1";"ACOU,IR1";"PELGAS2011";"THALASSA II";2011-04-26 19:36:13;2011-04-26 19:36:13;2011-04-26 08:27:00;-3.4998475;43.665663;673.1;-2.0023385;43.6666647;1839.03;"-2.0023385 43.6666647,-3.4998475 43.665663" -"PELGAS11ACOU10 R10";"ACOU";"R10";"ACOU,R10";"PELGAS2011";"THALASSA II";2011-05-05 05:27:49;2011-05-05 05:27:49;2011-05-05 11:20:43;-2.1111078;45.173087;26.42;-1.2664417;45.4842563;110.71;"-140575.0287 5048752.4493,-161712.8253 5040903.5283,-161551.731 5040954.2553,-234227.1162 5014252.0065,-234332.9658 5014212.657" -"PELGAS11ACOU10 R10 INTER";"ACOU";"IR1";"ACOU,IR1";"PELGAS2011";"THALASSA II";2011-05-05 09:37:43;2011-05-05 09:37:43;2011-05-05 05:27:48;-2.1101542;45.1734415;26.42;-1.2664417;45.4842563;110.24;"-2.1101542 45.1734415,-1.2664417 45.4842563" -"PELGAS11ACOU10 R11";"ACOU";"R11";"ACOU,R11";"PELGAS2011";"THALASSA II";2011-05-05 12:15:24;2011-05-05 12:15:24;2011-05-05 18:37:57;-2.2337705;45.3177255;20.26;-1.3832715;45.6668638;111.7;"-247948.5255 5030267.5305,-178599.9435 5058709.4823,-178591.7517 5058659.0328,-153543.1365 5069021.8818" -"PELGAS11ACOU10 R11 INTER";"ACOU";"IR2";"ACOU,IR2";"PELGAS2011";"THALASSA II";2011-05-05 19:24:45;2011-05-05 19:24:45;2011-05-05 12:15:23;-2.2337705;45.3177255;20.26;-1.3832715;45.6668638;111.7;"-1.3832715 45.6668638,-2.2337705 45.3177255" -"PELGAS11ACOU11 R11";"ACOU";"R11";"ACOU,R11";"PELGAS2011";"THALASSA II";2011-05-06 05:20:15;2011-05-06 05:20:15;2011-05-06 11:55:14;-3.0937067;44.9594945;114.11;-2.2337268;45.3153618;1365.1801;"-247943.6748 5030005.1598,-281918.2218 5016043.269,-343150.7613 4990607.1417,-343401.4437 4990503.8895" -"PELGAS11ACOU11 R11 INTER";"ACOU";"IR3";"ACOU,IR3";"PELGAS2011";"THALASSA II";2011-05-06 17:27:24;2011-05-06 17:27:24;2011-05-06 05:20:14;-3.0914483;44.9604247;114.11;-2.2337268;45.3153618;1364.49;"-3.0914483 44.9604247,-2.2337268 45.3153618" -"PELGAS11ACOU11 R12";"ACOU";"R12";"ACOU,R12";"PELGAS2011";"THALASSA II";2011-05-06 13:03:52;2011-05-06 13:03:52;2011-05-06 19:39:17;-3.2475483;45.1454645;119.88;-2.4787857;45.4457905;2729.8799;"-360477.8613 5011146.5595,-296833.4583 5035809.7272,-300379.1202 5034574.3083,-275145.2127 5044482.7455" -"PELGAS11ACOU11 R12 INTER";"ACOU";"IR4";"ACOU,IR4";"PELGAS2011";"THALASSA II";2011-05-06 16:44:52;2011-05-06 16:44:52;2011-05-06 13:03:51;-3.2475483;45.1454645;119.88;-2.4787857;45.4457905;2729.8799;"-2.4787857 45.4457905,-3.2475483 45.1454645" -"PELGAS11ACOU12 R12";"ACOU";"R12";"ACOU,R12";"PELGAS2011";"THALASSA II";2011-05-07 04:53:03;2011-05-07 04:53:03;2011-05-07 12:11:49;-2.4636673;45.452303;25.61;-1.4004587;45.8662893;119.72;"-155450.9157 5091158.1123,-198862.716 5074306.8693,-189533.277 5077924.4592,-273467.0703 5045205.633,-258699.5082 5055347.0592" -"PELGAS11ACOU12 R12 INTER";"ACOU";"IR5";"ACOU,IR5";"PELGAS2011";"THALASSA II";2011-05-07 21:26:01;2011-05-07 21:26:01;2011-05-07 04:53:02;-2.4636673;45.452303;25.61;-1.4004587;45.8662893;119.72;"-2.4636673 45.452303,-1.4004587 45.8662893" -"PELGAS11ACOU12 R13";"ACOU";"R13";"ACOU,R13";"PELGAS2011";"THALASSA II";2011-05-07 15:12:21;2011-05-07 15:12:21;2011-05-07 19:30:16;-3.3453677;45.3175975;112.98;-2.4792435;45.6733458;1135.91;"-275196.0285 5069741.3838,-371335.8147 5030253.3225" -"PELGAS11ACOU12 R13 INTER";"ACOU";"IR4";"ACOU,IR4";"PELGAS2011";"THALASSA II";2011-05-07 11:52:10;2011-05-07 11:52:10;2011-05-07 15:12:20;-3.3453677;45.3175975;112.98;-2.4792435;45.6733458;1135.91;"-3.3453677 45.3175975,-2.4792435 45.6733458" -"PELGAS11ACOU13 R13";"ACOU";"R13";"ACOU,R13";"PELGAS2011";"THALASSA II";2011-05-08 04:48:04;2011-05-08 04:48:04;2011-05-08 12:14:06;-2.4838502;45.6722523;22.96;-1.3982555;46.1206127;113.89;"-275707.3722 5069620.0053,-246403.2945 5081657.1783,-248144.3073 5080944.3807,-155437.8843 5118933.054,-155206.3605 5119388.0097" -"PELGAS11ACOU13 R13 INTER";"ACOU";"IR5";"ACOU,IR5";"PELGAS2011";"THALASSA II";2011-05-08 18:12:45;2011-05-08 18:12:45;2011-05-08 04:48:03;-2.4838502;45.6722523;33.22;-1.4003413;46.116514;113.89;"-1.4003413 46.116514,-2.4838502 45.6722523" -"PELGAS11ACOU14 R14";"ACOU";"R14";"ACOU,R14";"PELGAS2011";"THALASSA II";2011-05-08 13:28:30;2011-05-08 13:28:30;2011-05-08 19:53:09;-2.3733087;45.9443565;20.62;-1.6675123;46.2218185;93.87;"-185093.8653 5130621.8535,-248578.9278 5105890.4208,-248010.5745 5105927.0175,-263437.2657 5099823.5715" -"PELGAS11ACOU14 R14 INTER";"ACOU";"IR6";"ACOU,IR6";"PELGAS2011";"THALASSA II";2011-05-08 10:04:31;2011-05-08 10:04:31;2011-05-08 13:28:29;-2.3733087;45.9443565;20.62;-1.6675123;46.2218185;93.87;"-2.3733087 45.9443565,-1.6675123 46.2218185" -"PELGAS11ACOU15 R15";"ACOU";"R15";"ACOU,R15";"PELGAS2011";"THALASSA II";2011-05-10 11:00:01;2011-05-10 11:00:01;2011-05-10 17:37:14;-2.7187683;46.0486572;21.45;-1.768617;46.416191;108.96;"-196316.487 5152197.201,-217645.7808 5143851.5328,-301783.2813 5111400.9492" -"PELGAS11ACOU15 R15 INTER";"ACOU";"IR7";"ACOU,IR7";"PELGAS2011";"THALASSA II";2011-05-10 20:40:36;2011-05-10 20:40:36;2011-05-10 11:00:00;-2.7187683;46.0486572;21.45;-1.768617;46.416191;108.96;"-2.7187683 46.0486572,-1.768617 46.416191" -"PELGAS11ACOU16 R16";"ACOU";"R16";"ACOU,R16";"PELGAS2011";"THALASSA II";2011-05-11 04:54:31;2011-05-11 04:54:31;2011-05-11 11:42:45;-2.8446362;46.2215162;21.86;-1.9343963;46.5826543;114.41;"-214717.9893 5170674.6273,-270964.2645 5148599.691,-266110.5453 5150340.171,-315416.4567 5130721.3095,-315754.6182 5130588.2982" -"PELGAS11ACOU16 R16 INTER";"ACOU";"IR5";"ACOU,IR5";"PELGAS2011";"THALASSA II";2011-05-11 08:06:45;2011-05-11 08:06:45;2011-05-11 04:54:30;-2.8415897;46.2227145;21.86;-1.9343963;46.5826543;114.23;"-2.8415897 46.2227145,-1.9343963 46.5826543" -"PELGAS11ACOU16 R17";"ACOU";"R17";"ACOU,R17";"PELGAS2011";"THALASSA II";2011-05-11 12:56:47;2011-05-11 12:56:47;2011-05-11 18:38:47;-3.020193;46.3909268;24.28;-2.2942643;46.6769548;112.47;"-335241.423 5149392.8748,-317497.5513 5156389.782,-317576.9163 5156180.6913,-254663.3373 5181141.9828" -"PELGAS11ACOU16 R17 INTER";"ACOU";"IR6";"ACOU,IR6";"PELGAS2011";"THALASSA II";2011-05-11 13:50:57;2011-05-11 13:50:57;2011-05-11 12:56:46;-3.020193;46.3909268;24.28;-2.2942643;46.6769548;112.47;"-2.2942643 46.6769548,-3.020193 46.3909268" -"PELGAS11ACOU17 R14";"ACOU";"R14";"ACOU,R14";"PELGAS2011";"THALASSA II";2011-05-12 04:44:42;2011-05-12 04:44:42;2011-05-12 15:14:58;-3.5613315;45.472933;90.98;-2.375809;45.9441022;2122.8899;"-263714.799 5099795.3442,-298613.2545 5085928.8912,-298327.929 5085996.5013,-360138.0237 5061444.0117,-360055.5507 5061467.9877,-395307.7965 5047495.563" -"PELGAS11ACOU17 R14 INTER";"ACOU";"IR7";"ACOU,IR7";"PELGAS2011";"THALASSA II";2011-05-12 17:23:26;2011-05-12 17:23:26;2011-05-12 04:44:41;-3.5613315;45.472933;90.98;-2.375809;45.9441022;2122.8899;"-3.5613315 45.472933,-2.375809 45.9441022" -"PELGAS11ACOU17 R15";"ACOU";"R15";"ACOU,R15";"PELGAS2011";"THALASSA II";2011-05-12 16:28:50;2011-05-12 16:28:50;2011-05-12 19:23:15;-3.7000283;45.6577775;124.77;-3.068009;45.9098997;2654.3899;"-410703.1413 5068013.3025,-340548.999 5095998.8667" -"PELGAS11ACOU17 R15 INTER";"ACOU";"IR8";"ACOU,IR8";"PELGAS2011";"THALASSA II";2011-05-12 13:53:26;2011-05-12 13:53:26;2011-05-12 16:28:49;-3.7000283;45.6577775;124.77;-3.068009;45.9098997;2654.3899;"-3.068009 45.9098997,-3.7000283 45.6577775" -"PELGAS11ACOU18 R15";"ACOU";"R15";"ACOU,R15";"PELGAS2011";"THALASSA II";2011-05-13 05:39:58;2011-05-13 05:39:58;2011-05-13 09:18:26;-3.0679627;45.9078425;111.19;-2.7323825;46.224748;123.83;"-340543.8597 5095770.5175,-310626.5847 5107791.5178,-310604.1405 5107770.9828,-303294.4575 5110713.9147,-315100.362 5130947.028" -"PELGAS11ACOU18 R15 INTER";"ACOU";"IR11";"ACOU,IR11";"PELGAS2011";"THALASSA II";2011-05-13 15:56:57;2011-05-13 15:56:57;2011-05-13 05:39:57;-3.0679627;45.9078425;111.19;-2.7323825;46.0424677;123.83;"-2.7323825 46.0424677,-3.0679627 45.9078425" -"PELGAS11ACOU18 R16";"ACOU";"R16";"ACOU,R16";"PELGAS2011";"THALASSA II";2011-05-13 10:31:37;2011-05-13 10:31:37;2011-05-13 20:39:57;-4.5112322;45.5544652;114.65;-2.8469665;46.2212693;4291.8198;"-316013.2815 5130560.8923,-385209.8823 5102903.877,-384993.8763 5102945.4798,-500746.7742 5056545.6372" -"PELGAS11ACOU18 R16 INTER";"ACOU";"IR7";"ACOU,IR7";"PELGAS2011";"THALASSA II";2011-05-13 18:33:23;2011-05-13 18:33:23;2011-05-13 10:31:36;-4.5112322;45.5544652;114.65;-2.8469665;46.2212693;4291.8198;"-4.5112322 45.5544652,-2.8469665 46.2212693" -"PELGAS11ACOU19 R17";"ACOU";"R17";"ACOU,R17";"PELGAS2011";"THALASSA II";2011-05-14 04:48:15;2011-05-14 04:48:15;2011-05-14 12:21:44;-4.0666947;45.9706745;117.8;-3.0483095;46.3782127;1169.38;"-451403.1117 5102744.8695,-407369.7558 5120473.4787,-408394.086 5120022.2748,-338362.3545 5147981.6097" -"PELGAS11ACOU19 R17 INTER";"ACOU";"IR8";"ACOU,IR8";"PELGAS2011";"THALASSA II";2011-05-14 08:51:55;2011-05-14 08:51:55;2011-05-14 04:48:14;-4.0666947;45.9706745;117.8;-3.0483095;46.3782127;1169.38;"-3.0483095 46.3782127,-4.0666947 45.9706745" -"PELGAS11ACOU19 R18";"ACOU";"R18";"ACOU,R18";"PELGAS2011";"THALASSA II";2011-05-14 13:38:09;2011-05-14 13:38:09;2011-05-14 21:05:00;-4.2602293;46.1094557;119.03;-3.1596315;46.5555548;1040.03;"-350719.0965 5167666.5828,-454237.974 5125719.7938,-451516.8867 5126780.1657,-472885.4523 5118149.5827" -"PELGAS11ACOU19 R18 INTER";"ACOU";"IR9";"ACOU,IR9";"PELGAS2011";"THALASSA II";2011-05-14 17:27:07;2011-05-14 17:27:07;2011-05-14 13:38:08;-4.2602293;46.1094557;119.03;-3.1596315;46.5555548;1040.03;"-4.2602293 46.1094557,-3.1596315 46.5555548" -"PELGAS11ACOU2 R1";"ACOU";"R1";"ACOU,R1";"PELGAS2011";"THALASSA II";2011-04-27 04:58:54;2011-04-27 04:58:54;2011-04-27 09:37:42;-1.9994352;43.6660277;19.07;-1.4637168;43.6774175;659.66;"-221937.3072 4847009.2722,-190509.3888 4846929.0747,-199042.536 4847011.1703,-162758.4897 4847013.468,-162472.5648 4848193.3425" -"PELGAS11ACOU2 R1 INTER";"ACOU";"IR10";"ACOU,IR10";"PELGAS2011";"THALASSA II";2011-04-27 11:20:44;2011-04-27 11:20:44;2011-04-27 04:58:53;-1.9994352;43.6667502;34.16;-1.4662927;43.666788;659.66;"-1.4662927 43.666788,-1.9994352 43.6667502" -"PELGAS11ACOU2 R2";"ACOU";"R2";"ACOU,R2";"PELGAS2011";"THALASSA II";2011-04-27 10:55:25;2011-04-27 10:55:25;2011-04-27 19:24:44;-2.2218067;43.866659;15.18;-1.4174158;43.8676555;608.23;"-157333.1538 4869224.3127,-196027.3653 4869201.2802,-195766.1268 4869200.8473,-231685.7157 4869288.8037,-228277.0278 4869309.7605,-246620.5437 4869199.149" -"PELGAS11ACOU2 R2 INTER";"ACOU";"IR11";"ACOU,IR11";"PELGAS2011";"THALASSA II";2011-04-27 18:37:58;2011-04-27 18:37:58;2011-04-27 10:55:24;-2.2218067;43.866659;15.18;-1.4174158;43.8668857;608.23;"-2.2218067 43.866659,-1.4174158 43.8668857" -"PELGAS11ACOU20 R18";"ACOU";"R18";"ACOU,R18";"PELGAS2011";"THALASSA II";2011-05-15 05:52:36;2011-05-15 05:52:36;2011-05-15 11:32:23;-3.1585398;46.555119;24.96;-2.3916512;46.8616512;115.37;"-350597.9178 5167618.209,-332047.4757 5174977.9752,-336608.6433 5173126.5063,-265473.2832 5201643.2832" -"PELGAS11ACOU20 R18 INTER";"ACOU";"IR11";"ACOU,IR11";"PELGAS2011";"THALASSA II";2011-05-15 11:55:15;2011-05-15 11:55:15;2011-05-15 05:52:35;-3.1585398;46.555119;24.96;-2.3916512;46.8616512;115.37;"-2.3916512 46.8616512,-3.1585398 46.555119" -"PELGAS11ACOU20 R19";"ACOU";"R19";"ACOU,R19";"PELGAS2011";"THALASSA II";2011-05-15 15:30:08;2011-05-15 15:30:08;2011-05-15 19:25:00;-3.2598278;46.7425372;25.91;-2.4014232;47.0820422;110.24;"-266557.9752 5226106.6842,-361840.8858 5188421.6292" -"PELGAS11ACOU20 R19 INTER";"ACOU";"IR12";"ACOU,IR12";"PELGAS2011";"THALASSA II";2011-05-15 19:39:18;2011-05-15 19:39:18;2011-05-15 15:30:07;-3.2598278;46.7425372;25.91;-2.4014232;47.0820422;110.24;"-3.2598278 46.7425372,-2.4014232 47.0820422" -"PELGAS11ACOU21 R20";"ACOU";"R20";"ACOU,R20";"PELGAS2011";"THALASSA II";2011-05-16 04:49:47;2011-05-16 04:49:47;2011-05-16 15:08:47;-3.5983917;46.8518437;26.08;-2.582826;47.2456975;121.53;"-286693.686 5244272.4225,-330775.6155 5227251.738,-330788.7912 5227255.2123,-373812.2802 5210512.9713,-373486.9503 5210612.7825,-399421.4787 5200554.6507" -"PELGAS11ACOU21 R20 INTER";"ACOU";"IR12";"ACOU,IR12";"PELGAS2011";"THALASSA II";2011-05-16 12:11:50;2011-05-16 12:11:50;2011-05-16 04:49:46;-3.5983917;46.8518437;26.08;-2.582826;47.2456975;121.53;"-3.5983917 46.8518437,-2.582826 47.2456975" -"PELGAS11ACOU21 R21";"ACOU";"R21";"ACOU,R21";"PELGAS2011";"THALASSA II";2011-05-16 16:11:52;2011-05-16 16:11:52;2011-05-16 20:01:09;-3.7284735;47.0055988;24.65;-2.9297405;47.3280783;118.75;"-413860.5585 5217621.4668,-325201.1955 5253416.6913" -"PELGAS11ACOU21 R21 INTER";"ACOU";"IR13";"ACOU,IR13";"PELGAS2011";"THALASSA II";2011-05-16 19:30:17;2011-05-16 19:30:17;2011-05-16 16:11:51;-3.7284735;47.0055988;24.65;-2.9297405;47.3280783;118.75;"-2.9297405 47.3280783,-3.7284735 47.0055988" -"PELGAS11ACOU22 R22";"ACOU";"R22";"ACOU,R22";"PELGAS2011";"THALASSA II";2011-05-17 06:02:16;2011-05-17 06:02:16;2011-05-17 12:14:22;-3.9706292;47.0864012;26.49;-3.1976243;47.4986132;123.05;"-440739.8412 5226590.5332,-420881.6748 5237205.3855,-421077.3123 5237099.658,-354936.2973 5272346.0652" -"PELGAS11ACOU22 R22 INTER";"ACOU";"IR13";"ACOU,IR13";"PELGAS2011";"THALASSA II";2011-05-17 12:14:07;2011-05-17 12:14:07;2011-05-17 06:02:15;-3.9706292;47.0864012;26.49;-3.1976243;47.4986132;123.05;"-3.1976243 47.4986132,-3.9706292 47.0864012" -"PELGAS11ACOU22 R23";"ACOU";"R23";"ACOU,R23";"PELGAS2011";"THALASSA II";2011-05-17 14:04:26;2011-05-17 14:04:26;2011-05-17 19:22:18;-4.1219803;47.2123482;40.34;-3.485332;47.6080903;123.1;"-386871.852 5284498.0233,-405035.7477 5273291.6853,-405404.1012 5273045.4762,-457539.8133 5240570.6502" -"PELGAS11ACOU22 R23 INTER";"ACOU";"IR14";"ACOU,IR14";"PELGAS2011";"THALASSA II";2011-05-17 19:53:10;2011-05-17 19:53:10;2011-05-17 14:04:25;-4.1219803;47.2123482;40.34;-3.485332;47.6080903;123.1;"-4.1219803 47.2123482,-3.485332 47.6080903" -"PELGAS11ACOU23 R24";"ACOU";"R24";"ACOU,R24";"PELGAS2011";"THALASSA II";2011-05-18 04:58:59;2011-05-18 04:58:59;2011-05-18 12:26:00;-4.386967;47.2807187;32.75;-3.7479587;47.7525113;120.72;"-486953.337 5248159.7757,-444734.9643 5279462.0532,-449208.9192 5275976.3868,-427919.1858 5291844.2475,-433038.8943 5287845.5835,-416238.2007 5300309.3073,-416023.4157 5300528.7543" -"PELGAS11ACOU23 R24 INTER";"ACOU";"IR15";"ACOU,IR15";"PELGAS2011";"THALASSA II";2011-05-18 17:37:15;2011-05-18 17:37:15;2011-05-18 04:58:58;-4.386967;47.2807187;34.28;-3.7498937;47.7505343;120.72;"-3.7498937 47.7505343,-4.386967 47.2807187" -"PELGAS11ACOU23 R25";"ACOU";"R25";"ACOU,R25";"PELGAS2011";"THALASSA II";2011-05-18 14:12:22;2011-05-18 14:12:22;2011-05-18 19:35:00;-4.8450417;47.250681;37.69;-4.1950137;47.7554207;132.01;"-465646.5207 5300851.6977,-537799.6287 5244825.591,-527189.4495 5252222.2758" -"PELGAS11ACOU23 R25 INTER";"ACOU";"IR16";"ACOU,IR16";"PELGAS2011";"THALASSA II";2011-05-18 11:42:46;2011-05-18 11:42:46;2011-05-18 14:12:21;-4.7494545;47.3173178;37.69;-4.1950137;47.7554207;124.9;"-4.7494545 47.3173178,-4.1950137 47.7554207" -"PELGAS11ACOU24 R19";"ACOU";"R19";"ACOU,R19";"PELGAS2011";"THALASSA II";2011-05-20 07:52:02;2011-05-20 07:52:02;2011-05-20 20:13:48;-4.5703292;46.2206268;0;-3.2565782;46.7377905;1481.33;"-361480.1802 5187894.7455,-436112.6175 5158595.685,-431400.6453 5160450.0177,-479796.3345 5141368.152,-476149.3185 5142064.5993,-507306.5412 5130489.5748" -"PELGAS11ACOU24 R19 INTER";"ACOU";"IR17";"ACOU,IR17";"PELGAS2011";"THALASSA II";2011-05-20 18:38:48;2011-05-20 18:38:48;2011-05-20 07:52:01;-4.5703292;46.2206268;113.66;-3.2565782;46.7377905;1481.33;"-4.5703292 46.2206268,-3.2565782 46.7377905" -"PELGAS11ACOU24 R26";"ACOU";"R26";"ACOU,R26";"PELGAS2011";"THALASSA II";2011-05-19 05:32:38;2011-05-19 05:32:38;2011-05-19 08:33:49;-4.8982003;47.5014947;22.18;-4.3980712;47.8787453;127.47;"-543700.2333 5272665.9117,-488185.9032 5314540.7283" -"PELGAS11ACOU24 R26 INTER";"ACOU";"IR14";"ACOU,IR14";"PELGAS2011";"THALASSA II";2011-05-19 15:14:59;2011-05-19 15:14:59;2011-05-19 05:32:37;-4.8982003;47.5014947;22.18;-4.3980712;47.8787453;127.47;"-4.3980712 47.8787453,-4.8982003 47.5014947" -"PELGAS11ACOU24 R27";"ACOU";"R27";"ACOU,R27";"PELGAS2011";"THALASSA II";2011-05-19 10:24:26;2011-05-19 10:24:26;2011-05-19 16:17:29;-5.247379;47.5347388;28.48;-4.6504577;47.9887752;139.04;"-516200.8047 5326754.0472,-561324.4803 5292635.622,-560116.6782 5293531.6362,-582459.069 5276356.0068" -"PELGAS11ACOU24 R27 INTER";"ACOU";"IR15";"ACOU,IR15";"PELGAS2011";"THALASSA II";2011-05-19 19:23:16;2011-05-19 19:23:16;2011-05-19 10:24:25;-5.247379;47.5347388;28.48;-4.6504577;47.9887752;139.04;"-5.247379 47.5347388,-4.6504577 47.9887752" -"PELGAS11ACOU26 R20";"ACOU";"R20";"ACOU,R20";"PELGAS2011";"THALASSA II";2011-05-21 04:59:45;2011-05-21 04:59:45;2011-05-21 17:18:43;-5.3834533;46.1495033;120.63;-3.5942655;46.853256;4572.8901;"-398963.4705 5200711.416,-521146.0878 5152748.0385,-520492.4643 5152968.4512,-597563.3163 5122594.8663,-578501.6415 5142865.9527" -"PELGAS11ACOU26 R20 INTER";"ACOU";"IR15";"ACOU,IR15";"PELGAS2011";"THALASSA II";2011-05-21 09:18:27;2011-05-21 09:18:27;2011-05-21 04:59:44;-5.3834533;46.1495033;120.63;-3.5942655;46.853256;4572.8901;"-5.3834533 46.1495033,-3.5942655 46.853256" -"PELGAS11ACOU27 R22";"ACOU";"R22";"ACOU,R22";"PELGAS2011";"THALASSA II";2011-05-22 04:49:30;2011-05-22 04:49:30;2011-05-22 16:05:31;-5.0356435;46.512835;122.86;-3.9686522;47.0874403;1061.62;"-558956.4285 5162924.685,-545858.8725 5170171.3977,-545783.4702 5170026.6093,-469710.2307 5211435.5478,-475240.9167 5208069.1842,-440670.7437 5226624.699,-440520.3942 5226705.8733" -"PELGAS11ACOU27 R22 INTER";"ACOU";"IR16";"ACOU,IR16";"PELGAS2011";"THALASSA II";2011-05-22 20:39:58;2011-05-22 20:39:58;2011-05-22 04:49:29;-5.0356435;46.512835;122.98;-3.9700067;47.086709;1061.62;"-3.9700067 47.086709,-5.0356435 46.512835" -"PELGAS11ACOU28 R21";"ACOU";"R21";"ACOU,R21";"PELGAS2011";"THALASSA II";2011-05-22 17:08:38;2011-05-22 17:08:38;2011-05-22 18:28:16;-3.9882623;46.8997102;119.55;-3.7342713;47.0018593;131.85;"-414504.1143 5217206.3823,-442697.1153 5205867.8322" -"PELGAS11ACOU28 R21 INTER";"ACOU";"IR17";"ACOU,IR17";"PELGAS2011";"THALASSA II";2011-05-22 12:21:45;2011-05-22 12:21:45;2011-05-22 17:08:37;-3.9882623;46.8997102;119.55;-3.7342713;47.0018593;131.85;"-3.9882623 46.8997102,-3.7342713 47.0018593" -"PELGAS11ACOU29 R23";"ACOU";"R23";"ACOU,R23";"PELGAS2011";"THALASSA II";2011-05-24 10:35:03;2011-05-24 10:35:03;2011-05-24 11:29:08;-4.2840328;47.1110567;124.14;-4.1179995;47.2148075;136.37;"-457097.9445 5240843.6325,-475288.4913 5229469.6623,-475527.6408 5229327.2937" -"PELGAS11ACOU29 R23 INTER";"ACOU";"IR18";"ACOU,IR18";"PELGAS2011";"THALASSA II";2011-05-24 21:05:01;2011-05-24 21:05:01;2011-05-24 10:35:02;-4.2818783;47.1123393;124.14;-4.1179995;47.2148075;136.37;"-4.2818783 47.1123393,-4.1179995 47.2148075" -"PELGAS11ACOU29 R24";"ACOU";"R24";"ACOU,R24";"PELGAS2011";"THALASSA II";2011-05-24 12:37:35;2011-05-24 12:37:35;2011-05-24 17:05:25;-5.1339012;46.7232033;118.35;-4.3890627;47.2755443;915.62;"-487185.9597 5247585.4173,-569863.0332 5186275.5663" -"PELGAS11ACOU29 R24 INTER";"ACOU";"IR18";"ACOU,IR18";"PELGAS2011";"THALASSA II";2011-05-24 11:32:24;2011-05-24 11:32:24;2011-05-24 12:37:34;-5.1339012;46.7232033;118.35;-4.3890627;47.2755443;915.62;"-5.1339012 46.7232033,-4.3890627 47.2755443" -"PELGAS11ACOU3 R3";"ACOU";"R3";"ACOU,R3";"PELGAS2011";"THALASSA II";2011-04-28 04:56:38;2011-04-28 04:56:38;2011-04-28 17:27:23;-3.1666603;44.06588;19.23;-1.3623967;44.0668685;1998.28;"-351499.2933 4891369.9005,-324133.2645 4891420.8828,-328385.6745 4891406.7525,-202250.991 4891312.68,-210728.8158 4891422.4035,-151226.0337 4891366.1043" -"PELGAS11ACOU3 R3 INTER";"ACOU";"IR19";"ACOU,IR19";"PELGAS2011";"THALASSA II";2011-04-28 19:25:01;2011-04-28 19:25:01;2011-04-28 04:56:37;-3.1666603;44.0663613;19.23;-1.3623967;44.0663955;1998.28;"-1.3623967 44.0663613,-3.1666603 44.0663955" -"PELGAS11ACOU30 R25";"ACOU";"R25";"ACOU,R25";"PELGAS2011";"THALASSA II";2011-05-25 04:18:10;2011-05-25 04:18:10;2011-05-25 10:43:17;-5.4379397;46.7870808;125.64;-4.8067988;47.2807862;1469.36;"-533554.6668 5248167.2682,-582370.6575 5210018.4552,-582276.2187 5210100.7728,-603483.7122 5193461.2068,-603611.3067 5193365.9688" -"PELGAS11ACOU30 R25 INTER";"ACOU";"IR20";"ACOU,IR20";"PELGAS2011";"THALASSA II";2011-05-25 15:08:48;2011-05-25 15:08:48;2011-05-25 04:18:09;-5.4367902;46.7879388;125.64;-4.8067988;47.2807862;1456.13;"-5.4367902 46.7879388,-4.8067988 47.2807862" -"PELGAS11ACOU30 R26";"ACOU";"R26";"ACOU,R26";"PELGAS2011";"THALASSA II";2011-05-25 11:58:04;2011-05-25 11:58:04;2011-05-25 19:02:35;-5.5883138;46.9793158;80.38;-4.981538;47.438879;1250.8101;"-620302.8318 5214704.0538,-608971.5855 5223160.6443,-608952.0717 5223205.6548,-608761.074 5223372.4323,-603175.1877 5227596.2043,-552950.718 5265715.569" -"PELGAS11ACOU30 R26 INTER";"ACOU";"IR21";"ACOU,IR21";"PELGAS2011";"THALASSA II";2011-05-25 20:01:10;2011-05-25 20:01:10;2011-05-25 11:58:03;-5.5883138;46.9793158;130.05;-4.981538;47.438879;1250.8101;"-4.981538 47.438879,-5.5883138 46.9793158" -"PELGAS11ACOU32 R11";"ACOU";"R11";"ACOU,R11";"PELGAS2011";"THALASSA II";2011-05-26 18:07:16;2011-05-26 18:07:16;2011-05-26 19:55:23;-1.7516713;45.5161303;19.22;-1.3833945;45.6664452;62.93;"-153556.7895 5068975.4172,-194435.5143 5052290.4633" -"PELGAS11ACOU32 R11 INTER";"ACOU";"IR22";"ACOU,IR22";"PELGAS2011";"THALASSA II";2011-05-26 12:14:23;2011-05-26 12:14:23;2011-05-26 18:07:15;-1.7516713;45.5161303;19.22;-1.3833945;45.6664452;62.93;"-1.7516713 45.5161303,-1.3833945 45.6664452" -"PELGAS11ACOU32 R12";"ACOU";"R12";"ACOU,R12";"PELGAS2011";"THALASSA II";2011-05-26 14:28:56;2011-05-26 14:28:56;2011-05-26 16:54:22;-1.8897495;45.6761667;18.77;-1.3716917;45.8772357;69.6;"-209762.1945 5070054.5037,-152599.2147 5092244.3472,-152257.7787 5092373.1627" -"PELGAS11ACOU32 R12 INTER";"ACOU";"IR23";"ACOU,IR23";"PELGAS2011";"THALASSA II";2011-05-26 19:22:19;2011-05-26 19:22:19;2011-05-26 14:28:55;-1.8897495;45.6761667;18.87;-1.3747677;45.8760752;69.6;"-1.3747677 45.8760752,-1.8897495 45.6761667" -"PELGAS11ACOU38 R6";"ACOU";"R6";"ACOU,R6";"PELGAS2011";"THALASSA II";2011-06-02 04:09:02;2011-06-02 04:09:02;2011-06-02 05:29:24;-1.6803622;44.6663613;40.72;-1.3732148;44.666757;99.78;"-186520.2042 4957966.1043,-152426.8428 4958010.027" -"PELGAS11ACOU38 R6 INTER";"ACOU";"IR24";"ACOU,IR24";"PELGAS2011";"THALASSA II";2011-06-02 12:26:01;2011-06-02 12:26:01;2011-06-02 04:09:01;-1.6803622;44.6663613;40.72;-1.3732148;44.666757;99.78;"-1.3732148 44.666757,-1.6803622 44.6663613" -"PELGAS11ACOU4 R4";"ACOU";"R4";"ACOU,R4";"PELGAS2011";"THALASSA II";2011-04-29 04:58:07;2011-04-29 04:58:07;2011-04-29 16:44:51;-2.1317277;44.2662063;0;-1.3279635;44.267396;127.15;"-147403.9485 4913680.956,-176811.4782 4913548.8993,-170762.4 4913605.365,-197930.205 4913613.3015,-194469.7023 4913583.5313,-210448.4742 4913597.4285,-212234.6418 4913581.5777,-236621.7747 4913581.7997" -"PELGAS11ACOU4 R4 INTER";"ACOU";"IR25";"ACOU,IR25";"PELGAS2011";"THALASSA II";2011-04-29 19:35:01;2011-04-29 19:35:01;2011-04-29 04:58:06;-2.1317277;44.2665027;0;-1.3279635;44.267396;21.68;"-2.1317277 44.2665027,-1.3279635 44.267396" -"PELGAS11ACOU4 R5";"ACOU";"R5";"ACOU,R5";"PELGAS2011";"THALASSA II";2011-04-29 18:00:22;2011-04-29 18:00:22;2011-04-29 21:26:00;-2.1141027;44.4653288;25.61;-1.3180702;44.468435;627.82;"-234665.3997 4935651.4968,-146305.7922 4935996.285" -"PELGAS11ACOU4 R5 INTER";"ACOU";"IR26";"ACOU,IR26";"PELGAS2011";"THALASSA II";2011-04-29 08:33:50;2011-04-29 08:33:50;2011-04-29 18:00:21;-2.1141027;44.4653288;25.61;-1.3180702;44.468435;627.82;"-1.3180702 44.468435,-2.1141027 44.4653288" -"PELGAS11ACOU5 R4";"ACOU";"R4";"ACOU,R4";"PELGAS2011";"THALASSA II";2011-04-30 06:02:08;2011-04-30 06:02:08;2011-04-30 11:52:09;-2.9732542;44.2665747;658.41;-2.1224753;44.2693727;1481.34;"-251793.4212 4913708.6727,-254156.3892 4913900.3697,-235594.7583 4913694.4092,-282425.9913 4913589.7917,-282294.5118 4913614.3782,-329666.781 4913594.4315,-330031.2162 4913615.9655" -"PELGAS11ACOU5 R4 INTER";"ACOU";"IR27";"ACOU,IR27";"PELGAS2011";"THALASSA II";2011-04-30 16:17:30;2011-04-30 16:17:30;2011-04-30 06:02:07;-2.969971;44.2666165;658.41;-2.1224753;44.2675172;1476.99;"-2.969971 44.2666165,-2.1224753 44.2675172" -"PELGAS11ACOU5 R5";"ACOU";"R5";"ACOU,R5";"PELGAS2011";"THALASSA II";2011-04-30 13:36:19;2011-04-30 13:36:19;2011-04-30 18:12:44;-2.9673618;44.4664985;125.44;-1.8993217;44.467279;1519.71;"-329377.1598 4935867.969,-210824.7087 4935781.3335" -"PELGAS11ACOU5 R5 INTER";"ACOU";"IR19";"ACOU,IR19";"PELGAS2011";"THALASSA II";2011-04-30 20:13:49;2011-04-30 20:13:49;2011-04-30 13:36:18;-2.9673618;44.4664985;125.44;-1.8993217;44.467279;1519.71;"-1.8993217 44.4664985,-2.9673618 44.467279" -"PELGAS11ACOU6 R6";"ACOU";"R6";"ACOU,R6";"PELGAS2011";"THALASSA II";2011-05-01 05:06:14;2011-05-01 05:06:14;2011-05-01 10:04:30;-2.9994072;44.6664743;115.27;-1.8239947;44.6666763;2118.3401;"-332934.1992 4957978.6473,-202463.4117 4958001.0693" -"PELGAS11ACOU6 R6 INTER";"ACOU";"IR20";"ACOU,IR20";"PELGAS2011";"THALASSA II";2011-05-01 17:18:44;2011-05-01 17:18:44;2011-05-01 05:06:13;-2.9994072;44.6664743;115.27;-1.8239947;44.6666763;2118.3401;"-1.8239947 44.6666763,-2.9994072 44.6664743" -"PELGAS11ACOU6 R7";"ACOU";"R7";"ACOU,R7";"PELGAS2011";"THALASSA II";2011-05-01 13:25:40;2011-05-01 13:25:40;2011-05-01 20:40:35;-2.8760417;44.8662198;104.61;-1.8239483;44.866747;3293.1499;"-202458.2613 4980178.8138,-252209.871 4980150.3978,-249449.8893 4980187.4607,-275315.8863 4980156.2142,-273218.4303 4980208.917,-319240.6287 4980196.6293" -"PELGAS11ACOU6 R7 INTER";"ACOU";"IR22";"ACOU,IR22";"PELGAS2011";"THALASSA II";2011-05-01 16:05:32;2011-05-01 16:05:32;2011-05-01 13:25:39;-2.8760417;44.8664758;104.61;-1.8239483;44.8666363;3293.1499;"-2.8760417 44.8666363,-1.8239483 44.8664758" -"PELGAS11ACOU7 R5";"ACOU";"R5";"ACOU,R5";"PELGAS2011";"THALASSA II";2011-05-02 06:06:06;2011-05-02 06:06:06;2011-05-02 08:06:44;-1.766431;44.4665327;26.45;-1.2992477;44.466638;114.54;"-196073.841 4935785.1297,-144216.4947 4935796.818,-144216.4947 4935796.818" -"PELGAS11ACOU7 R5 INTER";"ACOU";"IR21";"ACOU,IR21";"PELGAS2011";"THALASSA II";2011-05-02 18:28:17;2011-05-02 18:28:17;2011-05-02 06:06:05;-1.766431;44.4665327;26.45;-1.2992477;44.466638;114.54;"-1.2992477 44.466638,-1.766431 44.4665327" -"PELGAS11ACOU7 R6";"ACOU";"R6";"ACOU,R6";"PELGAS2011";"THALASSA II";2011-05-02 09:19:49;2011-05-02 09:19:49;2011-05-02 13:50:56;-1.8297293;44.6664682;25.5;-1.3321523;44.6666962;126.76;"-147868.9053 4958003.2782,-179215.383 4957977.9702,-179220.5667 4958002.3458,-203099.9523 4957996.8513" -"PELGAS11ACOU7 R6 INTER";"ACOU";"IR23";"ACOU,IR23";"PELGAS2011";"THALASSA II";2011-05-02 11:29:09;2011-05-02 11:29:09;2011-05-02 09:19:48;-1.8297293;44.6666383;25.5;-1.3321523;44.6666962;126.76;"-1.8297293 44.6666383,-1.3321523 44.6666962" -"PELGAS11ACOU7 R7";"ACOU";"R7";"ACOU,R7";"PELGAS2011";"THALASSA II";2011-05-02 15:00:54;2011-05-02 15:00:54;2011-05-02 17:23:25;-1.8211908;44.8666957;26.4;-1.2653502;44.8674132;110.73;"-202152.1788 4980282.8652,-140453.8722 4980203.2227" -"PELGAS11ACOU7 R7 INTER";"ACOU";"IR24";"ACOU,IR24";"PELGAS2011";"THALASSA II";2011-05-02 17:05:26;2011-05-02 17:05:26;2011-05-02 15:00:53;-1.8211908;44.8666957;26.4;-1.2653502;44.8674132;110.73;"-1.2653502 44.8666957,-1.8211908 44.8674132" -"PELGAS11ACOU8 R11";"ACOU";"R11";"ACOU,R11";"PELGAS2011";"THALASSA II";2011-05-03 14:09:22;2011-05-03 14:09:22;2011-05-03 15:56:56;-3.420752;44.8300903;2571.03;-3.0503435;44.977349;3548.49;"-338588.1285 4992485.739,-379703.472 4976140.0233" -"PELGAS11ACOU8 R11 INTER";"ACOU";"IR25";"ACOU,IR25";"PELGAS2011";"THALASSA II";2011-05-03 10:43:18;2011-05-03 10:43:18;2011-05-03 14:09:21;-3.420752;44.8300903;2571.03;-3.0503435;44.977349;3548.49;"-3.420752 44.8300903,-3.0503435 44.977349" -"PELGAS11ACOU8 R7";"ACOU";"R7";"ACOU,R7";"PELGAS2011";"THALASSA II";2011-05-03 16:20:02;2011-05-03 16:20:02;2011-05-03 18:33:22;-3.5046453;44.8416012;0;-2.9996975;44.8668652;3297.05;"-389015.6283 4977417.7332,-332966.4225 4980222.0372" -"PELGAS11ACOU8 R7 INTER";"ACOU";"IR26";"ACOU,IR26";"PELGAS2011";"THALASSA II";2011-05-03 19:02:36;2011-05-03 19:02:36;2011-05-03 16:20:01;-3.5046453;44.8416012;0;-2.9996975;44.8668652;3297.05;"-2.9996975 44.8668652,-3.5046453 44.8416012" -"PELGAS11ACOU8 R8";"ACOU";"R8";"ACOU,R8";"PELGAS2011";"THALASSA II";2011-05-03 04:57:18;2011-05-03 04:57:18;2011-05-03 13:53:25;-3.027619;44.9799743;120.19;-2.1675502;45.0213567;3011.53;"-240598.0722 4997370.5937,-256929.1137 4996594.626,-257510.1987 4996594.4373,-290405.3262 4995001.3542,-288358.0977 4995195.8928,-336065.709 4992777.1473" -"PELGAS11ACOU8 R8 INTER";"ACOU";"IR12";"ACOU,IR12";"PELGAS2011";"THALASSA II";2011-05-03 16:54:23;2011-05-03 16:54:23;2011-05-03 04:57:17;-3.027619;44.9799743;120.19;-2.1675502;45.0213567;3011.53;"-3.027619 44.9799743,-2.1675502 45.0213567" -"PELGAS11ACOU9 R8";"ACOU";"R8";"ACOU,R8";"PELGAS2011";"THALASSA II";2011-05-04 04:56:02;2011-05-04 04:56:02;2011-05-04 08:51:54;-2.164314;45.022488;23.96;-1.2373228;45.0673303;112.28;"-240238.854 4997496.168,-137433.0405 5002464.0507,-137342.8308 5002473.6633" -"PELGAS11ACOU9 R8 INTER";"ACOU";"IR11";"ACOU,IR11";"PELGAS2011";"THALASSA II";2011-05-04 19:55:24;2011-05-04 19:55:24;2011-05-04 04:56:01;-2.164314;45.022488;23.96;-1.2381355;45.0672437;112.28;"-1.2381355 45.0672437,-2.164314 45.022488" -"PELGAS11ACOU9 R9";"ACOU";"R9";"ACOU,R9";"PELGAS2011";"THALASSA II";2011-05-04 10:08:24;2011-05-04 10:08:24;2011-05-04 17:27:06;-2.4242678;45.1445283;24.32;-1.2332327;45.2665267;129.61;"-136888.8297 5024584.4637,-246725.0835 5013709.6383,-244458.8742 5013902.4453,-269093.7258 5011042.6413" -"PELGAS11ACOU9 R9 INTER";"ACOU";"IR6";"ACOU,IR6";"PELGAS2011";"THALASSA II";2011-05-04 05:29:25;2011-05-04 05:29:25;2011-05-04 10:08:23;-2.4242678;45.1445283;24.32;-1.2332327;45.2665267;129.61;"-2.4242678 45.1445283,-1.2332327 45.2665267" -"PELGAS11EROC1 CLA";"EROC";"CLA";"EROC,P0520,CLA";"PELGAS2011";"THALASSA II";2011-05-27 06:36:38;2011-05-27 06:36:38;2011-05-27 10:45:43;-1.7051928;45.6287712;47.93;-1.6030455;45.7466023;54.81;"-177938.0505 5064793.6032,-181147.8597 5067672.7545,-189276.4008 5077872.8553,-189276.4008 5077872.8553" -"PELGAS11EROC2 CLA";"EROC";"CLA";"EROC,P0532,CLA";"PELGAS2011";"THALASSA II";2011-05-28 07:22:31;2011-05-28 07:22:31;2011-05-28 10:16:59;-1.9531582;45.6530785;68.27;-1.8847635;45.6782977;76.51;"-210327.9393 5069912.346,-209208.7485 5070291.0447,-216008.6418 5067722.1828,-216800.5602 5067491.7135" -"PELGAS11EROC3 CLA";"EROC";"CLA";"EROC,P0534,CLA";"PELGAS2011";"THALASSA II";2011-05-28 13:50:25;2011-05-28 13:50:25;2011-05-28 16:04:51;-1.9438285;45.6615378;68.41;-1.8882333;45.6700548;74.91;"-212086.0017 5069342.6607,-215764.9635 5068430.6958,-210065.6685 5069154.0717,-209920.8468 5069224.257,-209593.8963 5069376.0828" -"PELGAS11EROC4 CLA";"EROC";"CLA";"EROC,P0543,CLA";"PELGAS2011";"THALASSA II";2011-05-30 06:20:47;2011-05-30 06:20:47;2011-05-30 10:10:04;-2.0651073;43.9632077;159.56;-2.0627047;43.985432;162.36;"-229191.2127 4879916.0547,-229226.9103 4881003.1665,-229182.1995 4881378.9348,-228960.2217 4882382.952" -"PELGAS11MIK1 20m";"MIK";"20m";"MIK,P0411,20m";"PELGAS2011";"THALASSA II";2011-05-03 19:51:15;2011-05-03 19:51:15;2011-05-03 20:17:53;-2.9470932;44.9855488;2301.3;-2.9334153;44.9943712;2484.02;"-325609.0983 4993395.9168,-325763.4438 4993491.3102,-326303.5698 4993844.157,-327127.3452 4994375.2032" -"PELGAS11MIK6 35m";"MIK";"35m";"MIK,P0541,35m";"PELGAS2011";"THALASSA II";2011-05-29 12:29:39;2011-05-29 12:29:39;2011-05-29 13:00:00;-1.9090545;45.4555172;0;-1.8934698;45.4679335;78.8;"-211905.0495 5045562.4092,-211476.0678 5045907.3528,-210662.349 5046564.939,-210175.1478 5046940.6185" -"PELGAS11MIK7 70m";"MIK";"70m";"MIK,P0541,70m";"PELGAS2011";"THALASSA II";2011-05-29 13:59:58;2011-05-29 13:59:58;2011-05-29 14:23:26;-1.8639282;45.4906073;72.23;-1.8497893;45.4966815;73.07;"-206896.0302 5049457.4103,-206474.5965 5049669.1428,-205326.6123 5050131.6465" -"PELGAS11MIK8 40m";"MIK";"40m";"MIK,P0558,40m";"PELGAS2011";"THALASSA II";2011-06-01 13:28:58;2011-06-01 13:28:58;2011-06-01 13:52:32;-1.8715918;44.2866148;130.12;-1.8712855;44.2995695;131.01;"-207712.6905 4915814.2428,-207720.9267 4916045.9442,-207746.6898 4917252.2145" Added: trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/commonData/transect.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,4 +0,0 @@ -"voyageName";"description";"startTime";"endTime";"startLocality";"endLocality" -"PELGAS2011";"PELGAS11CAMP1";"26/04/2011 08:00:01";"08/05/2011 20:00:00";"Santander";"La Rochelle" -"PELGAS2011";"PELGAS11CAMP2";"10/05/2011 07:36:45";"23/05/2011 08:00:00";"La Rochelle";"Lorient" -"PELGAS2011";"PELGAS11CAMP3";"24/05/2011 08:00:00";"04/06/2011 17:00:00";"Lorient";"Concarneau" Added: trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/commonData/transit.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,2 +0,0 @@ -"name";"startDate";"endDate";"startPort";"endPort" -"PELGAS2011";"26/04/2011";"04/06/2011";"Santander";"Concarneau" Added: trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/commonData/voyage.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,918 +0,0 @@ -"vesselName";"operationID";"gearCode";"metadataType";"gearMetadataValue" -"THALASSA II";"P0422";"57x52";"CableLength";31.6666666666667 -"THALASSA II";"P0405";"57x52";"CableLength";14.5 -"THALASSA II";"P0443";"57x52";"CableLength";35.5 -"THALASSA II";"P0550";"57x52 ENROL";"CableLength";96.25 -"THALASSA II";"P0540";"57x52 ENROL";"CableLength";52.25 -"THALASSA II";"P0522";"57x52 ENROL";"CableLength";129 -"THALASSA II";"P0557";"57x52 ENROL";"CableLength";130.5 -"THALASSA II";"P0559";"57x52 ENROL";"CableLength";97.75 -"THALASSA II";"P0561";"57x52 ENROL";"CableLength";71.5714285714286 -"THALASSA II";"P0542";"57x52 ENROL";"CableLength";123.75 -"Etoile Polaire_3";"P5062";"PS";"CableLength";NA -"Etoile Polaire_3";"P5063";"PS";"CableLength";NA -"THALASSA II";"P0372";"76x70";"CableLength";20.8333333333333 -"THALASSA II";"P0377";"76x70";"CableLength";111.833333333333 -"THALASSA II";"P0378";"76x70";"CableLength";106.166666666667 -"THALASSA II";"P0379";"76x70";"CableLength";106.5 -"THALASSA II";"P0383";"76x70";"CableLength";26.5 -"THALASSA II";"P0384";"76x70";"CableLength";106.333333333333 -"THALASSA II";"P0385";"76x70";"CableLength";80 -"THALASSA II";"P0389";"76x70";"CableLength";38.3333333333333 -"THALASSA II";"P0390";"76x70";"CableLength";67.8333333333333 -"THALASSA II";"P0395";"76x70";"CableLength";66.5 -"THALASSA II";"P0396";"76x70";"CableLength";106.666666666667 -"THALASSA II";"P0399";"76x70";"CableLength";110.666666666667 -"THALASSA II";"P0400";"76x70";"CableLength";20.6666666666667 -"THALASSA II";"P0404";"76x70";"CableLength";37.5 -"THALASSA II";"P0512";"76x70";"CableLength";0 -"THALASSA II";"P0409";"76x70";"CableLength";105.166666666667 -"THALASSA II";"P0410";"76x70";"CableLength";45 -"THALASSA II";"P0417";"76x70";"CableLength";109.333333333333 -"THALASSA II";"P0455";"76x70";"CableLength";121 -"THALASSA II";"P0423";"76x70";"CableLength";34.6666666666667 -"THALASSA II";"P0429";"76x70";"CableLength";121.333333333333 -"THALASSA II";"P0430";"76x70";"CableLength";115.5 -"THALASSA II";"P0435";"76x70";"CableLength";24 -"THALASSA II";"P0436";"76x70";"CableLength";100.666666666667 -"THALASSA II";"P0441";"76x70";"CableLength";61.3333333333333 -"THALASSA II";"P0442";"76x70";"CableLength";50.8333333333333 -"THALASSA II";"P0479";"76x70";"CableLength";66.3333333333333 -"THALASSA II";"P0444";"76x70";"CableLength";26 -"THALASSA II";"P0449";"76x70";"CableLength";37.1666666666667 -"THALASSA II";"P0450";"76x70";"CableLength";112.666666666667 -"THALASSA II";"P0454";"76x70";"CableLength";68.6666666666667 -"THALASSA II";"P0493";"76x70";"CableLength";118.666666666667 -"THALASSA II";"P0460";"76x70";"CableLength";96.8333333333333 -"THALASSA II";"P0461";"76x70";"CableLength";125.5 -"THALASSA II";"P0463";"76x70";"CableLength";140.166666666667 -"THALASSA II";"P0464";"76x70";"CableLength";142.333333333333 -"THALASSA II";"P0468";"76x70";"CableLength";49 -"THALASSA II";"P0473";"76x70";"CableLength";36 -"THALASSA II";"P0474";"76x70";"CableLength";57.6666666666667 -"THALASSA II";"P0510";"76x70";"CableLength";133.666666666667 -"THALASSA II";"P0480";"76x70";"CableLength";43.1666666666667 -"THALASSA II";"P0484";"76x70";"CableLength";75 -"THALASSA II";"P0485";"76x70";"CableLength";103 -"THALASSA II";"P0489";"76x70";"CableLength";88 -"THALASSA II";"P0535";"76x70";"CableLength";40.8333333333333 -"THALASSA II";"P0494";"76x70";"CableLength";50.5 -"THALASSA II";"P0495";"76x70";"CableLength";138.5 -"THALASSA II";"P0500";"76x70";"CableLength";174.166666666667 -"THALASSA II";"P0501";"76x70";"CableLength";109.375 -"THALASSA II";"P0505";"76x70";"CableLength";78.6666666666667 -"THALASSA II";"P0506";"76x70";"CableLength";116.333333333333 -"THALASSA II";"P0509";"76x70";"CableLength";83.1666666666667 -"THALASSA II";"P0523";"76x70";"CableLength";28.8333333333333 -"THALASSA II";"P0511";"76x70";"CableLength";67.5 -"THALASSA II";"P0563";"76x70";"CableLength";34.8333333333333 -"THALASSA II";"P0554";"76x70";"CableLength";25.1666666666667 -"THALASSA II";"P0545";"76x70";"CableLength";53.6666666666667 -"THALASSA II";"P0553";"76x70";"CableLength";58.8333333333333 -"Arlequin2 / la colombine";"P5001";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5002";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5003";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5004";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5005";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5006";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5007";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5008";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5009";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5010";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5011";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5012";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5013";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5014";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5015";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5016";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5017";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5018";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5019";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5020";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5021";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5022";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5023";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5024";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5025";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5026";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5027";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5028";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5029";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5030";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5031";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5032";"PTM";"CableLength";NA -"Arlequin2 / la colombine";"P5033";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5034";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5035";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5036";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5037";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5038";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5039";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5040";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5041";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5042";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5043";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5044";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5045";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5046";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5047";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5048";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5049";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5050";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5051";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5052";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5053";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5054";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5055";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5056";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5057";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5058";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5059";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5060";"PTM";"CableLength";NA -"Jeremi-Simon / Promethee";"P5061";"PTM";"CableLength";NA -"THALASSA II";"P0422";"57x52";"MinSpeed";1.57 -"THALASSA II";"P0405";"57x52";"MinSpeed";2.03 -"THALASSA II";"P0443";"57x52";"MinSpeed";3.06 -"THALASSA II";"P0550";"57x52 ENROL";"MinSpeed";3.73 -"THALASSA II";"P0540";"57x52 ENROL";"MinSpeed";3.36 -"THALASSA II";"P0522";"57x52 ENROL";"MinSpeed";3.92 -"THALASSA II";"P0557";"57x52 ENROL";"MinSpeed";3.34 -"THALASSA II";"P0559";"57x52 ENROL";"MinSpeed";1.05 -"THALASSA II";"P0561";"57x52 ENROL";"MinSpeed";3.24 -"THALASSA II";"P0542";"57x52 ENROL";"MinSpeed";3.25 -"Etoile Polaire_3";"P5062";"PS";"MinSpeed";Inf -"Etoile Polaire_3";"P5063";"PS";"MinSpeed";Inf -"THALASSA II";"P0372";"76x70";"MinSpeed";2.97 -"THALASSA II";"P0377";"76x70";"MinSpeed";2.66 -"THALASSA II";"P0378";"76x70";"MinSpeed";3.02 -"THALASSA II";"P0379";"76x70";"MinSpeed";2.74 -"THALASSA II";"P0383";"76x70";"MinSpeed";2.94 -"THALASSA II";"P0384";"76x70";"MinSpeed";3.34 -"THALASSA II";"P0385";"76x70";"MinSpeed";3.48 -"THALASSA II";"P0389";"76x70";"MinSpeed";3.03 -"THALASSA II";"P0390";"76x70";"MinSpeed";3.21 -"THALASSA II";"P0395";"76x70";"MinSpeed";3.01 -"THALASSA II";"P0396";"76x70";"MinSpeed";2.82 -"THALASSA II";"P0399";"76x70";"MinSpeed";3.1 -"THALASSA II";"P0400";"76x70";"MinSpeed";3.04 -"THALASSA II";"P0404";"76x70";"MinSpeed";3.02 -"THALASSA II";"P0512";"76x70";"MinSpeed";7.32 -"THALASSA II";"P0409";"76x70";"MinSpeed";2.52 -"THALASSA II";"P0410";"76x70";"MinSpeed";3.13 -"THALASSA II";"P0417";"76x70";"MinSpeed";2.22 -"THALASSA II";"P0455";"76x70";"MinSpeed";2.41 -"THALASSA II";"P0423";"76x70";"MinSpeed";3.05 -"THALASSA II";"P0429";"76x70";"MinSpeed";2.54 -"THALASSA II";"P0430";"76x70";"MinSpeed";2.65 -"THALASSA II";"P0435";"76x70";"MinSpeed";1.58 -"THALASSA II";"P0436";"76x70";"MinSpeed";2.6 -"THALASSA II";"P0441";"76x70";"MinSpeed";2.59 -"THALASSA II";"P0442";"76x70";"MinSpeed";2.75 -"THALASSA II";"P0479";"76x70";"MinSpeed";3.1 -"THALASSA II";"P0444";"76x70";"MinSpeed";2.35 -"THALASSA II";"P0449";"76x70";"MinSpeed";2.62 -"THALASSA II";"P0450";"76x70";"MinSpeed";3.86 -"THALASSA II";"P0454";"76x70";"MinSpeed";2.53 -"THALASSA II";"P0493";"76x70";"MinSpeed";2.87 -"THALASSA II";"P0460";"76x70";"MinSpeed";2.75 -"THALASSA II";"P0461";"76x70";"MinSpeed";1.74 -"THALASSA II";"P0463";"76x70";"MinSpeed";3.31 -"THALASSA II";"P0464";"76x70";"MinSpeed";3.06 -"THALASSA II";"P0468";"76x70";"MinSpeed";2.83 -"THALASSA II";"P0473";"76x70";"MinSpeed";3.18 -"THALASSA II";"P0474";"76x70";"MinSpeed";3.41 -"THALASSA II";"P0510";"76x70";"MinSpeed";3.57 -"THALASSA II";"P0480";"76x70";"MinSpeed";2.64 -"THALASSA II";"P0484";"76x70";"MinSpeed";3.79 -"THALASSA II";"P0485";"76x70";"MinSpeed";1.11 -"THALASSA II";"P0489";"76x70";"MinSpeed";2.38 -"THALASSA II";"P0535";"76x70";"MinSpeed";3.04 -"THALASSA II";"P0494";"76x70";"MinSpeed";3.23 -"THALASSA II";"P0495";"76x70";"MinSpeed";3.52 -"THALASSA II";"P0500";"76x70";"MinSpeed";2.75 -"THALASSA II";"P0501";"76x70";"MinSpeed";3.18 -"THALASSA II";"P0505";"76x70";"MinSpeed";3.49 -"THALASSA II";"P0506";"76x70";"MinSpeed";2.55 -"THALASSA II";"P0509";"76x70";"MinSpeed";3.08 -"THALASSA II";"P0523";"76x70";"MinSpeed";2.84 -"THALASSA II";"P0511";"76x70";"MinSpeed";2.81 -"THALASSA II";"P0563";"76x70";"MinSpeed";2.71 -"THALASSA II";"P0554";"76x70";"MinSpeed";2.81 -"THALASSA II";"P0545";"76x70";"MinSpeed";3.4 -"THALASSA II";"P0553";"76x70";"MinSpeed";2.65 -"Arlequin2 / la colombine";"P5001";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5002";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5003";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5004";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5005";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5006";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5007";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5008";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5009";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5010";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5011";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5012";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5013";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5014";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5015";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5016";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5017";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5018";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5019";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5020";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5021";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5022";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5023";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5024";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5025";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5026";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5027";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5028";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5029";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5030";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5031";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5032";"PTM";"MinSpeed";Inf -"Arlequin2 / la colombine";"P5033";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5034";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5035";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5036";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5037";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5038";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5039";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5040";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5041";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5042";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5043";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5044";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5045";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5046";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5047";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5048";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5049";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5050";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5051";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5052";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5053";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5054";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5055";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5056";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5057";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5058";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5059";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5060";"PTM";"MinSpeed";Inf -"Jeremi-Simon / Promethee";"P5061";"PTM";"MinSpeed";Inf -"THALASSA II";"P0422";"57x52";"MaxSpeed";6.57 -"THALASSA II";"P0405";"57x52";"MaxSpeed";7.21 -"THALASSA II";"P0443";"57x52";"MaxSpeed";6.76 -"THALASSA II";"P0550";"57x52 ENROL";"MaxSpeed";7.41 -"THALASSA II";"P0540";"57x52 ENROL";"MaxSpeed";4.01 -"THALASSA II";"P0522";"57x52 ENROL";"MaxSpeed";4.33 -"THALASSA II";"P0557";"57x52 ENROL";"MaxSpeed";3.65 -"THALASSA II";"P0559";"57x52 ENROL";"MaxSpeed";3.57 -"THALASSA II";"P0561";"57x52 ENROL";"MaxSpeed";3.76 -"THALASSA II";"P0542";"57x52 ENROL";"MaxSpeed";4.18 -"Etoile Polaire_3";"P5062";"PS";"MaxSpeed";-Inf -"Etoile Polaire_3";"P5063";"PS";"MaxSpeed";-Inf -"THALASSA II";"P0372";"76x70";"MaxSpeed";4.62 -"THALASSA II";"P0377";"76x70";"MaxSpeed";7.6 -"THALASSA II";"P0378";"76x70";"MaxSpeed";5 -"THALASSA II";"P0379";"76x70";"MaxSpeed";9.25 -"THALASSA II";"P0383";"76x70";"MaxSpeed";5.75 -"THALASSA II";"P0384";"76x70";"MaxSpeed";5.09 -"THALASSA II";"P0385";"76x70";"MaxSpeed";4.99 -"THALASSA II";"P0389";"76x70";"MaxSpeed";6.18 -"THALASSA II";"P0390";"76x70";"MaxSpeed";5.11 -"THALASSA II";"P0395";"76x70";"MaxSpeed";5.13 -"THALASSA II";"P0396";"76x70";"MaxSpeed";6.14 -"THALASSA II";"P0399";"76x70";"MaxSpeed";8.18 -"THALASSA II";"P0400";"76x70";"MaxSpeed";5.33 -"THALASSA II";"P0404";"76x70";"MaxSpeed";9.51 -"THALASSA II";"P0512";"76x70";"MaxSpeed";10.29 -"THALASSA II";"P0409";"76x70";"MaxSpeed";5.63 -"THALASSA II";"P0410";"76x70";"MaxSpeed";5.88 -"THALASSA II";"P0417";"76x70";"MaxSpeed";6.79 -"THALASSA II";"P0455";"76x70";"MaxSpeed";5.45 -"THALASSA II";"P0423";"76x70";"MaxSpeed";4.57 -"THALASSA II";"P0429";"76x70";"MaxSpeed";5.02 -"THALASSA II";"P0430";"76x70";"MaxSpeed";5.95 -"THALASSA II";"P0435";"76x70";"MaxSpeed";5.2 -"THALASSA II";"P0436";"76x70";"MaxSpeed";7.56 -"THALASSA II";"P0441";"76x70";"MaxSpeed";7.34 -"THALASSA II";"P0442";"76x70";"MaxSpeed";8.25 -"THALASSA II";"P0479";"76x70";"MaxSpeed";9.54 -"THALASSA II";"P0444";"76x70";"MaxSpeed";8.93 -"THALASSA II";"P0449";"76x70";"MaxSpeed";7.98 -"THALASSA II";"P0450";"76x70";"MaxSpeed";8.67 -"THALASSA II";"P0454";"76x70";"MaxSpeed";5.77 -"THALASSA II";"P0493";"76x70";"MaxSpeed";4.97 -"THALASSA II";"P0460";"76x70";"MaxSpeed";7.01 -"THALASSA II";"P0461";"76x70";"MaxSpeed";4.47 -"THALASSA II";"P0463";"76x70";"MaxSpeed";9.16 -"THALASSA II";"P0464";"76x70";"MaxSpeed";4.91 -"THALASSA II";"P0468";"76x70";"MaxSpeed";9.6 -"THALASSA II";"P0473";"76x70";"MaxSpeed";4.62 -"THALASSA II";"P0474";"76x70";"MaxSpeed";7.73 -"THALASSA II";"P0510";"76x70";"MaxSpeed";6.74 -"THALASSA II";"P0480";"76x70";"MaxSpeed";6.07 -"THALASSA II";"P0484";"76x70";"MaxSpeed";6.82 -"THALASSA II";"P0485";"76x70";"MaxSpeed";8.2 -"THALASSA II";"P0489";"76x70";"MaxSpeed";9.85 -"THALASSA II";"P0535";"76x70";"MaxSpeed";4.8 -"THALASSA II";"P0494";"76x70";"MaxSpeed";9.19 -"THALASSA II";"P0495";"76x70";"MaxSpeed";4.69 -"THALASSA II";"P0500";"76x70";"MaxSpeed";4.42 -"THALASSA II";"P0501";"76x70";"MaxSpeed";5.78 -"THALASSA II";"P0505";"76x70";"MaxSpeed";5.28 -"THALASSA II";"P0506";"76x70";"MaxSpeed";8.58 -"THALASSA II";"P0509";"76x70";"MaxSpeed";7.33 -"THALASSA II";"P0523";"76x70";"MaxSpeed";7.03 -"THALASSA II";"P0511";"76x70";"MaxSpeed";7.48 -"THALASSA II";"P0563";"76x70";"MaxSpeed";7.65 -"THALASSA II";"P0554";"76x70";"MaxSpeed";5.83 -"THALASSA II";"P0545";"76x70";"MaxSpeed";5.88 -"THALASSA II";"P0553";"76x70";"MaxSpeed";5.92 -"Arlequin2 / la colombine";"P5001";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5002";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5003";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5004";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5005";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5006";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5007";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5008";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5009";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5010";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5011";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5012";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5013";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5014";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5015";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5016";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5017";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5018";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5019";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5020";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5021";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5022";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5023";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5024";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5025";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5026";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5027";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5028";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5029";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5030";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5031";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5032";"PTM";"MaxSpeed";-Inf -"Arlequin2 / la colombine";"P5033";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5034";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5035";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5036";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5037";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5038";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5039";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5040";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5041";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5042";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5043";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5044";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5045";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5046";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5047";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5048";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5049";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5050";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5051";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5052";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5053";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5054";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5055";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5056";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5057";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5058";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5059";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5060";"PTM";"MaxSpeed";-Inf -"Jeremi-Simon / Promethee";"P5061";"PTM";"MaxSpeed";-Inf -"THALASSA II";"P0422";"57x52";"AverageSpeed";3.84833333333333 -"THALASSA II";"P0405";"57x52";"AverageSpeed";4.28166666666667 -"THALASSA II";"P0443";"57x52";"AverageSpeed";4.16 -"THALASSA II";"P0550";"57x52 ENROL";"AverageSpeed";4.81 -"THALASSA II";"P0540";"57x52 ENROL";"AverageSpeed";3.68 -"THALASSA II";"P0522";"57x52 ENROL";"AverageSpeed";4.16 -"THALASSA II";"P0557";"57x52 ENROL";"AverageSpeed";3.4275 -"THALASSA II";"P0559";"57x52 ENROL";"AverageSpeed";2.68 -"THALASSA II";"P0561";"57x52 ENROL";"AverageSpeed";3.41142857142857 -"THALASSA II";"P0542";"57x52 ENROL";"AverageSpeed";3.5675 -"Etoile Polaire_3";"P5062";"PS";"AverageSpeed";NA -"Etoile Polaire_3";"P5063";"PS";"AverageSpeed";NA -"THALASSA II";"P0372";"76x70";"AverageSpeed";3.745 -"THALASSA II";"P0377";"76x70";"AverageSpeed";4.31833333333333 -"THALASSA II";"P0378";"76x70";"AverageSpeed";4.34 -"THALASSA II";"P0379";"76x70";"AverageSpeed";4.79 -"THALASSA II";"P0383";"76x70";"AverageSpeed";4.125 -"THALASSA II";"P0384";"76x70";"AverageSpeed";4.19 -"THALASSA II";"P0385";"76x70";"AverageSpeed";4.42166666666667 -"THALASSA II";"P0389";"76x70";"AverageSpeed";4.28166666666667 -"THALASSA II";"P0390";"76x70";"AverageSpeed";4.17 -"THALASSA II";"P0395";"76x70";"AverageSpeed";4.31 -"THALASSA II";"P0396";"76x70";"AverageSpeed";4.205 -"THALASSA II";"P0399";"76x70";"AverageSpeed";4.59 -"THALASSA II";"P0400";"76x70";"AverageSpeed";3.98666666666667 -"THALASSA II";"P0404";"76x70";"AverageSpeed";4.89333333333333 -"THALASSA II";"P0512";"76x70";"AverageSpeed";9.075 -"THALASSA II";"P0409";"76x70";"AverageSpeed";3.81333333333333 -"THALASSA II";"P0410";"76x70";"AverageSpeed";4.59666666666667 -"THALASSA II";"P0417";"76x70";"AverageSpeed";4.22166666666667 -"THALASSA II";"P0455";"76x70";"AverageSpeed";3.77833333333333 -"THALASSA II";"P0423";"76x70";"AverageSpeed";3.88166666666667 -"THALASSA II";"P0429";"76x70";"AverageSpeed";3.81666666666667 -"THALASSA II";"P0430";"76x70";"AverageSpeed";4.40333333333333 -"THALASSA II";"P0435";"76x70";"AverageSpeed";3.50333333333333 -"THALASSA II";"P0436";"76x70";"AverageSpeed";4.725 -"THALASSA II";"P0441";"76x70";"AverageSpeed";4.49833333333333 -"THALASSA II";"P0442";"76x70";"AverageSpeed";4.63666666666667 -"THALASSA II";"P0479";"76x70";"AverageSpeed";4.925 -"THALASSA II";"P0444";"76x70";"AverageSpeed";4.62333333333333 -"THALASSA II";"P0449";"76x70";"AverageSpeed";4.31333333333333 -"THALASSA II";"P0450";"76x70";"AverageSpeed";5.24 -"THALASSA II";"P0454";"76x70";"AverageSpeed";4.27333333333333 -"THALASSA II";"P0493";"76x70";"AverageSpeed";3.78 -"THALASSA II";"P0460";"76x70";"AverageSpeed";4.27833333333333 -"THALASSA II";"P0461";"76x70";"AverageSpeed";3.62 -"THALASSA II";"P0463";"76x70";"AverageSpeed";5.12333333333333 -"THALASSA II";"P0464";"76x70";"AverageSpeed";3.89166666666667 -"THALASSA II";"P0468";"76x70";"AverageSpeed";4.92166666666667 -"THALASSA II";"P0473";"76x70";"AverageSpeed";3.76 -"THALASSA II";"P0474";"76x70";"AverageSpeed";4.785 -"THALASSA II";"P0510";"76x70";"AverageSpeed";5.04333333333333 -"THALASSA II";"P0480";"76x70";"AverageSpeed";3.98166666666667 -"THALASSA II";"P0484";"76x70";"AverageSpeed";4.48166666666667 -"THALASSA II";"P0485";"76x70";"AverageSpeed";3.96833333333333 -"THALASSA II";"P0489";"76x70";"AverageSpeed";4.955 -"THALASSA II";"P0535";"76x70";"AverageSpeed";3.98666666666667 -"THALASSA II";"P0494";"76x70";"AverageSpeed";5.06 -"THALASSA II";"P0495";"76x70";"AverageSpeed";4.00333333333333 -"THALASSA II";"P0500";"76x70";"AverageSpeed";3.84166666666667 -"THALASSA II";"P0501";"76x70";"AverageSpeed";4.23875 -"THALASSA II";"P0505";"76x70";"AverageSpeed";4.31666666666667 -"THALASSA II";"P0506";"76x70";"AverageSpeed";4.98 -"THALASSA II";"P0509";"76x70";"AverageSpeed";4.915 -"THALASSA II";"P0523";"76x70";"AverageSpeed";4.775 -"THALASSA II";"P0511";"76x70";"AverageSpeed";4.77333333333333 -"THALASSA II";"P0563";"76x70";"AverageSpeed";4.58333333333333 -"THALASSA II";"P0554";"76x70";"AverageSpeed";3.99166666666667 -"THALASSA II";"P0545";"76x70";"AverageSpeed";4.595 -"THALASSA II";"P0553";"76x70";"AverageSpeed";4.14666666666667 -"Arlequin2 / la colombine";"P5001";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5002";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5003";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5004";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5005";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5006";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5007";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5008";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5009";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5010";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5011";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5012";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5013";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5014";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5015";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5016";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5017";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5018";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5019";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5020";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5021";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5022";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5023";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5024";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5025";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5026";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5027";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5028";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5029";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5030";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5031";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5032";"PTM";"AverageSpeed";NA -"Arlequin2 / la colombine";"P5033";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5034";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5035";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5036";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5037";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5038";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5039";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5040";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5041";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5042";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5043";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5044";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5045";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5046";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5047";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5048";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5049";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5050";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5051";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5052";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5053";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5054";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5055";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5056";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5057";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5058";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5059";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5060";"PTM";"AverageSpeed";NA -"Jeremi-Simon / Promethee";"P5061";"PTM";"AverageSpeed";NA -"THALASSA II";"P0422";"57x52";"VesselHeading";56.0483333333333 -"THALASSA II";"P0405";"57x52";"VesselHeading";212.875 -"THALASSA II";"P0443";"57x52";"VesselHeading";56.9566666666667 -"THALASSA II";"P0550";"57x52 ENROL";"VesselHeading";134.85 -"THALASSA II";"P0540";"57x52 ENROL";"VesselHeading";247.3525 -"THALASSA II";"P0522";"57x52 ENROL";"VesselHeading";170.12 -"THALASSA II";"P0557";"57x52 ENROL";"VesselHeading";167.1625 -"THALASSA II";"P0559";"57x52 ENROL";"VesselHeading";2.645 -"THALASSA II";"P0561";"57x52 ENROL";"VesselHeading";80.8614285714286 -"THALASSA II";"P0542";"57x52 ENROL";"VesselHeading";51.615 -"Etoile Polaire_3";"P5062";"PS";"VesselHeading";NA -"Etoile Polaire_3";"P5063";"PS";"VesselHeading";NA -"THALASSA II";"P0372";"76x70";"VesselHeading";260.566666666667 -"THALASSA II";"P0377";"76x70";"VesselHeading";253.891666666667 -"THALASSA II";"P0378";"76x70";"VesselHeading";90.185 -"THALASSA II";"P0379";"76x70";"VesselHeading";88.6666666666667 -"THALASSA II";"P0383";"76x70";"VesselHeading";273.671666666667 -"THALASSA II";"P0384";"76x70";"VesselHeading";268.878333333333 -"THALASSA II";"P0385";"76x70";"VesselHeading";268.193333333333 -"THALASSA II";"P0389";"76x70";"VesselHeading";83.9666666666667 -"THALASSA II";"P0390";"76x70";"VesselHeading";146.238333333333 -"THALASSA II";"P0395";"76x70";"VesselHeading";87.2033333333333 -"THALASSA II";"P0396";"76x70";"VesselHeading";263.028333333333 -"THALASSA II";"P0399";"76x70";"VesselHeading";271.435 -"THALASSA II";"P0400";"76x70";"VesselHeading";123.208333333333 -"THALASSA II";"P0404";"76x70";"VesselHeading";119.945 -"THALASSA II";"P0512";"76x70";"VesselHeading";228.505 -"THALASSA II";"P0409";"76x70";"VesselHeading";78.8933333333333 -"THALASSA II";"P0410";"76x70";"VesselHeading";293.245 -"THALASSA II";"P0417";"76x70";"VesselHeading";119.203333333333 -"THALASSA II";"P0455";"76x70";"VesselHeading";59.5633333333333 -"THALASSA II";"P0423";"76x70";"VesselHeading";236.07 -"THALASSA II";"P0429";"76x70";"VesselHeading";60.3366666666667 -"THALASSA II";"P0430";"76x70";"VesselHeading";223.166666666667 -"THALASSA II";"P0435";"76x70";"VesselHeading";67.5683333333333 -"THALASSA II";"P0436";"76x70";"VesselHeading";57.7933333333333 -"THALASSA II";"P0441";"76x70";"VesselHeading";236.111666666667 -"THALASSA II";"P0442";"76x70";"VesselHeading";58.9916666666667 -"THALASSA II";"P0479";"76x70";"VesselHeading";196.101666666667 -"THALASSA II";"P0444";"76x70";"VesselHeading";53.405 -"THALASSA II";"P0449";"76x70";"VesselHeading";58.4166666666667 -"THALASSA II";"P0450";"76x70";"VesselHeading";237.625 -"THALASSA II";"P0454";"76x70";"VesselHeading";67.6916666666667 -"THALASSA II";"P0493";"76x70";"VesselHeading";75.4716666666667 -"THALASSA II";"P0460";"76x70";"VesselHeading";244.785 -"THALASSA II";"P0461";"76x70";"VesselHeading";104.303333333333 -"THALASSA II";"P0463";"76x70";"VesselHeading";231.531666666667 -"THALASSA II";"P0464";"76x70";"VesselHeading";66.83 -"THALASSA II";"P0468";"76x70";"VesselHeading";236.211666666667 -"THALASSA II";"P0473";"76x70";"VesselHeading";83.325 -"THALASSA II";"P0474";"76x70";"VesselHeading";51.7083333333333 -"THALASSA II";"P0510";"76x70";"VesselHeading";72.9616666666667 -"THALASSA II";"P0480";"76x70";"VesselHeading";52.8833333333333 -"THALASSA II";"P0484";"76x70";"VesselHeading";211.955 -"THALASSA II";"P0485";"76x70";"VesselHeading";43.27 -"THALASSA II";"P0489";"76x70";"VesselHeading";54.3216666666667 -"THALASSA II";"P0535";"76x70";"VesselHeading";246.216666666667 -"THALASSA II";"P0494";"76x70";"VesselHeading";65.6283333333333 -"THALASSA II";"P0495";"76x70";"VesselHeading";233.113333333333 -"THALASSA II";"P0500";"76x70";"VesselHeading";157.06 -"THALASSA II";"P0501";"76x70";"VesselHeading";219.94875 -"THALASSA II";"P0505";"76x70";"VesselHeading";228.405 -"THALASSA II";"P0506";"76x70";"VesselHeading";236.438333333333 -"THALASSA II";"P0509";"76x70";"VesselHeading";129.855 -"THALASSA II";"P0523";"76x70";"VesselHeading";242.451666666667 -"THALASSA II";"P0511";"76x70";"VesselHeading";210.611666666667 -"THALASSA II";"P0563";"76x70";"VesselHeading";187.58 -"THALASSA II";"P0554";"76x70";"VesselHeading";163.975 -"THALASSA II";"P0545";"76x70";"VesselHeading";83.3783333333333 -"THALASSA II";"P0553";"76x70";"VesselHeading";291.483333333333 -"Arlequin2 / la colombine";"P5001";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5002";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5003";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5004";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5005";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5006";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5007";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5008";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5009";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5010";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5011";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5012";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5013";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5014";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5015";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5016";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5017";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5018";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5019";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5020";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5021";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5022";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5023";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5024";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5025";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5026";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5027";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5028";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5029";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5030";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5031";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5032";"PTM";"VesselHeading";NA -"Arlequin2 / la colombine";"P5033";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5034";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5035";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5036";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5037";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5038";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5039";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5040";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5041";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5042";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5043";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5044";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5045";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5046";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5047";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5048";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5049";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5050";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5051";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5052";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5053";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5054";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5055";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5056";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5057";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5058";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5059";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5060";"PTM";"VesselHeading";NA -"Jeremi-Simon / Promethee";"P5061";"PTM";"VesselHeading";NA -"THALASSA II";"P0422";"57x52";"DriftHeading";154.596666666667 -"THALASSA II";"P0405";"57x52";"DriftHeading";198.505 -"THALASSA II";"P0443";"57x52";"DriftHeading";160.406666666667 -"THALASSA II";"P0550";"57x52 ENROL";"DriftHeading";201.5775 -"THALASSA II";"P0540";"57x52 ENROL";"DriftHeading";324.0575 -"THALASSA II";"P0522";"57x52 ENROL";"DriftHeading";185.02 -"THALASSA II";"P0557";"57x52 ENROL";"DriftHeading";250.22 -"THALASSA II";"P0559";"57x52 ENROL";"DriftHeading";181.6975 -"THALASSA II";"P0561";"57x52 ENROL";"DriftHeading";184.168571428571 -"THALASSA II";"P0542";"57x52 ENROL";"DriftHeading";147.94 -"Etoile Polaire_3";"P5062";"PS";"DriftHeading";NA -"Etoile Polaire_3";"P5063";"PS";"DriftHeading";NA -"THALASSA II";"P0372";"76x70";"DriftHeading";288.585 -"THALASSA II";"P0377";"76x70";"DriftHeading";209.458333333333 -"THALASSA II";"P0378";"76x70";"DriftHeading";162.17 -"THALASSA II";"P0379";"76x70";"DriftHeading";144.74 -"THALASSA II";"P0383";"76x70";"DriftHeading";215.28 -"THALASSA II";"P0384";"76x70";"DriftHeading";296.815 -"THALASSA II";"P0385";"76x70";"DriftHeading";267.73 -"THALASSA II";"P0389";"76x70";"DriftHeading";119.855 -"THALASSA II";"P0390";"76x70";"DriftHeading";180.563333333333 -"THALASSA II";"P0395";"76x70";"DriftHeading";119.651666666667 -"THALASSA II";"P0396";"76x70";"DriftHeading";319.951666666667 -"THALASSA II";"P0399";"76x70";"DriftHeading";134.876666666667 -"THALASSA II";"P0400";"76x70";"DriftHeading";172.071666666667 -"THALASSA II";"P0404";"76x70";"DriftHeading";176.118333333333 -"THALASSA II";"P0512";"76x70";"DriftHeading";284.996666666667 -"THALASSA II";"P0409";"76x70";"DriftHeading";176.838333333333 -"THALASSA II";"P0410";"76x70";"DriftHeading";256.311666666667 -"THALASSA II";"P0417";"76x70";"DriftHeading";193.316666666667 -"THALASSA II";"P0455";"76x70";"DriftHeading";176.491666666667 -"THALASSA II";"P0423";"76x70";"DriftHeading";185.95 -"THALASSA II";"P0429";"76x70";"DriftHeading";185.255 -"THALASSA II";"P0430";"76x70";"DriftHeading";254.271666666667 -"THALASSA II";"P0435";"76x70";"DriftHeading";107.713333333333 -"THALASSA II";"P0436";"76x70";"DriftHeading";79.67 -"THALASSA II";"P0441";"76x70";"DriftHeading";252.41 -"THALASSA II";"P0442";"76x70";"DriftHeading";111.105 -"THALASSA II";"P0479";"76x70";"DriftHeading";264.918333333333 -"THALASSA II";"P0444";"76x70";"DriftHeading";95.465 -"THALASSA II";"P0449";"76x70";"DriftHeading";98.3616666666667 -"THALASSA II";"P0450";"76x70";"DriftHeading";257.561666666667 -"THALASSA II";"P0454";"76x70";"DriftHeading";135.806666666667 -"THALASSA II";"P0493";"76x70";"DriftHeading";156.846666666667 -"THALASSA II";"P0460";"76x70";"DriftHeading";232.185 -"THALASSA II";"P0461";"76x70";"DriftHeading";164.33 -"THALASSA II";"P0463";"76x70";"DriftHeading";299.055 -"THALASSA II";"P0464";"76x70";"DriftHeading";209.775 -"THALASSA II";"P0468";"76x70";"DriftHeading";246.626666666667 -"THALASSA II";"P0473";"76x70";"DriftHeading";226.94 -"THALASSA II";"P0474";"76x70";"DriftHeading";93.9466666666667 -"THALASSA II";"P0510";"76x70";"DriftHeading";78.0416666666667 -"THALASSA II";"P0480";"76x70";"DriftHeading";130.208333333333 -"THALASSA II";"P0484";"76x70";"DriftHeading";232.348333333333 -"THALASSA II";"P0485";"76x70";"DriftHeading";165.846666666667 -"THALASSA II";"P0489";"76x70";"DriftHeading";91.4366666666667 -"THALASSA II";"P0535";"76x70";"DriftHeading";243.266666666667 -"THALASSA II";"P0494";"76x70";"DriftHeading";93.7133333333333 -"THALASSA II";"P0495";"76x70";"DriftHeading";183.271666666667 -"THALASSA II";"P0500";"76x70";"DriftHeading";145.89 -"THALASSA II";"P0501";"76x70";"DriftHeading";216.8375 -"THALASSA II";"P0505";"76x70";"DriftHeading";228.09 -"THALASSA II";"P0506";"76x70";"DriftHeading";276.798333333333 -"THALASSA II";"P0509";"76x70";"DriftHeading";55.7283333333333 -"THALASSA II";"P0523";"76x70";"DriftHeading";228.715 -"THALASSA II";"P0511";"76x70";"DriftHeading";245.72 -"THALASSA II";"P0563";"76x70";"DriftHeading";229.098333333333 -"THALASSA II";"P0554";"76x70";"DriftHeading";244.895 -"THALASSA II";"P0545";"76x70";"DriftHeading";143.886666666667 -"THALASSA II";"P0553";"76x70";"DriftHeading";166.721666666667 -"Arlequin2 / la colombine";"P5001";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5002";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5003";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5004";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5005";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5006";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5007";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5008";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5009";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5010";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5011";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5012";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5013";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5014";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5015";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5016";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5017";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5018";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5019";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5020";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5021";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5022";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5023";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5024";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5025";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5026";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5027";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5028";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5029";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5030";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5031";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5032";"PTM";"DriftHeading";NA -"Arlequin2 / la colombine";"P5033";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5034";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5035";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5036";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5037";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5038";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5039";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5040";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5041";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5042";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5043";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5044";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5045";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5046";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5047";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5048";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5049";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5050";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5051";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5052";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5053";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5054";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5055";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5056";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5057";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5058";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5059";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5060";"PTM";"DriftHeading";NA -"Jeremi-Simon / Promethee";"P5061";"PTM";"DriftHeading";NA -"THALASSA II";"P0422";"57x52";"DriftSpeed";0.585 -"THALASSA II";"P0405";"57x52";"DriftSpeed";0.768333333333333 -"THALASSA II";"P0443";"57x52";"DriftSpeed";0.446666666666667 -"THALASSA II";"P0550";"57x52 ENROL";"DriftSpeed";0.9975 -"THALASSA II";"P0540";"57x52 ENROL";"DriftSpeed";0.58 -"THALASSA II";"P0522";"57x52 ENROL";"DriftSpeed";0.72 -"THALASSA II";"P0557";"57x52 ENROL";"DriftSpeed";0.64 -"THALASSA II";"P0559";"57x52 ENROL";"DriftSpeed";0.4025 -"THALASSA II";"P0561";"57x52 ENROL";"DriftSpeed";0.454285714285714 -"THALASSA II";"P0542";"57x52 ENROL";"DriftSpeed";0.8275 -"Etoile Polaire_3";"P5062";"PS";"DriftSpeed";NA -"Etoile Polaire_3";"P5063";"PS";"DriftSpeed";NA -"THALASSA II";"P0372";"76x70";"DriftSpeed";0.261666666666667 -"THALASSA II";"P0377";"76x70";"DriftSpeed";0.25 -"THALASSA II";"P0378";"76x70";"DriftSpeed";0.685 -"THALASSA II";"P0379";"76x70";"DriftSpeed";0.386666666666667 -"THALASSA II";"P0383";"76x70";"DriftSpeed";0.308333333333333 -"THALASSA II";"P0384";"76x70";"DriftSpeed";0.56 -"THALASSA II";"P0385";"76x70";"DriftSpeed";0.596666666666667 -"THALASSA II";"P0389";"76x70";"DriftSpeed";0.598333333333333 -"THALASSA II";"P0390";"76x70";"DriftSpeed";0.665 -"THALASSA II";"P0395";"76x70";"DriftSpeed";0.621666666666667 -"THALASSA II";"P0396";"76x70";"DriftSpeed";0.62 -"THALASSA II";"P0399";"76x70";"DriftSpeed";0.726666666666667 -"THALASSA II";"P0400";"76x70";"DriftSpeed";0.383333333333333 -"THALASSA II";"P0404";"76x70";"DriftSpeed";0.62 -"THALASSA II";"P0512";"76x70";"DriftSpeed";0.92 -"THALASSA II";"P0409";"76x70";"DriftSpeed";0.745 -"THALASSA II";"P0410";"76x70";"DriftSpeed";0.725 -"THALASSA II";"P0417";"76x70";"DriftSpeed";0.905 -"THALASSA II";"P0455";"76x70";"DriftSpeed";0.593333333333333 -"THALASSA II";"P0423";"76x70";"DriftSpeed";0.273333333333333 -"THALASSA II";"P0429";"76x70";"DriftSpeed";0.405 -"THALASSA II";"P0430";"76x70";"DriftSpeed";0.531666666666667 -"THALASSA II";"P0435";"76x70";"DriftSpeed";0.698333333333333 -"THALASSA II";"P0436";"76x70";"DriftSpeed";0.61 -"THALASSA II";"P0441";"76x70";"DriftSpeed";0.56 -"THALASSA II";"P0442";"76x70";"DriftSpeed";0.511666666666667 -"THALASSA II";"P0479";"76x70";"DriftSpeed";0.823333333333333 -"THALASSA II";"P0444";"76x70";"DriftSpeed";0.705 -"THALASSA II";"P0449";"76x70";"DriftSpeed";0.595 -"THALASSA II";"P0450";"76x70";"DriftSpeed";0.7 -"THALASSA II";"P0454";"76x70";"DriftSpeed";0.506666666666667 -"THALASSA II";"P0493";"76x70";"DriftSpeed";0.425 -"THALASSA II";"P0460";"76x70";"DriftSpeed";0.741666666666667 -"THALASSA II";"P0461";"76x70";"DriftSpeed";0.723333333333333 -"THALASSA II";"P0463";"76x70";"DriftSpeed";0.746666666666667 -"THALASSA II";"P0464";"76x70";"DriftSpeed";0.508333333333333 -"THALASSA II";"P0468";"76x70";"DriftSpeed";0.753333333333333 -"THALASSA II";"P0473";"76x70";"DriftSpeed";0.628333333333333 -"THALASSA II";"P0474";"76x70";"DriftSpeed";0.941666666666667 -"THALASSA II";"P0510";"76x70";"DriftSpeed";1.06666666666667 -"THALASSA II";"P0480";"76x70";"DriftSpeed";0.853333333333333 -"THALASSA II";"P0484";"76x70";"DriftSpeed";0.406666666666667 -"THALASSA II";"P0485";"76x70";"DriftSpeed";1.065 -"THALASSA II";"P0489";"76x70";"DriftSpeed";0.89 -"THALASSA II";"P0535";"76x70";"DriftSpeed";0.778333333333333 -"THALASSA II";"P0494";"76x70";"DriftSpeed";1.23 -"THALASSA II";"P0495";"76x70";"DriftSpeed";0.618333333333333 -"THALASSA II";"P0500";"76x70";"DriftSpeed";0.568333333333333 -"THALASSA II";"P0501";"76x70";"DriftSpeed";0.31625 -"THALASSA II";"P0505";"76x70";"DriftSpeed";0.521666666666667 -"THALASSA II";"P0506";"76x70";"DriftSpeed";1.03 -"THALASSA II";"P0509";"76x70";"DriftSpeed";0.625 -"THALASSA II";"P0523";"76x70";"DriftSpeed";0.823333333333333 -"THALASSA II";"P0511";"76x70";"DriftSpeed";0.575 -"THALASSA II";"P0563";"76x70";"DriftSpeed";0.871666666666667 -"THALASSA II";"P0554";"76x70";"DriftSpeed";0.485 -"THALASSA II";"P0545";"76x70";"DriftSpeed";0.776666666666667 -"THALASSA II";"P0553";"76x70";"DriftSpeed";0.466666666666667 -"Arlequin2 / la colombine";"P5001";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5002";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5003";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5004";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5005";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5006";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5007";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5008";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5009";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5010";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5011";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5012";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5013";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5014";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5015";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5016";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5017";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5018";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5019";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5020";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5021";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5022";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5023";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5024";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5025";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5026";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5027";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5028";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5029";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5030";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5031";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5032";"PTM";"DriftSpeed";NA -"Arlequin2 / la colombine";"P5033";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5034";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5035";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5036";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5037";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5038";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5039";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5040";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5041";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5042";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5043";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5044";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5045";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5046";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5047";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5048";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5049";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5050";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5051";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5052";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5053";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5054";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5055";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5056";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5057";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5058";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5059";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5060";"PTM";"DriftSpeed";NA -"Jeremi-Simon / Promethee";"P5061";"PTM";"DriftSpeed";NA Added: trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/operation/operation.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/operation/operation.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/operation/operation.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,132 +0,0 @@ -"vesselName";"operationID";"depthStratumID";"gearShootingStartTime";"midHaulLatitude";"midHaulLongitude";"gearShootingStartLatitude";"gearShootingStartLongitude";"gearShootingEndTime";"gearShootingEndLatitude";"gearShootingEndLongitude";"gearCode" -"THALASSA II";"P0422";"CLAS";"05/05/2011 06:49:50";45.4165605;-1.4492292;45.4029733;-1.4860902;"05/05/2011 07:42:19";45.4301477;-1.4123682;"57x52" -"THALASSA II";"P0405";"CLAS";"02/05/2011 17:58:21";44.866915;-1.2839095;44.9039153;-1.2852048;"02/05/2011 18:56:47";44.8299147;-1.2826142;"57x52" -"THALASSA II";"P0443";"CLAS";"10/05/2011 12:43:00";46.35293225;-1.92858305;46.341076;-1.9586068;"10/05/2011 13:24:40";46.3647885;-1.8985593;"57x52" -"THALASSA II";"P0550";"CLAS";"31/05/2011 06:14:53";44.36184325;-1.4997752;44.4432638;-1.6051092;"31/05/2011 10:38:03";44.2804227;-1.3944412;"57x52 ENROL" -"THALASSA II";"P0540";"CLAS";"29/05/2011 07:13:36";45.7439146;-1.7140574;45.78285;-1.6157368;"29/05/2011 09:45:07";45.7049792;-1.812378;"57x52 ENROL" -"THALASSA II";"P0522";"CLAS";"27/05/2011 13:03:19";45.746823;-1.6674905;45.7907128;-1.6822975;"27/05/2011 14:20:45";45.7029332;-1.6526835;"57x52 ENROL" -"THALASSA II";"P0557";"CLAS";"01/06/2011 06:24:12";44.26427075;-1.5447372;44.3567295;-1.5787102;"01/06/2011 10:11:26";44.171812;-1.5107642;"57x52 ENROL" -"THALASSA II";"P0559";"CLAS";"01/06/2011 16:50:17";44.26853445;-1.5266589;44.1903917;-1.544388;"01/06/2011 19:45:44";44.3466772;-1.5089298;"57x52 ENROL" -"THALASSA II";"P0561";"CLAS";"02/06/2011 06:51:05";44.44719465;-1.45238145;44.503201;-1.4425082;"02/06/2011 11:38:44";44.3911883;-1.4622547;"57x52 ENROL" -"THALASSA II";"P0542";"CLAS";"29/05/2011 16:02:41";45.73204585;-1.743524;45.697887;-1.8293162;"29/05/2011 18:10:54";45.7662047;-1.6577318;"57x52 ENROL" -"Etoile Polaire_3";"P5062";"NUL";"18/05/2011 12:27:00";47.7972833333;-3.88975;47.7972833333;-3.88975;"18/05/2011 13:00:00";47.7972833333;-3.88975;"PS" -"Etoile Polaire_3";"P5063";"CLAS";"19/05/2011 04:11:00";47.8541833333;-4.4009666667;47.8541833333;-4.4009666667;"19/05/2011 04:45:00";47.8541833333;-4.4009666667;"PS" -"THALASSA II";"P0372";"SURF";"26/04/2011 16:10:16";43.6666861;-2.21578605;43.6663602;-2.1615688;"26/04/2011 17:13:04";43.667012;-2.2700033;"76x70" -"THALASSA II";"P0377";"CLAS";"27/04/2011 06:31:39";43.66673165;-1.79899135;43.6667853;-1.747363;"27/04/2011 07:32:48";43.666678;-1.8506197;"76x70" -"THALASSA II";"P0378";"CLAS";"27/04/2011 12:55:28";43.86680415;-1.746744;43.8672138;-1.7982492;"27/04/2011 13:55:31";43.8663945;-1.6952388;"76x70" -"THALASSA II";"P0379";"CLAS";"27/04/2011 16:39:37";43.86757765;-1.9556655;43.8676428;-2.0017103;"27/04/2011 17:33:31";43.8675125;-1.9096207;"76x70" -"THALASSA II";"P0383";"SURF";"28/04/2011 06:25:57";44.0666276;-2.98049865;44.0667095;-2.931594;"28/04/2011 07:21:02";44.0665457;-3.0294033;"76x70" -"THALASSA II";"P0384";"CLAS";"28/04/2011 13:13:08";44.06656295;-1.89965825;44.0663187;-1.8383773;"28/04/2011 14:24:03";44.0668072;-1.9609392;"76x70" -"THALASSA II";"P0385";"CLAS";"28/04/2011 18:50:26";44.06636615;-1.63466365;44.0662513;-1.5944573;"28/04/2011 19:36:31";44.066481;-1.67487;"76x70" -"THALASSA II";"P0389";"CLAS";"29/04/2011 06:19:53";44.2664955;-1.52206065;44.2663643;-1.5754153;"29/04/2011 07:23:00";44.2666267;-1.468706;"76x70" -"THALASSA II";"P0390";"CLAS";"29/04/2011 10:07:58";44.26622665;-1.7073195;44.2664293;-1.7738233;"29/04/2011 11:26:04";44.266024;-1.6408157;"76x70" -"THALASSA II";"P0395";"SURF";"30/04/2011 08:10:51";44.26686615;-2.49632365;44.2666;-2.5487575;"30/04/2011 09:09:32";44.2671323;-2.4438898;"76x70" -"THALASSA II";"P0396";"CLAS";"30/04/2011 18:30:21";44.4666152;-1.94586135;44.4666342;-1.900111;"30/04/2011 19:22:25";44.4665962;-1.9916117;"76x70" -"THALASSA II";"P0399";"CLAS";"01/05/2011 10:35:59";44.6675975;-1.8841202;44.6680473;-1.8218972;"01/05/2011 11:53:04";44.6671477;-1.9463432;"76x70" -"THALASSA II";"P0400";"NUL";"01/05/2011 17:10:40";44.85933125;-2.44603665;44.8685602;-2.494259;"01/05/2011 18:08:30";44.8501023;-2.3978143;"76x70" -"THALASSA II";"P0404";"CLAS";"02/05/2011 10:59:50";44.6668616;-1.5903002;44.6667415;-1.6506737;"02/05/2011 12:12:36";44.6669817;-1.5299267;"76x70" -"THALASSA II";"P0512";"CLAS";"25/05/2011 15:07:48";47.0821397;-5.4535365;47.0675042;-5.4723792;"25/05/2011 15:39:12";47.0967752;-5.4346938;"76x70" -"THALASSA II";"P0409";"CLAS";"03/05/2011 05:56:21";45.0164419;-2.2882595;45.0146373;-2.3340887;"03/05/2011 06:53:02";45.0182465;-2.2424303;"76x70" -"THALASSA II";"P0410";"SURF";"03/05/2011 10:11:15";45.00061135;-2.5254289;44.9920907;-2.4510983;"03/05/2011 11:31:10";45.009132;-2.5997595;"76x70" -"THALASSA II";"P0417";"CLAS";"04/05/2011 17:51:47";45.1560195;-2.3268755;45.1495478;-2.376418;"04/05/2011 18:51:40";45.1624912;-2.277333;"76x70" -"THALASSA II";"P0455";"CLAS";"12/05/2011 11:53:52";45.6132011;-3.20445085;45.5958287;-3.2447132;"12/05/2011 12:50:31";45.6305735;-3.1641885;"76x70" -"THALASSA II";"P0423";"CLAS";"05/05/2011 15:39:20";45.55488225;-1.64926125;45.5695578;-1.6113005;"05/05/2011 16:30:36";45.5402067;-1.687222;"76x70" -"THALASSA II";"P0429";"CLAS";"06/05/2011 07:25:49";45.18947685;-2.5391907;45.1718117;-2.5809162;"06/05/2011 08:23:42";45.207142;-2.4974652;"76x70" -"THALASSA II";"P0430";"CLAS";"06/05/2011 16:05:41";45.3405998;-2.743071;45.3603513;-2.6914532;"06/05/2011 17:13:24";45.3208483;-2.7946888;"76x70" -"THALASSA II";"P0435";"CLAS";"07/05/2011 07:04:49";45.73097685;-1.7467553;45.717725;-1.7784178;"07/05/2011 07:47:25";45.7442287;-1.7150928;"76x70" -"THALASSA II";"P0436";"CLAS";"07/05/2011 12:40:49";45.4871954;-2.37471525;45.4660413;-2.4286165;"07/05/2011 13:46:27";45.5083495;-2.320814;"76x70" -"THALASSA II";"P0441";"CLAS";"08/05/2011 06:22:08";45.7596614;-2.2718805;45.778235;-2.2274387;"08/05/2011 07:21:37";45.7410878;-2.3163223;"76x70" -"THALASSA II";"P0442";"SURF";"08/05/2011 16:48:56";46.04068135;-2.12840585;46.0222777;-2.1767912;"08/05/2011 17:52:01";46.059085;-2.0800205;"76x70" -"THALASSA II";"P0479";"CLAS";"17/05/2011 07:21:17";47.14522585;-3.85982645;47.164662;-3.8230832;"17/05/2011 08:11:19";47.1257897;-3.8965697;"76x70" -"THALASSA II";"P0444";"SURF";"10/05/2011 18:08:06";46.0928689;-2.60270885;46.0772255;-2.64295;"10/05/2011 18:59:31";46.1085123;-2.5624677;"76x70" -"THALASSA II";"P0449";"SURF";"11/05/2011 07:48:46";46.4189677;-2.34978675;46.4020612;-2.3922847;"11/05/2011 08:46:02";46.4358742;-2.3072888;"76x70" -"THALASSA II";"P0450";"CLAS";"11/05/2011 14:01:18";46.41944775;-2.94143515;46.4356757;-2.900766;"11/05/2011 14:53:30";46.4032198;-2.9821043;"76x70" -"THALASSA II";"P0454";"CLAS";"12/05/2011 07:05:26";45.84683875;-2.61805485;45.8316423;-2.6548725;"12/05/2011 07:54:23";45.8620352;-2.5812372;"76x70" -"THALASSA II";"P0493";"CLAS";"20/05/2011 11:17:24";46.48890005;-3.8921176;46.4710443;-3.941406;"20/05/2011 12:18:42";46.5067558;-3.8428292;"76x70" -"THALASSA II";"P0460";"CLAS";"13/05/2011 07:26:04";46.01328;-2.8073191;46.0284548;-2.7692625;"13/05/2011 08:17:17";45.9981052;-2.8453757;"76x70" -"THALASSA II";"P0461";"CLAS";"13/05/2011 13:44:58";45.99174535;-3.4184479;45.9733252;-3.4629725;"13/05/2011 14:47:52";46.0101655;-3.3739233;"76x70" -"THALASSA II";"P0463";"CLAS";"14/05/2011 07:04:19";46.09663135;-3.75210175;46.1143065;-3.707652;"14/05/2011 08:03:26";46.0789562;-3.7965515;"76x70" -"THALASSA II";"P0464";"CLAS";"14/05/2011 18:17:12";46.2098473;-4.0142089;46.1924198;-4.0593755;"14/05/2011 19:15:39";46.2272748;-3.9690423;"76x70" -"THALASSA II";"P0468";"CLAS";"15/05/2011 07:08:30";46.59380925;-3.0607965;46.6065298;-3.0290395;"15/05/2011 07:50:01";46.5810887;-3.0925535;"76x70" -"THALASSA II";"P0473";"CLAS";"16/05/2011 07:04:19";47.09585435;-2.9685695;47.0769127;-3.0166252;"16/05/2011 08:07:44";47.114796;-2.9205138;"76x70" -"THALASSA II";"P0474";"CLAS";"16/05/2011 11:46:49";46.9647855;-3.30780285;46.9476583;-3.350037;"16/05/2011 12:39:19";46.9819127;-3.2655687;"76x70" -"THALASSA II";"P0510";"CLAS";"25/05/2011 07:27:42";46.9686228;-5.2053616;46.9372413;-5.2458797;"25/05/2011 08:34:33";47.0000043;-5.1648435;"76x70" -"THALASSA II";"P0480";"CLAS";"17/05/2011 15:24:51";47.5203479;-3.6287345;47.5009285;-3.6607855;"17/05/2011 16:14:04";47.5397673;-3.5966835;"76x70" -"THALASSA II";"P0484";"CLAS";"18/05/2011 07:41:01";47.52017855;-4.06225735;47.5429438;-4.0310202;"18/05/2011 08:35:18";47.4974133;-4.0934945;"76x70" -"THALASSA II";"P0485";"CLAS";"18/05/2011 18:20:32";47.2902331;-4.7932865;47.2654857;-4.8245127;"18/05/2011 19:19:08";47.3149805;-4.7620603;"76x70" -"THALASSA II";"P0489";"CLAS";"19/05/2011 13:15:33";47.72496835;-4.9996085;47.698694;-5.0346557;"19/05/2011 14:08:45";47.7512427;-4.9645613;"76x70" -"THALASSA II";"P0535";"CLAS";"28/05/2011 16:43:48";45.67605565;-1.8722945;45.6879498;-1.8414218;"28/05/2011 17:20:31";45.6641615;-1.9031672;"76x70" -"THALASSA II";"P0494";"SURF";"20/05/2011 15:29:41";46.3540454;-4.2313095;46.3366863;-4.2788225;"20/05/2011 16:23:35";46.3714045;-4.1837965;"76x70" -"THALASSA II";"P0495";"CLAS";"20/05/2011 17:23:27";46.36654045;-4.19797885;46.3851312;-4.1534082;"20/05/2011 18:21:10";46.3479497;-4.2425495;"76x70" -"THALASSA II";"P0500";"CLAS";"21/05/2011 11:41:44";46.54847245;-4.71870945;46.5870072;-4.7533782;"21/05/2011 13:07:19";46.5099377;-4.6840407;"76x70" -"THALASSA II";"P0501";"SURF";"21/05/2011 19:00:00";46.2811965;-5.265945;46.3189872;-5.2274662;"21/05/2011 20:20:33";46.2434058;-5.3044238;"76x70" -"THALASSA II";"P0505";"SURF";"22/05/2011 05:45:10";46.5396551;-4.9833545;46.5666412;-4.9372575;"22/05/2011 06:53:04";46.512669;-5.0294515;"76x70" -"THALASSA II";"P0506";"NUL";"22/05/2011 12:05:37";46.89181565;-4.33279955;46.9203095;-4.2784823;"22/05/2011 13:22:21";46.8633218;-4.3871168;"76x70" -"THALASSA II";"P0509";"SURF";"24/05/2011 17:23:57";46.7755839;-5.06538785;46.739707;-5.1170042;"24/05/2011 18:30:39";46.8114608;-5.0137715;"76x70" -"THALASSA II";"P0523";"CLAS";"27/05/2011 15:30:59";45.747111;-1.70588315;45.7523865;-1.6929008;"27/05/2011 15:46:53";45.7418355;-1.7188655;"76x70" -"THALASSA II";"P0511";"SURF";"25/05/2011 13:04:56";47.03671115;-5.5070321;47.0667233;-5.4681422;"25/05/2011 14:07:39";47.006699;-5.545922;"76x70" -"THALASSA II";"P0563";"CLAS";"02/06/2011 17:34:41";44.4829427;-1.44727785;44.5207862;-1.4379057;"02/06/2011 18:32:34";44.4450992;-1.45665;"76x70" -"THALASSA II";"P0554";"CLAS";"31/05/2011 17:28:44";44.2998278;-1.540415;44.3192688;-1.5419232;"31/05/2011 18:03:21";44.2803868;-1.5389068;"76x70" -"THALASSA II";"P0545";"CLAS";"30/05/2011 16:59:20";44.26752465;-1.53255675;44.2664178;-1.56542;"30/05/2011 17:39:30";44.2686315;-1.4996935;"76x70" -"THALASSA II";"P0553";"CLAS";"31/05/2011 16:00:50";44.27961675;-1.58057055;44.252785;-1.5739693;"31/05/2011 16:48:07";44.3064485;-1.5871718;"76x70" -"Arlequin2 / la colombine";"P5001";"SURF";"27/04/2011 09:10:00";43.73308333335;-1.56533333335;43.7055;-1.5896666667;"27/04/2011 10:39:00";43.7606666667;-1.541;"PTM" -"Arlequin2 / la colombine";"P5002";"SURF";"27/04/2011 15:13:00";43.8640833333;-2.02183333335;43.8708333333;-2.0301666667;"27/04/2011 16:33:00";43.8573333333;-2.0135;"PTM" -"Arlequin2 / la colombine";"P5003";"SURF";"27/04/2011 17:51:00";43.8825;-2.1353333333;43.8628333333;-2.1308333333;"27/04/2011 18:39:00";43.9021666667;-2.1398333333;"PTM" -"Arlequin2 / la colombine";"P5004";"SURF";"28/04/2011 10:57:00";44.0705;-2.39375;44.0723333333;-2.3825;"28/04/2011 11:17:00";44.0686666667;-2.405;"PTM" -"Arlequin2 / la colombine";"P5005";"SURF";"28/04/2011 13:42:00";44.05741666665;-2.01675;44.065;-2.0381666667;"28/04/2011 14:12:00";44.0498333333;-1.9953333333;"PTM" -"Arlequin2 / la colombine";"P5006";"CLAS";"28/04/2011 18:17:00";44.072;-1.42858333335;44.0831666667;-1.4246666667;"28/04/2011 18:42:00";44.0608333333;-1.4325;"PTM" -"Arlequin2 / la colombine";"P5007";"CLAS";"29/04/2011 05:28:00";44.26266666665;-1.37554166665;44.2638333333;-1.3510833333;"29/04/2011 06:04:00";44.2615;-1.4;"PTM" -"Arlequin2 / la colombine";"P5008";"SURF";"29/04/2011 16:20:00";44.2596666667;-2.07825;44.2561666667;-2.0666666667;"29/04/2011 16:41:00";44.2631666667;-2.0898333333;"PTM" -"Arlequin2 / la colombine";"P5009";"CLAS";"29/04/2011 19:27:00";44.454;-1.95583333335;44.4488333333;-1.966;"29/04/2011 19:45:00";44.4591666667;-1.9456666667;"PTM" -"Arlequin2 / la colombine";"P5010";"NUL";"30/04/2011 07:32:00";44.29483333335;-2.4591666667;44.2996666667;-2.4366666667;"30/04/2011 08:05:00";44.29;-2.4816666667;"PTM" -"Arlequin2 / la colombine";"P5011";"SURF";"30/04/2011 17:30:00";44.47433333335;-2.01958333335;44.4635;-2.0041666667;"30/04/2011 17:55:00";44.4851666667;-2.035;"PTM" -"Arlequin2 / la colombine";"P5012";"SURF";"01/05/2011 09:34:00";44.66541666665;-2.282;44.6683333333;-2.3023333333;"01/05/2011 10:02:00";44.6625;-2.2616666667;"PTM" -"Arlequin2 / la colombine";"P5013";"CLAS";"01/05/2011 14:57:00";44.86783333335;-2.03333333335;44.866;-1.9936666667;"01/05/2011 15:56:00";44.8696666667;-2.073;"PTM" -"Arlequin2 / la colombine";"P5014";"SURF";"01/05/2011 19:00:00";44.8804583333;-2.41991666665;44.8713333333;-2.4058333333;"01/05/2011 19:27:00";44.8895833333;-2.434;"PTM" -"Arlequin2 / la colombine";"P5015";"CLAS";"02/05/2011 05:50:00";44.46466666665;-1.70325;44.4605;-1.729;"02/05/2011 06:28:00";44.4688333333;-1.6775;"PTM" -"Arlequin2 / la colombine";"P5016";"CLAS";"02/05/2011 08:30:00";44.4498333333;-1.4385;44.4528333333;-1.4263333333;"02/05/2011 09:00:00";44.4468333333;-1.4506666667;"PTM" -"Arlequin2 / la colombine";"P5017";"CLAS";"02/05/2011 16:51:00";44.86425;-1.46041666665;44.8606666667;-1.5058333333;"02/05/2011 17:59:00";44.8678333333;-1.415;"PTM" -"Arlequin2 / la colombine";"P5018";"SURF";"03/05/2011 07:00:00";44.9941666667;-2.40708333335;44.9941666667;-2.4111666667;"03/05/2011 07:39:00";44.9941666667;-2.403;"PTM" -"Arlequin2 / la colombine";"P5019";"SURF";"03/05/2011 09:51:00";44.99075;-2.6696666667;44.979;-2.6556666667;"03/05/2011 10:19:00";45.0025;-2.6836666667;"PTM" -"Arlequin2 / la colombine";"P5020";"SURF";"03/05/2011 16:55:00";44.98816666665;-2.89416666665;44.9798333333;-2.9458333333;"03/05/2011 18:08:00";44.9965;-2.8425;"PTM" -"Arlequin2 / la colombine";"P5021";"CLAS";"04/05/2011 13:47:00";45.2335;-1.6709166667;45.2205;-1.6611666667;"04/05/2011 14:35:00";45.2465;-1.6806666667;"PTM" -"Arlequin2 / la colombine";"P5022";"SURF";"04/05/2011 18:30:00";45.18433333335;-2.1898333333;45.1796666667;-2.1888333333;"04/05/2011 19:21:00";45.189;-2.1908333333;"PTM" -"Arlequin2 / la colombine";"P5023";"CLAS";"05/05/2011 05:29:00";45.50733333335;-1.32925;45.4995;-1.3286666667;"05/05/2011 05:47:00";45.5151666667;-1.3298333333;"PTM" -"Arlequin2 / la colombine";"P5024";"NUL";"05/05/2011 09:38:00";45.29366666665;-1.79733333335;45.3063333333;-1.7706666667;"05/05/2011 10:28:00";45.281;-1.824;"PTM" -"Arlequin2 / la colombine";"P5025";"CLAS";"05/05/2011 15:44:00";45.54429166665;-1.6755;45.5380833333;-1.71;"05/05/2011 16:31:00";45.5505;-1.641;"PTM" -"Arlequin2 / la colombine";"P5026";"CLAS";"05/05/2011 19:14:00";45.65091666665;-1.4033333333;45.655;-1.3968333333;"05/05/2011 19:29:00";45.6468333333;-1.4098333333;"PTM" -"Arlequin2 / la colombine";"P5027";"CLAS";"06/05/2011 08:52:00";45.15675;-2.59145833335;45.1505;-2.6109166667;"06/05/2011 09:32:00";45.163;-2.572;"PTM" -"Arlequin2 / la colombine";"P5028";"SURF";"06/05/2011 14:31:00";45.24916666665;-3.04825;45.2515;-3.0805;"06/05/2011 15:20:00";45.2468333333;-3.016;"PTM" -"Arlequin2 / la colombine";"P5029";"CLAS";"06/05/2011 16:24:00";45.25441666665;-2.89016666665;45.2555;-2.9083333333;"06/05/2011 17:00:00";45.2533333333;-2.872;"PTM" -"Arlequin2 / la colombine";"P5030";"CLAS";"07/05/2011 05:09:00";45.872375;-1.41233333335;45.8685;-1.4135;"07/05/2011 05:16:00";45.87625;-1.4111666667;"PTM" -"Arlequin2 / la colombine";"P5031";"SURF";"07/05/2011 16:29:00";45.4365;-3.05520833335;45.4286666667;-3.0144166667;"07/05/2011 17:26:00";45.4443333333;-3.096;"PTM" -"Arlequin2 / la colombine";"P5032";"CLAS";"08/05/2011 05:26:00";45.84533333335;-2.03725;45.8415;-2.0513333333;"08/05/2011 05:48:00";45.8491666667;-2.0231666667;"PTM" -"Arlequin2 / la colombine";"P5033";"CLAS";"08/05/2011 09:39:00";46.041;-1.52425;46.0338333333;-1.523;"08/05/2011 09:55:00";46.0481666667;-1.5255;"PTM" -"Jeremi-Simon / Promethee";"P5034";"CLAS";"10/05/2011 09:30:00";46.17233333335;-1.73458333335;46.1691666667;-1.7271666667;"10/05/2011 09:42:00";46.1755;-1.742;"PTM" -"Jeremi-Simon / Promethee";"P5035";"CLAS";"10/05/2011 12:14:00";46.34491666665;-2.001875;46.35;-2.0196666667;"10/05/2011 12:35:00";46.3398333333;-1.9840833333;"PTM" -"Jeremi-Simon / Promethee";"P5036";"CLAS";"10/05/2011 15:25:00";46.26175;-2.16991666665;46.2598333333;-2.1815;"10/05/2011 15:37:00";46.2636666667;-2.1583333333;"PTM" -"Jeremi-Simon / Promethee";"P5037";"SURF";"10/05/2011 17:50:00";46.11466666665;-2.548;46.1308333333;-2.5176666667;"10/05/2011 18:33:00";46.0985;-2.5783333333;"PTM" -"Jeremi-Simon / Promethee";"P5038";"CLAS";"11/05/2011 05:59:00";46.539125;-2.04583333335;46.5376666667;-2.055;"11/05/2011 06:08:00";46.5405833333;-2.0366666667;"PTM" -"Jeremi-Simon / Promethee";"P5039";"SURF";"11/05/2011 09:59:00";46.26975;-2.7126666667;46.2776666667;-2.6991666667;"11/05/2011 10:18:00";46.2618333333;-2.7261666667;"PTM" -"Jeremi-Simon / Promethee";"P5040";"CLAS";"11/05/2011 10:44:00";46.27670833335;-2.70529166665;46.2679166667;-2.7228333333;"11/05/2011 11:08:00";46.2855;-2.68775;"PTM" -"Jeremi-Simon / Promethee";"P5041";"SURF";"11/05/2011 12:10:00";46.4420416667;-2.80416666665;46.4586666667;-2.7885;"11/05/2011 12:31:00";46.4254166667;-2.8198333333;"PTM" -"Jeremi-Simon / Promethee";"P5042";"CLAS";"11/05/2011 18:08:00";46.64;-2.3460416667;46.6328333333;-2.3651666667;"11/05/2011 18:30:00";46.6471666667;-2.3269166667;"PTM" -"Jeremi-Simon / Promethee";"P5043";"CLAS";"12/05/2011 08:49:00";45.690625;-2.952;45.7035;-2.9270833333;"12/05/2011 09:26:00";45.67775;-2.9769166667;"PTM" -"Jeremi-Simon / Promethee";"P5044";"SURF";"12/05/2011 11:55:00";45.5885833333;-3.2229166667;45.5728333333;-3.2261666667;"12/05/2011 12:49:00";45.6043333333;-3.2196666667;"PTM" -"Jeremi-Simon / Promethee";"P5045";"SURF";"12/05/2011 17:17:00";45.715;-3.59245833335;45.7028333333;-3.60475;"12/05/2011 17:41:00";45.7271666667;-3.5801666667;"PTM" -"Jeremi-Simon / Promethee";"P5046";"CLAS";"13/05/2011 07:28:00";46.02408333335;-2.78533333335;46.0105;-2.8195;"13/05/2011 08:10:00";46.0376666667;-2.7511666667;"PTM" -"Jeremi-Simon / Promethee";"P5047";"SURF";"13/05/2011 13:48:00";45.9962083333;-3.44991666665;45.9980833333;-3.4463333333;"13/05/2011 14:37:00";45.9943333333;-3.4535;"PTM" -"Jeremi-Simon / Promethee";"P5048";"SURF";"13/05/2011 16:45:00";45.88145833335;-3.721375;45.8784166667;-3.7349166667;"13/05/2011 17:01:00";45.8845;-3.7078333333;"PTM" -"Jeremi-Simon / Promethee";"P5049";"SURF";"13/05/2011 19:24:00";45.72683333335;-4.0717083333;45.738;-4.0488333333;"13/05/2011 19:52:00";45.7156666667;-4.0945833333;"PTM" -"Jeremi-Simon / Promethee";"P5050";"SURF";"14/05/2011 05:52:00";46.0075;-3.99275;46.0056666667;-4.0075;"14/05/2011 06:11:00";46.0093333333;-3.978;"PTM" -"Jeremi-Simon / Promethee";"P5051";"SURF";"14/05/2011 17:22:00";46.22441666665;-4.059375;46.2293333333;-4.0624166667;"14/05/2011 17:31:00";46.2195;-4.0563333333;"PTM" -"Jeremi-Simon / Promethee";"P5052";"CLAS";"15/05/2011 09:39:00";46.77633333335;-2.62858333335;46.781;-2.6275;"15/05/2011 10:09:00";46.7716666667;-2.6296666667;"PTM" -"Jeremi-Simon / Promethee";"P5053";"CLAS";"15/05/2011 14:06:00";47.04366666665;-2.4985;47.0525;-2.4841666667;"15/05/2011 14:26:00";47.0348333333;-2.5128333333;"PTM" -"Jeremi-Simon / Promethee";"P5054";"CLAS";"16/05/2011 05:58:00";47.20245833335;-2.72779166665;47.2006666667;-2.7315833333;"16/05/2011 06:04:00";47.20425;-2.724;"PTM" -"Jeremi-Simon / Promethee";"P5055";"CLAS";"16/05/2011 07:38:00";47.1155833333;-2.93191666665;47.1233333333;-2.9088333333;"16/05/2011 08:04:00";47.1078333333;-2.955;"PTM" -"Jeremi-Simon / Promethee";"P5056";"SURF";"16/05/2011 17:06:00";47.1253333333;-3.40204166665;47.1163333333;-3.4235833333;"16/05/2011 17:36:00";47.1343333333;-3.3805;"PTM" -"Jeremi-Simon / Promethee";"P5057";"SURF";"16/05/2011 19:24:00";47.2239583333;-3.17575;47.2145833333;-3.2013333333;"16/05/2011 19:59:00";47.2333333333;-3.1501666667;"PTM" -"Jeremi-Simon / Promethee";"P5058";"CLAS";"17/05/2011 07:23:00";47.1685;-3.82045833335;47.156;-3.844;"17/05/2011 07:59:00";47.181;-3.7969166667;"PTM" -"Jeremi-Simon / Promethee";"P5059";"CLAS";"17/05/2011 11:41:00";47.35525;-3.47283333335;47.3583333333;-3.4666666667;"17/05/2011 11:50:00";47.3521666667;-3.479;"PTM" -"Jeremi-Simon / Promethee";"P5060";"CLAS";"17/05/2011 14:00:00";47.5226666667;-3.38733333335;47.5171666667;-3.3826666667;"17/05/2011 14:10:00";47.5281666667;-3.392;"PTM" -"Jeremi-Simon / Promethee";"P5061";"CLAS";"18/05/2011 07:07:00";47.50958333335;-4.08995833335;47.4966666667;-4.1079166667;"18/05/2011 07:37:00";47.5225;-4.072;"PTM" Added: trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,394 +0,0 @@ -"vesselName";"operationID";"metadataType";"operationMetadataValue" -"THALASSA II";"P0422";"MeanWaterDepth";43.42 -"THALASSA II";"P0405";"MeanWaterDepth";26.865 -"THALASSA II";"P0443";"MeanWaterDepth";33.425 -"THALASSA II";"P0550";"MeanWaterDepth";70.03 -"THALASSA II";"P0540";"MeanWaterDepth";48.895 -"THALASSA II";"P0522";"MeanWaterDepth";51.46 -"THALASSA II";"P0557";"MeanWaterDepth";83.78 -"THALASSA II";"P0559";"MeanWaterDepth";77.24 -"THALASSA II";"P0561";"MeanWaterDepth";59.905 -"THALASSA II";"P0542";"MeanWaterDepth";20.05 -"Etoile Polaire_3";"P5062";"MeanWaterDepth";30 -"Etoile Polaire_3";"P5063";"MeanWaterDepth";33 -"THALASSA II";"P0372";"MeanWaterDepth";1248.4 -"THALASSA II";"P0377";"MeanWaterDepth";134.495 -"THALASSA II";"P0378";"MeanWaterDepth";114.37 -"THALASSA II";"P0379";"MeanWaterDepth";132.555 -"THALASSA II";"P0383";"MeanWaterDepth";1586.31 -"THALASSA II";"P0384";"MeanWaterDepth";128.31 -"THALASSA II";"P0385";"MeanWaterDepth";96.4 -"THALASSA II";"P0389";"MeanWaterDepth";69.795 -"THALASSA II";"P0390";"MeanWaterDepth";109.1 -"THALASSA II";"P0395";"MeanWaterDepth";1129.38 -"THALASSA II";"P0396";"MeanWaterDepth";131.385 -"THALASSA II";"P0399";"MeanWaterDepth";129.235 -"THALASSA II";"P0400";"MeanWaterDepth";2460.30005 -"THALASSA II";"P0404";"MeanWaterDepth";84.925 -"THALASSA II";"P0512";"MeanWaterDepth";80.61 -"THALASSA II";"P0409";"MeanWaterDepth";132.485 -"THALASSA II";"P0410";"MeanWaterDepth";1426.205 -"THALASSA II";"P0417";"MeanWaterDepth";124.06 -"THALASSA II";"P0455";"MeanWaterDepth";140.855 -"THALASSA II";"P0423";"MeanWaterDepth";55.6 -"THALASSA II";"P0429";"MeanWaterDepth";132.175 -"THALASSA II";"P0430";"MeanWaterDepth";134.69 -"THALASSA II";"P0435";"MeanWaterDepth";59.395 -"THALASSA II";"P0436";"MeanWaterDepth";109.085 -"THALASSA II";"P0441";"MeanWaterDepth";96.255 -"THALASSA II";"P0442";"MeanWaterDepth";68.665 -"THALASSA II";"P0479";"MeanWaterDepth";113.085 -"THALASSA II";"P0444";"MeanWaterDepth";105.45 -"THALASSA II";"P0449";"MeanWaterDepth";55.8 -"THALASSA II";"P0450";"MeanWaterDepth";107.73 -"THALASSA II";"P0454";"MeanWaterDepth";110.87 -"THALASSA II";"P0493";"MeanWaterDepth";139.29 -"THALASSA II";"P0460";"MeanWaterDepth";116.63 -"THALASSA II";"P0461";"MeanWaterDepth";140.48 -"THALASSA II";"P0463";"MeanWaterDepth";148.73 -"THALASSA II";"P0464";"MeanWaterDepth";151.005 -"THALASSA II";"P0468";"MeanWaterDepth";104.97 -"THALASSA II";"P0473";"MeanWaterDepth";52.495 -"THALASSA II";"P0474";"MeanWaterDepth";101.035 -"THALASSA II";"P0510";"MeanWaterDepth";196.1 -"THALASSA II";"P0480";"MeanWaterDepth";83.2 -"THALASSA II";"P0484";"MeanWaterDepth";101.315 -"THALASSA II";"P0485";"MeanWaterDepth";129.155 -"THALASSA II";"P0489";"MeanWaterDepth";121.86 -"THALASSA II";"P0535";"MeanWaterDepth";66.8 -"THALASSA II";"P0494";"MeanWaterDepth";182.52 -"THALASSA II";"P0495";"MeanWaterDepth";153.91 -"THALASSA II";"P0500";"MeanWaterDepth";202.175 -"THALASSA II";"P0501";"MeanWaterDepth";4020.505 -"THALASSA II";"P0505";"MeanWaterDepth";1171.31 -"THALASSA II";"P0506";"MeanWaterDepth";137.91 -"THALASSA II";"P0509";"MeanWaterDepth";558.225 -"THALASSA II";"P0523";"MeanWaterDepth";53.365 -"THALASSA II";"P0511";"MeanWaterDepth";564.87 -"THALASSA II";"P0563";"MeanWaterDepth";60.205 -"THALASSA II";"P0554";"MeanWaterDepth";84.11 -"THALASSA II";"P0545";"MeanWaterDepth";80.45 -"THALASSA II";"P0553";"MeanWaterDepth";96.235 -"Arlequin2 / la colombine";"P5001";"MeanWaterDepth";110 -"Arlequin2 / la colombine";"P5002";"MeanWaterDepth";200 -"Arlequin2 / la colombine";"P5003";"MeanWaterDepth";300 -"Arlequin2 / la colombine";"P5004";"MeanWaterDepth";900 -"Arlequin2 / la colombine";"P5005";"MeanWaterDepth";140 -"Arlequin2 / la colombine";"P5006";"MeanWaterDepth";40 -"Arlequin2 / la colombine";"P5007";"MeanWaterDepth";40 -"Arlequin2 / la colombine";"P5008";"MeanWaterDepth";400 -"Arlequin2 / la colombine";"P5009";"MeanWaterDepth";130 -"Arlequin2 / la colombine";"P5010";"MeanWaterDepth";1100 -"Arlequin2 / la colombine";"P5011";"MeanWaterDepth";150 -"Arlequin2 / la colombine";"P5012";"MeanWaterDepth";1200 -"Arlequin2 / la colombine";"P5013";"MeanWaterDepth";140 -"Arlequin2 / la colombine";"P5014";"MeanWaterDepth";2100 -"Arlequin2 / la colombine";"P5015";"MeanWaterDepth";105 -"Arlequin2 / la colombine";"P5016";"MeanWaterDepth";55 -"Arlequin2 / la colombine";"P5017";"MeanWaterDepth";40 -"Arlequin2 / la colombine";"P5018";"MeanWaterDepth";300 -"Arlequin2 / la colombine";"P5019";"MeanWaterDepth";100 -"Arlequin2 / la colombine";"P5020";"MeanWaterDepth";2000 -"Arlequin2 / la colombine";"P5021";"MeanWaterDepth";70 -"Arlequin2 / la colombine";"P5022";"MeanWaterDepth";110 -"Arlequin2 / la colombine";"P5023";"MeanWaterDepth";30 -"Arlequin2 / la colombine";"P5024";"MeanWaterDepth";70 -"Arlequin2 / la colombine";"P5025";"MeanWaterDepth";50 -"Arlequin2 / la colombine";"P5026";"MeanWaterDepth";25 -"Arlequin2 / la colombine";"P5027";"MeanWaterDepth";130 -"Arlequin2 / la colombine";"P5028";"MeanWaterDepth";180 -"Arlequin2 / la colombine";"P5029";"MeanWaterDepth";140 -"Arlequin2 / la colombine";"P5030";"MeanWaterDepth";25 -"Arlequin2 / la colombine";"P5031";"MeanWaterDepth";140 -"Arlequin2 / la colombine";"P5032";"MeanWaterDepth";70 -"Arlequin2 / la colombine";"P5033";"MeanWaterDepth";20 -"Jeremi-Simon / Promethee";"P5034";"MeanWaterDepth";30 -"Jeremi-Simon / Promethee";"P5035";"MeanWaterDepth";30 -"Jeremi-Simon / Promethee";"P5036";"MeanWaterDepth";40 -"Jeremi-Simon / Promethee";"P5037";"MeanWaterDepth";100 -"Jeremi-Simon / Promethee";"P5038";"MeanWaterDepth";30 -"Jeremi-Simon / Promethee";"P5039";"MeanWaterDepth";95 -"Jeremi-Simon / Promethee";"P5040";"MeanWaterDepth";90 -"Jeremi-Simon / Promethee";"P5041";"MeanWaterDepth";90 -"Jeremi-Simon / Promethee";"P5042";"MeanWaterDepth";40 -"Jeremi-Simon / Promethee";"P5043";"MeanWaterDepth";130 -"Jeremi-Simon / Promethee";"P5044";"MeanWaterDepth";130 -"Jeremi-Simon / Promethee";"P5045";"MeanWaterDepth";200 -"Jeremi-Simon / Promethee";"P5046";"MeanWaterDepth";110 -"Jeremi-Simon / Promethee";"P5047";"MeanWaterDepth";135 -"Jeremi-Simon / Promethee";"P5048";"MeanWaterDepth";200 -"Jeremi-Simon / Promethee";"P5049";"MeanWaterDepth";3300 -"Jeremi-Simon / Promethee";"P5050";"MeanWaterDepth";700 -"Jeremi-Simon / Promethee";"P5051";"MeanWaterDepth";150 -"Jeremi-Simon / Promethee";"P5052";"MeanWaterDepth";50 -"Jeremi-Simon / Promethee";"P5053";"MeanWaterDepth";35 -"Jeremi-Simon / Promethee";"P5054";"MeanWaterDepth";35 -"Jeremi-Simon / Promethee";"P5055";"MeanWaterDepth";50 -"Jeremi-Simon / Promethee";"P5056";"MeanWaterDepth";90 -"Jeremi-Simon / Promethee";"P5057";"MeanWaterDepth";60 -"Jeremi-Simon / Promethee";"P5058";"MeanWaterDepth";105 -"Jeremi-Simon / Promethee";"P5059";"MeanWaterDepth";80 -"Jeremi-Simon / Promethee";"P5060";"MeanWaterDepth";45 -"Jeremi-Simon / Promethee";"P5061";"MeanWaterDepth";100 -"THALASSA II";"P0422";"WaterDepthShoot";46.23 -"THALASSA II";"P0405";"WaterDepthShoot";28.51 -"THALASSA II";"P0443";"WaterDepthShoot";36.43 -"THALASSA II";"P0550";"WaterDepthShoot";98.36 -"THALASSA II";"P0540";"WaterDepthShoot";43.15 -"THALASSA II";"P0522";"WaterDepthShoot";51.33 -"THALASSA II";"P0557";"WaterDepthShoot";96.49 -"THALASSA II";"P0559";"WaterDepthShoot";82.8 -"THALASSA II";"P0561";"WaterDepthShoot";57.77 -"THALASSA II";"P0542";"WaterDepthShoot";0 -"Etoile Polaire_3";"P5062";"WaterDepthShoot";30 -"Etoile Polaire_3";"P5063";"WaterDepthShoot";33 -"THALASSA II";"P0372";"WaterDepthShoot";945.2 -"THALASSA II";"P0377";"WaterDepthShoot";120.17 -"THALASSA II";"P0378";"WaterDepthShoot";118.33 -"THALASSA II";"P0379";"WaterDepthShoot";141.5 -"THALASSA II";"P0383";"WaterDepthShoot";1493.25 -"THALASSA II";"P0384";"WaterDepthShoot";120.62 -"THALASSA II";"P0385";"WaterDepthShoot";88.13 -"THALASSA II";"P0389";"WaterDepthShoot";87.24 -"THALASSA II";"P0390";"WaterDepthShoot";117.07 -"THALASSA II";"P0395";"WaterDepthShoot";1116.21 -"THALASSA II";"P0396";"WaterDepthShoot";125.75 -"THALASSA II";"P0399";"WaterDepthShoot";119.84 -"THALASSA II";"P0400";"WaterDepthShoot";2458.79 -"THALASSA II";"P0404";"WaterDepthShoot";96.17 -"THALASSA II";"P0512";"WaterDepthShoot";79.52 -"THALASSA II";"P0409";"WaterDepthShoot";143.65 -"THALASSA II";"P0410";"WaterDepthShoot";1015.18 -"THALASSA II";"P0417";"WaterDepthShoot";127.72 -"THALASSA II";"P0455";"WaterDepthShoot";141.02 -"THALASSA II";"P0423";"WaterDepthShoot";51.68 -"THALASSA II";"P0429";"WaterDepthShoot";134.6 -"THALASSA II";"P0430";"WaterDepthShoot";133.95 -"THALASSA II";"P0435";"WaterDepthShoot";62.62 -"THALASSA II";"P0436";"WaterDepthShoot";110.81 -"THALASSA II";"P0441";"WaterDepthShoot";90.4 -"THALASSA II";"P0442";"WaterDepthShoot";74.45 -"THALASSA II";"P0479";"WaterDepthShoot";112.23 -"THALASSA II";"P0444";"WaterDepthShoot";109.36 -"THALASSA II";"P0449";"WaterDepthShoot";59.23 -"THALASSA II";"P0450";"WaterDepthShoot";106.76 -"THALASSA II";"P0454";"WaterDepthShoot";112.48 -"THALASSA II";"P0493";"WaterDepthShoot";143.03 -"THALASSA II";"P0460";"WaterDepthShoot";114.75 -"THALASSA II";"P0461";"WaterDepthShoot";144.37 -"THALASSA II";"P0463";"WaterDepthShoot";147.7 -"THALASSA II";"P0464";"WaterDepthShoot";154.72 -"THALASSA II";"P0468";"WaterDepthShoot";103.4 -"THALASSA II";"P0473";"WaterDepthShoot";55.87 -"THALASSA II";"P0474";"WaterDepthShoot";104.24 -"THALASSA II";"P0510";"WaterDepthShoot";233.61 -"THALASSA II";"P0480";"WaterDepthShoot";86.27 -"THALASSA II";"P0484";"WaterDepthShoot";99.08 -"THALASSA II";"P0485";"WaterDepthShoot";130.26 -"THALASSA II";"P0489";"WaterDepthShoot";124.57 -"THALASSA II";"P0535";"WaterDepthShoot";64 -"THALASSA II";"P0494";"WaterDepthShoot";209.42 -"THALASSA II";"P0495";"WaterDepthShoot";154.69 -"THALASSA II";"P0500";"WaterDepthShoot";200.37 -"THALASSA II";"P0501";"WaterDepthShoot";3617.1799 -"THALASSA II";"P0505";"WaterDepthShoot";938.08 -"THALASSA II";"P0506";"WaterDepthShoot";134.82 -"THALASSA II";"P0509";"WaterDepthShoot";812.63 -"THALASSA II";"P0523";"WaterDepthShoot";52.07 -"THALASSA II";"P0511";"WaterDepthShoot";174.81 -"THALASSA II";"P0563";"WaterDepthShoot";57.27 -"THALASSA II";"P0554";"WaterDepthShoot";85.3 -"THALASSA II";"P0545";"WaterDepthShoot";91.35 -"THALASSA II";"P0553";"WaterDepthShoot";93.85 -"Arlequin2 / la colombine";"P5001";"WaterDepthShoot";110 -"Arlequin2 / la colombine";"P5002";"WaterDepthShoot";200 -"Arlequin2 / la colombine";"P5003";"WaterDepthShoot";300 -"Arlequin2 / la colombine";"P5004";"WaterDepthShoot";900 -"Arlequin2 / la colombine";"P5005";"WaterDepthShoot";140 -"Arlequin2 / la colombine";"P5006";"WaterDepthShoot";40 -"Arlequin2 / la colombine";"P5007";"WaterDepthShoot";40 -"Arlequin2 / la colombine";"P5008";"WaterDepthShoot";400 -"Arlequin2 / la colombine";"P5009";"WaterDepthShoot";130 -"Arlequin2 / la colombine";"P5010";"WaterDepthShoot";1100 -"Arlequin2 / la colombine";"P5011";"WaterDepthShoot";150 -"Arlequin2 / la colombine";"P5012";"WaterDepthShoot";1200 -"Arlequin2 / la colombine";"P5013";"WaterDepthShoot";140 -"Arlequin2 / la colombine";"P5014";"WaterDepthShoot";2100 -"Arlequin2 / la colombine";"P5015";"WaterDepthShoot";105 -"Arlequin2 / la colombine";"P5016";"WaterDepthShoot";55 -"Arlequin2 / la colombine";"P5017";"WaterDepthShoot";40 -"Arlequin2 / la colombine";"P5018";"WaterDepthShoot";300 -"Arlequin2 / la colombine";"P5019";"WaterDepthShoot";100 -"Arlequin2 / la colombine";"P5020";"WaterDepthShoot";2000 -"Arlequin2 / la colombine";"P5021";"WaterDepthShoot";70 -"Arlequin2 / la colombine";"P5022";"WaterDepthShoot";110 -"Arlequin2 / la colombine";"P5023";"WaterDepthShoot";30 -"Arlequin2 / la colombine";"P5024";"WaterDepthShoot";70 -"Arlequin2 / la colombine";"P5025";"WaterDepthShoot";50 -"Arlequin2 / la colombine";"P5026";"WaterDepthShoot";25 -"Arlequin2 / la colombine";"P5027";"WaterDepthShoot";130 -"Arlequin2 / la colombine";"P5028";"WaterDepthShoot";180 -"Arlequin2 / la colombine";"P5029";"WaterDepthShoot";140 -"Arlequin2 / la colombine";"P5030";"WaterDepthShoot";25 -"Arlequin2 / la colombine";"P5031";"WaterDepthShoot";140 -"Arlequin2 / la colombine";"P5032";"WaterDepthShoot";70 -"Arlequin2 / la colombine";"P5033";"WaterDepthShoot";20 -"Jeremi-Simon / Promethee";"P5034";"WaterDepthShoot";30 -"Jeremi-Simon / Promethee";"P5035";"WaterDepthShoot";30 -"Jeremi-Simon / Promethee";"P5036";"WaterDepthShoot";40 -"Jeremi-Simon / Promethee";"P5037";"WaterDepthShoot";100 -"Jeremi-Simon / Promethee";"P5038";"WaterDepthShoot";30 -"Jeremi-Simon / Promethee";"P5039";"WaterDepthShoot";95 -"Jeremi-Simon / Promethee";"P5040";"WaterDepthShoot";90 -"Jeremi-Simon / Promethee";"P5041";"WaterDepthShoot";90 -"Jeremi-Simon / Promethee";"P5042";"WaterDepthShoot";40 -"Jeremi-Simon / Promethee";"P5043";"WaterDepthShoot";130 -"Jeremi-Simon / Promethee";"P5044";"WaterDepthShoot";130 -"Jeremi-Simon / Promethee";"P5045";"WaterDepthShoot";200 -"Jeremi-Simon / Promethee";"P5046";"WaterDepthShoot";110 -"Jeremi-Simon / Promethee";"P5047";"WaterDepthShoot";135 -"Jeremi-Simon / Promethee";"P5048";"WaterDepthShoot";200 -"Jeremi-Simon / Promethee";"P5049";"WaterDepthShoot";3300 -"Jeremi-Simon / Promethee";"P5050";"WaterDepthShoot";700 -"Jeremi-Simon / Promethee";"P5051";"WaterDepthShoot";150 -"Jeremi-Simon / Promethee";"P5052";"WaterDepthShoot";50 -"Jeremi-Simon / Promethee";"P5053";"WaterDepthShoot";35 -"Jeremi-Simon / Promethee";"P5054";"WaterDepthShoot";35 -"Jeremi-Simon / Promethee";"P5055";"WaterDepthShoot";50 -"Jeremi-Simon / Promethee";"P5056";"WaterDepthShoot";90 -"Jeremi-Simon / Promethee";"P5057";"WaterDepthShoot";60 -"Jeremi-Simon / Promethee";"P5058";"WaterDepthShoot";105 -"Jeremi-Simon / Promethee";"P5059";"WaterDepthShoot";80 -"Jeremi-Simon / Promethee";"P5060";"WaterDepthShoot";45 -"Jeremi-Simon / Promethee";"P5061";"WaterDepthShoot";100 -"THALASSA II";"P0422";"WaterDepthHaul";40.61 -"THALASSA II";"P0405";"WaterDepthHaul";25.22 -"THALASSA II";"P0443";"WaterDepthHaul";30.42 -"THALASSA II";"P0550";"WaterDepthHaul";41.7 -"THALASSA II";"P0540";"WaterDepthHaul";54.64 -"THALASSA II";"P0522";"WaterDepthHaul";51.59 -"THALASSA II";"P0557";"WaterDepthHaul";71.07 -"THALASSA II";"P0559";"WaterDepthHaul";71.68 -"THALASSA II";"P0561";"WaterDepthHaul";62.04 -"THALASSA II";"P0542";"WaterDepthHaul";40.1 -"Etoile Polaire_3";"P5062";"WaterDepthHaul";30 -"Etoile Polaire_3";"P5063";"WaterDepthHaul";33 -"THALASSA II";"P0372";"WaterDepthHaul";1551.6 -"THALASSA II";"P0377";"WaterDepthHaul";148.82 -"THALASSA II";"P0378";"WaterDepthHaul";110.41 -"THALASSA II";"P0379";"WaterDepthHaul";123.61 -"THALASSA II";"P0383";"WaterDepthHaul";1679.37 -"THALASSA II";"P0384";"WaterDepthHaul";136 -"THALASSA II";"P0385";"WaterDepthHaul";104.67 -"THALASSA II";"P0389";"WaterDepthHaul";52.35 -"THALASSA II";"P0390";"WaterDepthHaul";101.13 -"THALASSA II";"P0395";"WaterDepthHaul";1142.55 -"THALASSA II";"P0396";"WaterDepthHaul";137.02 -"THALASSA II";"P0399";"WaterDepthHaul";138.63 -"THALASSA II";"P0400";"WaterDepthHaul";2461.8101 -"THALASSA II";"P0404";"WaterDepthHaul";73.68 -"THALASSA II";"P0512";"WaterDepthHaul";81.7 -"THALASSA II";"P0409";"WaterDepthHaul";121.32 -"THALASSA II";"P0410";"WaterDepthHaul";1837.23 -"THALASSA II";"P0417";"WaterDepthHaul";120.4 -"THALASSA II";"P0455";"WaterDepthHaul";140.69 -"THALASSA II";"P0423";"WaterDepthHaul";59.52 -"THALASSA II";"P0429";"WaterDepthHaul";129.75 -"THALASSA II";"P0430";"WaterDepthHaul";135.43 -"THALASSA II";"P0435";"WaterDepthHaul";56.17 -"THALASSA II";"P0436";"WaterDepthHaul";107.36 -"THALASSA II";"P0441";"WaterDepthHaul";102.11 -"THALASSA II";"P0442";"WaterDepthHaul";62.88 -"THALASSA II";"P0479";"WaterDepthHaul";113.94 -"THALASSA II";"P0444";"WaterDepthHaul";101.54 -"THALASSA II";"P0449";"WaterDepthHaul";52.37 -"THALASSA II";"P0450";"WaterDepthHaul";108.7 -"THALASSA II";"P0454";"WaterDepthHaul";109.26 -"THALASSA II";"P0493";"WaterDepthHaul";135.55 -"THALASSA II";"P0460";"WaterDepthHaul";118.51 -"THALASSA II";"P0461";"WaterDepthHaul";136.59 -"THALASSA II";"P0463";"WaterDepthHaul";149.76 -"THALASSA II";"P0464";"WaterDepthHaul";147.29 -"THALASSA II";"P0468";"WaterDepthHaul";106.54 -"THALASSA II";"P0473";"WaterDepthHaul";49.12 -"THALASSA II";"P0474";"WaterDepthHaul";97.83 -"THALASSA II";"P0510";"WaterDepthHaul";158.59 -"THALASSA II";"P0480";"WaterDepthHaul";80.13 -"THALASSA II";"P0484";"WaterDepthHaul";103.55 -"THALASSA II";"P0485";"WaterDepthHaul";128.05 -"THALASSA II";"P0489";"WaterDepthHaul";119.15 -"THALASSA II";"P0535";"WaterDepthHaul";69.6 -"THALASSA II";"P0494";"WaterDepthHaul";155.62 -"THALASSA II";"P0495";"WaterDepthHaul";153.13 -"THALASSA II";"P0500";"WaterDepthHaul";203.98 -"THALASSA II";"P0501";"WaterDepthHaul";4423.8301 -"THALASSA II";"P0505";"WaterDepthHaul";1404.54 -"THALASSA II";"P0506";"WaterDepthHaul";141 -"THALASSA II";"P0509";"WaterDepthHaul";303.82 -"THALASSA II";"P0523";"WaterDepthHaul";54.66 -"THALASSA II";"P0511";"WaterDepthHaul";954.93 -"THALASSA II";"P0563";"WaterDepthHaul";63.14 -"THALASSA II";"P0554";"WaterDepthHaul";82.92 -"THALASSA II";"P0545";"WaterDepthHaul";69.55 -"THALASSA II";"P0553";"WaterDepthHaul";98.62 -"Arlequin2 / la colombine";"P5001";"WaterDepthHaul";110 -"Arlequin2 / la colombine";"P5002";"WaterDepthHaul";200 -"Arlequin2 / la colombine";"P5003";"WaterDepthHaul";300 -"Arlequin2 / la colombine";"P5004";"WaterDepthHaul";900 -"Arlequin2 / la colombine";"P5005";"WaterDepthHaul";140 -"Arlequin2 / la colombine";"P5006";"WaterDepthHaul";40 -"Arlequin2 / la colombine";"P5007";"WaterDepthHaul";40 -"Arlequin2 / la colombine";"P5008";"WaterDepthHaul";400 -"Arlequin2 / la colombine";"P5009";"WaterDepthHaul";130 -"Arlequin2 / la colombine";"P5010";"WaterDepthHaul";1100 -"Arlequin2 / la colombine";"P5011";"WaterDepthHaul";150 -"Arlequin2 / la colombine";"P5012";"WaterDepthHaul";1200 -"Arlequin2 / la colombine";"P5013";"WaterDepthHaul";140 -"Arlequin2 / la colombine";"P5014";"WaterDepthHaul";2100 -"Arlequin2 / la colombine";"P5015";"WaterDepthHaul";105 -"Arlequin2 / la colombine";"P5016";"WaterDepthHaul";55 -"Arlequin2 / la colombine";"P5017";"WaterDepthHaul";40 -"Arlequin2 / la colombine";"P5018";"WaterDepthHaul";300 -"Arlequin2 / la colombine";"P5019";"WaterDepthHaul";100 -"Arlequin2 / la colombine";"P5020";"WaterDepthHaul";2000 -"Arlequin2 / la colombine";"P5021";"WaterDepthHaul";70 -"Arlequin2 / la colombine";"P5022";"WaterDepthHaul";110 -"Arlequin2 / la colombine";"P5023";"WaterDepthHaul";30 -"Arlequin2 / la colombine";"P5024";"WaterDepthHaul";70 -"Arlequin2 / la colombine";"P5025";"WaterDepthHaul";50 -"Arlequin2 / la colombine";"P5026";"WaterDepthHaul";25 -"Arlequin2 / la colombine";"P5027";"WaterDepthHaul";130 -"Arlequin2 / la colombine";"P5028";"WaterDepthHaul";180 -"Arlequin2 / la colombine";"P5029";"WaterDepthHaul";140 -"Arlequin2 / la colombine";"P5030";"WaterDepthHaul";25 -"Arlequin2 / la colombine";"P5031";"WaterDepthHaul";140 -"Arlequin2 / la colombine";"P5032";"WaterDepthHaul";70 -"Arlequin2 / la colombine";"P5033";"WaterDepthHaul";20 -"Jeremi-Simon / Promethee";"P5034";"WaterDepthHaul";30 -"Jeremi-Simon / Promethee";"P5035";"WaterDepthHaul";30 -"Jeremi-Simon / Promethee";"P5036";"WaterDepthHaul";40 -"Jeremi-Simon / Promethee";"P5037";"WaterDepthHaul";100 -"Jeremi-Simon / Promethee";"P5038";"WaterDepthHaul";30 -"Jeremi-Simon / Promethee";"P5039";"WaterDepthHaul";95 -"Jeremi-Simon / Promethee";"P5040";"WaterDepthHaul";90 -"Jeremi-Simon / Promethee";"P5041";"WaterDepthHaul";90 -"Jeremi-Simon / Promethee";"P5042";"WaterDepthHaul";40 -"Jeremi-Simon / Promethee";"P5043";"WaterDepthHaul";130 -"Jeremi-Simon / Promethee";"P5044";"WaterDepthHaul";130 -"Jeremi-Simon / Promethee";"P5045";"WaterDepthHaul";200 -"Jeremi-Simon / Promethee";"P5046";"WaterDepthHaul";110 -"Jeremi-Simon / Promethee";"P5047";"WaterDepthHaul";135 -"Jeremi-Simon / Promethee";"P5048";"WaterDepthHaul";200 -"Jeremi-Simon / Promethee";"P5049";"WaterDepthHaul";3300 -"Jeremi-Simon / Promethee";"P5050";"WaterDepthHaul";700 -"Jeremi-Simon / Promethee";"P5051";"WaterDepthHaul";150 -"Jeremi-Simon / Promethee";"P5052";"WaterDepthHaul";50 -"Jeremi-Simon / Promethee";"P5053";"WaterDepthHaul";35 -"Jeremi-Simon / Promethee";"P5054";"WaterDepthHaul";35 -"Jeremi-Simon / Promethee";"P5055";"WaterDepthHaul";50 -"Jeremi-Simon / Promethee";"P5056";"WaterDepthHaul";90 -"Jeremi-Simon / Promethee";"P5057";"WaterDepthHaul";60 -"Jeremi-Simon / Promethee";"P5058";"WaterDepthHaul";105 -"Jeremi-Simon / Promethee";"P5059";"WaterDepthHaul";80 -"Jeremi-Simon / Promethee";"P5060";"WaterDepthHaul";45 -"Jeremi-Simon / Promethee";"P5061";"WaterDepthHaul";100 Added: trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/result/echotype.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/result/echotype.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/result/echotype.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,33 +0,0 @@ -"voyage";"echotypeName";"DepthStratumID";"meaning";"baracoudacode" -"PELGAS2011";"D1";"CLAS";"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";"COMP-LEM" -"PELGAS2011";"D1";"CLAS";"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";"MERL-MER" -"PELGAS2011";"D1";"CLAS";"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";"MERL-MNG" -"PELGAS2011";"D1";"CLAS";"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";"SCOM-JAP" -"PELGAS2011";"D1";"CLAS";"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";"SCOM-SCO" -"PELGAS2011";"D1";"CLAS";"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";"TRAC-MED" -"PELGAS2011";"D1";"CLAS";"Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond";"TRAC-TRU" -"PELGAS2011";"D2";"CLAS";"Bancs bien distincts: Anchois, Sardines Sprats et Harengs situés entre le fond et 50m au dessus du fond";"CLUP-HAR" -"PELGAS2011";"D2";"CLAS";"Bancs bien distincts: Anchois, Sardines Sprats et Harengs situés entre le fond et 50m au dessus du fond";"ENGR-ENC" -"PELGAS2011";"D2";"CLAS";"Bancs bien distincts: Anchois, Sardines Sprats et Harengs situés entre le fond et 50m au dessus du fond";"SARD-PIL" -"PELGAS2011";"D2";"CLAS";"Bancs bien distincts: Anchois, Sardines Sprats et Harengs situés entre le fond et 50m au dessus du fond";"SPRA-SPR" -"PELGAS2011";"D3";"CLAS";"Merlans bleus, myctophidés et capros présents au large";"CAPR-APE" -"PELGAS2011";"D3";"CLAS";"Merlans bleus, myctophidés et capros présents au large";"MICR-POU" -"PELGAS2011";"D4";"SURF";"Sardines, Maquereaux, Anchois situés proche de la surface";"ENGR-ENC" -"PELGAS2011";"D4";"SURF";"Sardines, Maquereaux, Anchois situés proche de la surface";"SARD-PIL" -"PELGAS2011";"D4";"SURF";"Sardines, Maquereaux, Anchois situés proche de la surface";"SCOM-JAP" -"PELGAS2011";"D4";"SURF";"Sardines, Maquereaux, Anchois situés proche de la surface";"SCOM-SCO" -"PELGAS2011";"D5";"CLAS";"Points bleus près du fond (Merlans leus, merlus et chinchards)";"COMP-LEM" -"PELGAS2011";"D5";"CLAS";"Points bleus près du fond (Merlans leus, merlus et chinchards)";"MERL-MER" -"PELGAS2011";"D5";"CLAS";"Points bleus près du fond (Merlans leus, merlus et chinchards)";"MICR-POU" -"PELGAS2011";"D5";"CLAS";"Points bleus près du fond (Merlans leus, merlus et chinchards)";"TRAC-MED" -"PELGAS2011";"D5";"CLAS";"Points bleus près du fond (Merlans leus, merlus et chinchards)";"TRAC-TRU" -"PELGAS2011";"D6";"CLAS";"(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer";"COMP-LEM" -"PELGAS2011";"D6";"CLAS";"(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer";"ENGR-ENC" -"PELGAS2011";"D6";"CLAS";"(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer";"SARD-PIL" -"PELGAS2011";"D6";"CLAS";"(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer";"SCOM-JAP" -"PELGAS2011";"D6";"CLAS";"(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer";"SCOM-SCO" -"PELGAS2011";"D6";"CLAS";"(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer";"SPRA-SPR" -"PELGAS2011";"D6";"CLAS";"(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer";"TRAC-MED" -"PELGAS2011";"D6";"CLAS";"(Pel03) MELANGE - D1+D2 lorsque la structure ne permet pas de les distinguer";"TRAC-TRU" -"PELGAS2011";"D7";"CLAS";"Banc d'Anchois purs";"ENGR-ENC" -"PELGAS2011";"D8";"CLAS";"Banc de Sardines pur";"SARD-PIL" \ No newline at end of file Added: trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/echotype.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,405 +0,0 @@ -"voyage";"baracoudacode";"age";"length";"percentAtage";"metadata";"strata" -"PELGAS2011";"ENGR-ENC";1;7.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;8;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;8.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;9;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;9.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;10;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;10.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;11;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;11.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;12;0.99290780141844;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;12.5;0.982558139534884;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;13;0.942708333333333;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;13.5;0.916666666666667;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;14;0.839195979899497;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;14.5;0.767441860465116;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;15;0.673611111111111;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;15.5;0.614678899082569;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;16;0.364583333333333;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;16.5;0.131578947368421;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;17;0.0158730158730159;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;18;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;18.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;19;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";1;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;7.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;8.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;9;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;9.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;8;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;10;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;12.5;0.0174418604651163;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;13;0.0416666666666667;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;13.5;0.0686274509803922;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;14;0.125628140703518;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;14.5;0.22093023255814;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;15;0.291666666666667;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;15.5;0.36697247706422;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;16;0.572916666666667;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;16.5;0.789473684210526;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;17;0.888888888888889;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;17.5;0.923076923076923;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;18;0.976744186046512;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;12;0.00709219858156028;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;19;0.428571428571429;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;18.5;0.789473684210526;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";2;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;7.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;8;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;9.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;10;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;8.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;9;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;13.5;0.0147058823529412;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;14;0.0351758793969849;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;14.5;0.0116279069767442;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;15;0.0347222222222222;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;15.5;0.018348623853211;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;16;0.0625;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;16.5;0.0789473684210526;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;17;0.0952380952380952;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;17.5;0.0769230769230769;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;18;0.0232558139534884;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;18.5;0.210526315789474;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;19;0.571428571428571;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;13;0.015625;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;19.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";3;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;8.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;9;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;10;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;9.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;7.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;8;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;17;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;18;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;18.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;19;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;20;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"ENGR-ENC";4;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;10.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;11;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;11.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;12;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;12.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;13;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;13.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;14;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;14.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;15;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;15.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;16;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;16.5;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;17;0.84375;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;17.5;0.642857142857143;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;18;0.0909090909090909;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;18.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;19;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;20.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;21;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;21.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;22;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;22.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;23;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;23.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;24;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;24.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";1;25;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;17;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;18;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;18.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;19;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;20.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;21;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;21.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;22;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;22.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;23;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;23.5;0.166666666666667;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;24;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;24.5;0.5;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";10;25;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;17;0.15625;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;17.5;0.357142857142857;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;18;0.704545454545455;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;18.5;0.569444444444444;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;19;0.438202247191011;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;19.5;0.188118811881188;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;20;0.0679611650485437;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;20.5;0.0288461538461538;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;21;0.0101010101010101;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;21.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;22;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;22.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;23;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;23.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;24;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;24.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";2;25;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;17;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;18;0.204545454545455;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;18.5;0.402777777777778;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;19;0.539325842696629;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;19.5;0.742574257425743;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;20;0.699029126213592;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;20.5;0.615384615384615;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;21;0.444444444444444;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;21.5;0.269662921348315;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;22;0.178571428571429;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;22.5;0.0975609756097561;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;23;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;23.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;24;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;24.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";3;25;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;17;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;18;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;18.5;0.0277777777777778;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;19;0.0224719101123595;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;19.5;0.0693069306930693;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;20;0.233009708737864;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;20.5;0.307692307692308;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;21;0.414141414141414;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;21.5;0.606741573033708;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;22;0.583333333333333;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;22.5;0.463414634146341;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;23;0.3;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;23.5;0.0833333333333333;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;24;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;24.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";4;25;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;17;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;18;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;18.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;19;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;20.5;0.0288461538461538;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;21;0.0909090909090909;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;21.5;0.0786516853932584;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;22;0.142857142857143;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;22.5;0.0975609756097561;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;23;0.35;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;23.5;0.0833333333333333;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;24;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;24.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";5;25;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;17;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;18;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;18.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;19;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;20.5;0.0192307692307692;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;21;0.0303030303030303;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;21.5;0.0224719101123595;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;22;0.0714285714285714;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;22.5;0.219512195121951;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;23;0.15;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;23.5;0.416666666666667;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;24;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;24.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";6;25;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;17;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;18;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;18.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;19;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;20.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;21;0.0101010101010101;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;21.5;0.0224719101123595;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;22;0.0238095238095238;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;22.5;0.121951219512195;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;23;0.05;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;23.5;0.0833333333333333;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;24;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;24.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";7;25;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;17;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;18;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;18.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;19;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;20.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;21;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;21.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;22;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;22.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;23;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;23.5;0.166666666666667;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;24;1;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;24.5;0.5;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";8;25;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;10.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;11;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;11.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;12;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;12.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;13;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;13.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;14;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;14.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;15;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;15.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;16;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;16.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;17;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;17.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;18;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;18.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;19;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;19.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;20;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;20.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;21;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;21.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;22;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;22.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;23;0.15;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;23.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;24;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;24.5;0;"Ifremer reading";Golfe de Gascogne -"PELGAS2011";"SARD-PIL";9;25;1;"Ifremer reading";Golfe de Gascogne Added: trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/lengthAgeKey.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv =================================================================== --- trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv 2012-03-27 17:39:50 UTC (rev 416) @@ -1,8 +0,0 @@ -"voyage";"sizeCategory";"aParameter";"bParameter";"baracoudaCode" -"PELGAS2011";0;2.52801249664511;3.37177078594625;"ENGR-ENC" -"PELGAS2011";0;3.21173143972853;3.21285259302551;"MICR-POU" -"PELGAS2011";0;13.3894175981175;2.81779450511063;"SARD-PIL" -"PELGAS2011";0;9.06556472909567;2.98276014889499;"SCOM-JAP" -"PELGAS2011";0;8.9687507631832;2.9589456181782;"SCOM-SCO" -"PELGAS2011";0;37.1383373474989;2.33465223903198;"SPRA-SPR" -"PELGAS2011";0;30.3167531156038;2.63501964156738;"TRAC-TRU" Added: trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/lengthWeightKey.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/echobase-services/src/test/resources/import-data/result/missingEsdu.txt =================================================================== --- trunk/echobase-services/src/test/resources/import-data/result/missingEsdu.txt 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/src/test/resources/import-data/result/missingEsdu.txt 2012-03-27 17:39:50 UTC (rev 416) @@ -1,2073 +0,0 @@ -2011-04-26 13:29:12 -2011-04-26 13:35:19 -2011-04-26 13:41:22 -2011-04-26 13:47:25 -2011-04-26 13:53:27 -2011-04-26 13:59:40 -2011-04-26 15:39:10 -2011-04-26 15:45:19 -2011-04-26 15:51:29 -2011-04-26 19:00:33 -2011-04-26 19:06:46 -2011-04-26 19:12:58 -2011-04-26 19:19:09 -2011-04-26 19:25:22 -2011-04-26 19:31:34 -2011-04-26 19:37:43 -2011-04-27 05:04:05 -2011-04-27 05:13:16 -2011-04-27 05:22:28 -2011-04-27 05:28:28 -2011-04-27 05:34:29 -2011-04-27 05:40:30 -2011-04-27 05:46:30 -2011-04-27 05:52:31 -2011-04-27 06:01:47 -2011-04-27 06:07:46 -2011-04-27 06:15:02 -2011-04-27 08:16:56 -2011-04-27 08:36:44 -2011-04-27 08:42:50 -2011-04-27 08:51:34 -2011-04-27 08:57:41 -2011-04-27 09:09:17 -2011-04-27 09:15:24 -2011-04-27 09:33:21 -2011-04-27 09:39:49 -2011-04-27 11:02:10 -2011-04-27 11:08:02 -2011-04-27 11:13:58 -2011-04-27 11:20:14 -2011-04-27 11:26:12 -2011-04-27 11:32:10 -2011-04-27 11:38:08 -2011-04-27 11:44:04 -2011-04-27 11:49:56 -2011-04-27 11:55:42 -2011-04-27 12:01:46 -2011-04-27 12:08:02 -2011-04-27 12:14:08 -2011-04-27 12:20:08 -2011-04-27 12:26:06 -2011-04-27 14:46:50 -2011-04-27 14:52:45 -2011-04-27 14:58:37 -2011-04-27 15:04:28 -2011-04-27 15:10:23 -2011-04-27 15:16:18 -2011-04-27 15:22:14 -2011-04-27 15:28:16 -2011-04-27 15:34:19 -2011-04-27 15:40:21 -2011-04-27 15:56:50 -2011-04-27 16:02:52 -2011-04-27 19:03:25 -2011-04-27 19:09:22 -2011-04-27 19:15:26 -2011-04-27 19:21:31 -2011-04-28 05:02:02 -2011-04-28 05:08:05 -2011-04-28 05:14:07 -2011-04-28 05:20:08 -2011-04-28 05:26:10 -2011-04-28 05:32:13 -2011-04-28 05:38:48 -2011-04-28 05:46:31 -2011-04-28 05:52:42 -2011-04-28 05:58:48 -2011-04-28 06:04:53 -2011-04-28 08:10:03 -2011-04-28 08:16:04 -2011-04-28 08:22:04 -2011-04-28 08:28:07 -2011-04-28 08:34:10 -2011-04-28 08:40:16 -2011-04-28 08:46:19 -2011-04-28 08:52:16 -2011-04-28 08:58:17 -2011-04-28 09:04:22 -2011-04-28 09:10:26 -2011-04-28 09:16:39 -2011-04-28 09:23:36 -2011-04-28 09:30:39 -2011-04-28 09:37:02 -2011-04-28 09:43:00 -2011-04-28 09:48:58 -2011-04-28 09:55:02 -2011-04-28 10:01:14 -2011-04-28 10:07:10 -2011-04-28 10:13:05 -2011-04-28 10:18:57 -2011-04-28 10:24:58 -2011-04-28 10:30:56 -2011-04-28 10:36:54 -2011-04-28 10:42:57 -2011-04-28 10:48:59 -2011-04-28 10:55:01 -2011-04-28 11:00:59 -2011-04-28 11:06:57 -2011-04-28 11:12:54 -2011-04-28 11:18:48 -2011-04-28 11:24:38 -2011-04-28 11:30:42 -2011-04-28 11:36:08 -2011-04-28 11:42:12 -2011-04-28 11:48:11 -2011-04-28 11:54:05 -2011-04-28 12:00:08 -2011-04-28 12:04:20 -2011-04-28 12:10:20 -2011-04-28 12:16:23 -2011-04-28 12:28:08 -2011-04-28 12:34:10 -2011-04-28 12:40:10 -2011-04-28 12:46:10 -2011-04-28 12:52:12 -2011-04-28 12:58:37 -2011-04-28 15:14:09 -2011-04-28 15:20:12 -2011-04-28 15:26:10 -2011-04-28 15:32:09 -2011-04-28 15:38:08 -2011-04-28 15:44:06 -2011-04-28 15:50:02 -2011-04-28 15:55:57 -2011-04-28 16:01:50 -2011-04-28 16:07:46 -2011-04-28 16:13:41 -2011-04-28 16:19:39 -2011-04-28 16:25:36 -2011-04-28 16:31:33 -2011-04-28 16:37:33 -2011-04-28 16:43:37 -2011-04-28 16:49:42 -2011-04-28 16:55:46 -2011-04-28 17:01:54 -2011-04-28 17:08:03 -2011-04-28 17:14:07 -2011-04-28 17:20:10 -2011-04-28 17:26:15 -2011-04-29 05:04:09 -2011-04-29 05:10:17 -2011-04-29 05:16:25 -2011-04-29 05:22:33 -2011-04-29 05:28:39 -2011-04-29 05:34:40 -2011-04-29 05:40:39 -2011-04-29 05:46:37 -2011-04-29 05:52:54 -2011-04-29 05:59:20 -2011-04-29 06:05:52 -2011-04-29 09:04:27 -2011-04-29 09:10:34 -2011-04-29 09:16:36 -2011-04-29 09:22:36 -2011-04-29 09:28:36 -2011-04-29 09:34:38 -2011-04-29 09:40:41 -2011-04-29 09:46:51 -2011-04-29 09:53:27 -2011-04-29 14:23:59 -2011-04-29 14:29:45 -2011-04-29 14:35:43 -2011-04-29 14:41:38 -2011-04-29 14:47:35 -2011-04-29 14:53:25 -2011-04-29 15:53:48 -2011-04-29 15:59:40 -2011-04-29 16:05:40 -2011-04-29 16:11:48 -2011-04-29 16:17:55 -2011-04-29 16:24:05 -2011-04-29 16:30:15 -2011-04-29 16:36:22 -2011-04-29 16:42:27 -2011-04-29 16:48:36 -2011-04-29 18:06:29 -2011-04-29 18:12:47 -2011-04-29 18:18:59 -2011-04-29 18:25:11 -2011-04-29 18:31:20 -2011-04-29 18:37:30 -2011-04-29 18:43:43 -2011-04-29 18:49:57 -2011-04-29 18:56:03 -2011-04-29 19:02:03 -2011-04-29 19:08:07 -2011-04-29 19:14:07 -2011-04-29 19:20:09 -2011-04-29 19:26:11 -2011-04-29 19:32:11 -2011-04-30 06:07:59 -2011-04-30 06:14:01 -2011-04-30 06:20:06 -2011-04-30 06:26:14 -2011-04-30 06:32:09 -2011-04-30 06:38:02 -2011-04-30 06:44:05 -2011-04-30 06:50:09 -2011-04-30 06:56:25 -2011-04-30 07:02:35 -2011-04-30 07:08:34 -2011-04-30 07:14:32 -2011-04-30 07:20:27 -2011-04-30 07:26:22 -2011-04-30 07:32:20 -2011-04-30 07:38:17 -2011-04-30 07:44:22 -2011-04-30 07:50:39 -2011-04-30 10:08:06 -2011-04-30 10:14:10 -2011-04-30 10:20:16 -2011-04-30 10:26:20 -2011-04-30 10:32:23 -2011-04-30 10:38:32 -2011-04-30 10:44:35 -2011-04-30 10:50:45 -2011-04-30 10:56:48 -2011-04-30 11:02:56 -2011-04-30 11:08:59 -2011-04-30 11:15:07 -2011-04-30 11:21:12 -2011-04-30 11:27:15 -2011-04-30 11:33:14 -2011-04-30 11:39:15 -2011-04-30 11:45:13 -2011-04-30 11:51:08 -2011-04-30 13:42:21 -2011-04-30 13:48:20 -2011-04-30 13:54:17 -2011-04-30 14:00:26 -2011-04-30 14:06:30 -2011-04-30 14:12:34 -2011-04-30 14:18:43 -2011-04-30 14:24:40 -2011-04-30 14:30:42 -2011-04-30 14:36:41 -2011-04-30 14:42:45 -2011-04-30 14:48:54 -2011-04-30 14:55:04 -2011-04-30 15:01:13 -2011-04-30 15:07:20 -2011-04-30 15:13:28 -2011-04-30 15:19:35 -2011-04-30 15:25:38 -2011-04-30 15:31:46 -2011-04-30 15:37:49 -2011-04-30 15:43:51 -2011-04-30 15:49:55 -2011-04-30 15:55:59 -2011-04-30 16:02:01 -2011-04-30 16:08:04 -2011-04-30 16:14:12 -2011-04-30 16:20:22 -2011-04-30 16:26:32 -2011-04-30 16:32:42 -2011-04-30 16:38:54 -2011-04-30 16:45:08 -2011-04-30 16:51:21 -2011-04-30 16:57:31 -2011-04-30 17:03:48 -2011-04-30 17:09:59 -2011-04-30 17:16:06 -2011-05-01 05:12:12 -2011-05-01 05:18:20 -2011-05-01 05:24:21 -2011-05-01 05:30:13 -2011-05-01 05:36:18 -2011-05-01 05:42:27 -2011-05-01 05:48:35 -2011-05-01 05:54:42 -2011-05-01 06:00:50 -2011-05-01 06:06:55 -2011-05-01 06:12:59 -2011-05-01 06:19:05 -2011-05-01 06:25:06 -2011-05-01 06:31:01 -2011-05-01 06:37:01 -2011-05-01 06:42:58 -2011-05-01 06:49:02 -2011-05-01 06:55:04 -2011-05-01 07:01:08 -2011-05-01 07:07:10 -2011-05-01 07:13:11 -2011-05-01 07:19:16 -2011-05-01 07:25:18 -2011-05-01 07:31:29 -2011-05-01 07:37:28 -2011-05-01 07:43:30 -2011-05-01 07:49:34 -2011-05-01 07:55:39 -2011-05-01 08:01:41 -2011-05-01 08:07:39 -2011-05-01 08:13:36 -2011-05-01 08:19:39 -2011-05-01 08:25:42 -2011-05-01 08:31:46 -2011-05-01 08:37:47 -2011-05-01 08:43:44 -2011-05-01 08:49:42 -2011-05-01 08:55:36 -2011-05-01 09:01:33 -2011-05-01 09:07:23 -2011-05-01 09:13:13 -2011-05-01 09:19:07 -2011-05-01 09:25:06 -2011-05-01 09:31:11 -2011-05-01 09:37:17 -2011-05-01 09:43:16 -2011-05-01 09:49:15 -2011-05-01 09:55:22 -2011-05-01 10:01:33 -2011-05-01 10:07:37 -2011-05-01 13:31:52 -2011-05-01 13:37:55 -2011-05-01 13:43:57 -2011-05-01 13:50:06 -2011-05-01 13:56:14 -2011-05-01 14:02:14 -2011-05-01 14:08:13 -2011-05-01 14:14:15 -2011-05-01 14:20:20 -2011-05-01 14:26:21 -2011-05-01 14:32:21 -2011-05-01 14:38:25 -2011-05-01 14:44:34 -2011-05-01 14:50:44 -2011-05-01 14:57:03 -2011-05-01 15:03:24 -2011-05-01 15:09:48 -2011-05-01 15:16:07 -2011-05-01 15:22:33 -2011-05-01 15:57:15 -2011-05-01 16:03:17 -2011-05-01 16:09:15 -2011-05-01 16:15:12 -2011-05-01 16:21:05 -2011-05-01 16:26:54 -2011-05-01 16:32:41 -2011-05-01 16:38:30 -2011-05-01 16:44:13 -2011-05-01 16:49:51 -2011-05-01 19:03:03 -2011-05-01 19:09:04 -2011-05-01 19:15:04 -2011-05-01 19:21:06 -2011-05-01 19:27:07 -2011-05-01 19:33:07 -2011-05-01 19:39:02 -2011-05-01 19:44:58 -2011-05-01 19:50:53 -2011-05-01 19:56:45 -2011-05-01 20:02:34 -2011-05-01 20:08:28 -2011-05-01 20:14:25 -2011-05-01 20:20:23 -2011-05-01 20:26:16 -2011-05-01 20:32:11 -2011-05-01 20:38:09 -2011-05-02 06:12:02 -2011-05-02 06:18:08 -2011-05-02 06:24:13 -2011-05-02 06:30:17 -2011-05-02 06:36:26 -2011-05-02 06:42:38 -2011-05-02 06:48:50 -2011-05-02 06:55:00 -2011-05-02 07:01:12 -2011-05-02 07:07:11 -2011-05-02 07:13:05 -2011-05-02 07:18:57 -2011-05-02 07:24:50 -2011-05-02 07:30:39 -2011-05-02 07:36:25 -2011-05-02 07:42:16 -2011-05-02 07:48:07 -2011-05-02 07:54:10 -2011-05-02 08:00:20 -2011-05-02 08:06:27 -2011-05-02 09:25:04 -2011-05-02 09:30:55 -2011-05-02 09:36:54 -2011-05-02 09:42:54 -2011-05-02 09:48:53 -2011-05-02 09:54:50 -2011-05-02 10:00:45 -2011-05-02 10:06:45 -2011-05-02 10:12:41 -2011-05-02 10:18:40 -2011-05-02 10:24:40 -2011-05-02 10:30:42 -2011-05-02 13:01:53 -2011-05-02 13:07:50 -2011-05-02 13:13:47 -2011-05-02 13:19:45 -2011-05-02 13:25:40 -2011-05-02 13:31:40 -2011-05-02 13:37:39 -2011-05-02 15:06:08 -2011-05-02 15:12:04 -2011-05-02 15:18:01 -2011-05-02 15:23:58 -2011-05-02 15:29:56 -2011-05-02 15:35:59 -2011-05-02 15:42:02 -2011-05-02 15:48:03 -2011-05-02 15:54:05 -2011-05-02 16:00:06 -2011-05-02 16:06:09 -2011-05-02 16:12:12 -2011-05-02 16:18:11 -2011-05-02 16:24:10 -2011-05-02 16:30:10 -2011-05-02 16:36:09 -2011-05-02 16:42:13 -2011-05-02 16:48:18 -2011-05-02 16:54:25 -2011-05-02 17:00:31 -2011-05-02 17:06:37 -2011-05-02 17:12:43 -2011-05-02 17:18:47 -2011-05-02 17:24:59 -2011-05-03 05:02:54 -2011-05-03 05:08:51 -2011-05-03 05:14:44 -2011-05-03 05:20:33 -2011-05-03 05:26:23 -2011-05-03 05:32:13 -2011-05-03 07:48:15 -2011-05-03 07:54:14 -2011-05-03 08:00:17 -2011-05-03 08:06:19 -2011-05-03 08:12:19 -2011-05-03 08:18:19 -2011-05-03 08:24:17 -2011-05-03 08:30:12 -2011-05-03 08:36:02 -2011-05-03 08:41:51 -2011-05-03 08:47:44 -2011-05-03 08:53:52 -2011-05-03 09:00:22 -2011-05-03 12:09:27 -2011-05-03 12:15:36 -2011-05-03 12:21:45 -2011-05-03 12:27:49 -2011-05-03 12:33:54 -2011-05-03 12:40:00 -2011-05-03 12:46:02 -2011-05-03 12:52:03 -2011-05-03 12:58:09 -2011-05-03 13:04:17 -2011-05-03 13:10:25 -2011-05-03 13:16:33 -2011-05-03 13:22:44 -2011-05-03 13:28:52 -2011-05-03 13:35:00 -2011-05-03 13:41:08 -2011-05-03 13:47:19 -2011-05-03 13:53:28 -2011-05-03 14:14:51 -2011-05-03 14:20:56 -2011-05-03 14:27:04 -2011-05-03 14:33:14 -2011-05-03 14:39:30 -2011-05-03 14:45:44 -2011-05-03 14:52:02 -2011-05-03 14:57:53 -2011-05-03 15:03:51 -2011-05-03 15:09:50 -2011-05-03 15:15:44 -2011-05-03 15:21:37 -2011-05-03 15:27:28 -2011-05-03 15:33:33 -2011-05-03 15:39:35 -2011-05-03 15:45:34 -2011-05-03 15:51:35 -2011-05-03 15:57:46 -2011-05-03 16:26:24 -2011-05-03 16:32:19 -2011-05-03 16:38:19 -2011-05-03 16:44:18 -2011-05-03 16:50:21 -2011-05-03 16:56:30 -2011-05-03 17:02:40 -2011-05-03 17:08:48 -2011-05-03 17:14:56 -2011-05-03 17:21:03 -2011-05-03 17:27:12 -2011-05-03 17:33:19 -2011-05-03 17:39:22 -2011-05-03 17:45:22 -2011-05-03 17:51:20 -2011-05-03 17:57:26 -2011-05-03 18:03:40 -2011-05-03 18:09:55 -2011-05-03 18:16:11 -2011-05-03 18:22:25 -2011-05-03 18:28:43 -2011-05-03 18:34:57 -2011-05-04 05:02:19 -2011-05-04 05:08:22 -2011-05-04 05:14:23 -2011-05-04 05:20:26 -2011-05-04 05:26:29 -2011-05-04 05:32:30 -2011-05-04 05:38:28 -2011-05-04 05:44:26 -2011-05-04 05:50:26 -2011-05-04 05:56:32 -2011-05-04 06:02:39 -2011-05-04 06:08:48 -2011-05-04 06:14:56 -2011-05-04 06:21:06 -2011-05-04 06:27:18 -2011-05-04 06:33:29 -2011-05-04 06:39:40 -2011-05-04 06:45:50 -2011-05-04 06:51:59 -2011-05-04 06:58:08 -2011-05-04 07:04:16 -2011-05-04 07:10:23 -2011-05-04 07:16:27 -2011-05-04 07:22:33 -2011-05-04 07:28:39 -2011-05-04 07:34:45 -2011-05-04 07:40:51 -2011-05-04 07:46:58 -2011-05-04 07:53:04 -2011-05-04 07:59:09 -2011-05-04 08:05:16 -2011-05-04 08:11:20 -2011-05-04 08:17:21 -2011-05-04 08:23:22 -2011-05-04 08:29:21 -2011-05-04 08:35:20 -2011-05-04 08:41:22 -2011-05-04 08:47:21 -2011-05-04 08:53:37 -2011-05-04 10:14:08 -2011-05-04 10:20:16 -2011-05-04 10:26:17 -2011-05-04 10:32:18 -2011-05-04 10:38:19 -2011-05-04 10:44:25 -2011-05-04 10:50:35 -2011-05-04 10:56:47 -2011-05-04 11:03:04 -2011-05-04 11:09:15 -2011-05-04 11:15:24 -2011-05-04 11:21:24 -2011-05-04 11:27:23 -2011-05-04 11:33:22 -2011-05-04 11:39:24 -2011-05-04 11:45:22 -2011-05-04 11:51:25 -2011-05-04 11:57:30 -2011-05-04 12:03:38 -2011-05-04 12:09:45 -2011-05-04 12:15:52 -2011-05-04 12:22:00 -2011-05-04 12:28:12 -2011-05-04 12:34:18 -2011-05-04 12:40:29 -2011-05-04 12:46:32 -2011-05-04 12:52:33 -2011-05-04 12:58:37 -2011-05-04 13:04:47 -2011-05-04 13:10:56 -2011-05-04 13:17:07 -2011-05-04 13:23:21 -2011-05-04 13:29:32 -2011-05-04 13:35:42 -2011-05-04 13:41:51 -2011-05-04 13:47:53 -2011-05-04 13:53:48 -2011-05-04 13:59:52 -2011-05-04 14:05:53 -2011-05-04 14:11:50 -2011-05-04 14:17:45 -2011-05-04 14:23:48 -2011-05-04 14:29:51 -2011-05-04 16:37:13 -2011-05-04 16:43:13 -2011-05-04 16:49:10 -2011-05-04 16:55:06 -2011-05-04 17:01:01 -2011-05-04 17:06:56 -2011-05-04 17:12:52 -2011-05-04 17:18:46 -2011-05-04 17:24:39 -2011-05-04 17:30:58 -2011-05-05 05:34:31 -2011-05-05 05:40:55 -2011-05-05 05:46:57 -2011-05-05 05:52:59 -2011-05-05 05:59:00 -2011-05-05 06:04:56 -2011-05-05 06:10:48 -2011-05-05 06:16:38 -2011-05-05 06:22:32 -2011-05-05 08:19:14 -2011-05-05 08:25:25 -2011-05-05 08:31:29 -2011-05-05 08:37:30 -2011-05-05 08:43:34 -2011-05-05 08:49:38 -2011-05-05 08:55:42 -2011-05-05 09:01:41 -2011-05-05 09:07:38 -2011-05-05 09:13:36 -2011-05-05 09:19:35 -2011-05-05 09:25:34 -2011-05-05 09:31:35 -2011-05-05 09:37:39 -2011-05-05 09:43:44 -2011-05-05 09:49:49 -2011-05-05 09:55:54 -2011-05-05 10:02:07 -2011-05-05 10:08:14 -2011-05-05 10:14:23 -2011-05-05 10:20:29 -2011-05-05 10:26:34 -2011-05-05 10:32:36 -2011-05-05 10:38:44 -2011-05-05 10:44:54 -2011-05-05 10:51:05 -2011-05-05 10:57:20 -2011-05-05 11:03:27 -2011-05-05 11:09:37 -2011-05-05 11:15:45 -2011-05-05 11:21:50 -2011-05-05 12:21:03 -2011-05-05 12:27:12 -2011-05-05 12:33:18 -2011-05-05 12:39:25 -2011-05-05 12:45:34 -2011-05-05 12:51:44 -2011-05-05 12:57:48 -2011-05-05 13:03:51 -2011-05-05 13:09:51 -2011-05-05 13:15:53 -2011-05-05 13:21:57 -2011-05-05 13:27:55 -2011-05-05 13:33:56 -2011-05-05 13:39:54 -2011-05-05 13:46:07 -2011-05-05 13:52:22 -2011-05-05 13:58:36 -2011-05-05 14:04:47 -2011-05-05 14:11:01 -2011-05-05 14:17:17 -2011-05-05 14:23:35 -2011-05-05 14:29:52 -2011-05-05 14:36:10 -2011-05-05 14:42:28 -2011-05-05 14:48:40 -2011-05-05 14:54:52 -2011-05-05 15:01:01 -2011-05-05 15:07:06 -2011-05-05 15:13:16 -2011-05-05 15:19:27 -2011-05-05 15:28:25 -2011-05-05 17:36:04 -2011-05-05 17:42:08 -2011-05-05 17:48:17 -2011-05-05 17:54:25 -2011-05-05 18:00:32 -2011-05-05 18:06:35 -2011-05-05 18:12:36 -2011-05-05 18:18:43 -2011-05-05 18:24:49 -2011-05-05 18:31:20 -2011-05-05 18:38:06 -2011-05-06 05:27:20 -2011-05-06 05:34:39 -2011-05-06 05:41:55 -2011-05-06 05:48:09 -2011-05-06 05:55:53 -2011-05-06 06:01:50 -2011-05-06 06:07:48 -2011-05-06 06:13:48 -2011-05-06 06:19:46 -2011-05-06 06:25:42 -2011-05-06 06:31:30 -2011-05-06 06:37:16 -2011-05-06 06:43:06 -2011-05-06 06:48:58 -2011-05-06 06:54:45 -2011-05-06 09:16:55 -2011-05-06 09:22:49 -2011-05-06 09:28:48 -2011-05-06 09:34:54 -2011-05-06 09:41:06 -2011-05-06 09:47:25 -2011-05-06 09:53:39 -2011-05-06 10:06:04 -2011-05-06 10:12:08 -2011-05-06 10:18:09 -2011-05-06 10:24:04 -2011-05-06 10:29:57 -2011-05-06 10:35:53 -2011-05-06 10:41:58 -2011-05-06 10:48:04 -2011-05-06 10:54:04 -2011-05-06 11:00:00 -2011-05-06 11:05:59 -2011-05-06 11:12:05 -2011-05-06 11:18:14 -2011-05-06 11:24:25 -2011-05-06 11:30:31 -2011-05-06 11:36:33 -2011-05-06 11:42:34 -2011-05-06 11:48:31 -2011-05-06 11:54:26 -2011-05-06 13:08:50 -2011-05-06 13:14:44 -2011-05-06 13:20:35 -2011-05-06 13:26:34 -2011-05-06 13:32:36 -2011-05-06 13:38:33 -2011-05-06 13:44:32 -2011-05-06 13:50:36 -2011-05-06 13:56:42 -2011-05-06 14:02:43 -2011-05-06 14:13:03 -2011-05-06 14:19:08 -2011-05-06 14:28:07 -2011-05-06 14:34:09 -2011-05-06 14:40:09 -2011-05-06 14:46:06 -2011-05-06 14:51:59 -2011-05-06 14:57:48 -2011-05-06 15:03:35 -2011-05-06 15:09:21 -2011-05-06 15:16:51 -2011-05-06 15:22:46 -2011-05-06 15:28:38 -2011-05-06 15:34:33 -2011-05-06 15:40:33 -2011-05-06 15:46:32 -2011-05-06 18:37:52 -2011-05-06 18:43:52 -2011-05-06 18:50:00 -2011-05-06 18:56:04 -2011-05-06 19:02:12 -2011-05-06 19:08:22 -2011-05-06 19:14:29 -2011-05-06 19:20:35 -2011-05-06 19:26:38 -2011-05-06 19:32:43 -2011-05-06 19:38:35 -2011-05-07 04:59:13 -2011-05-07 05:05:21 -2011-05-07 05:11:41 -2011-05-07 05:18:42 -2011-05-07 05:25:26 -2011-05-07 05:31:38 -2011-05-07 05:37:42 -2011-05-07 05:43:48 -2011-05-07 05:49:51 -2011-05-07 05:55:53 -2011-05-07 06:01:54 -2011-05-07 06:07:54 -2011-05-07 06:14:06 -2011-05-07 06:20:12 -2011-05-07 06:26:27 -2011-05-07 06:33:21 -2011-05-07 06:41:01 -2011-05-07 06:48:34 -2011-05-07 08:59:55 -2011-05-07 09:06:14 -2011-05-07 09:12:35 -2011-05-07 09:18:41 -2011-05-07 09:24:59 -2011-05-07 09:31:16 -2011-05-07 09:37:37 -2011-05-07 09:43:58 -2011-05-07 09:50:14 -2011-05-07 09:56:34 -2011-05-07 10:02:51 -2011-05-07 10:09:07 -2011-05-07 10:15:21 -2011-05-07 10:21:26 -2011-05-07 10:27:43 -2011-05-07 10:33:54 -2011-05-07 10:40:06 -2011-05-07 10:46:15 -2011-05-07 10:52:29 -2011-05-07 10:58:50 -2011-05-07 11:05:06 -2011-05-07 11:11:29 -2011-05-07 11:17:45 -2011-05-07 11:23:56 -2011-05-07 11:30:13 -2011-05-07 11:36:28 -2011-05-07 11:42:39 -2011-05-07 11:48:53 -2011-05-07 11:54:56 -2011-05-07 12:01:00 -2011-05-07 12:07:07 -2011-05-07 12:13:06 -2011-05-07 15:19:02 -2011-05-07 15:25:24 -2011-05-07 15:31:45 -2011-05-07 15:38:12 -2011-05-07 15:44:24 -2011-05-07 15:50:37 -2011-05-07 15:56:48 -2011-05-07 16:02:58 -2011-05-07 16:09:10 -2011-05-07 16:15:24 -2011-05-07 16:21:32 -2011-05-07 16:27:48 -2011-05-07 16:34:10 -2011-05-07 16:40:26 -2011-05-07 16:46:43 -2011-05-07 16:53:07 -2011-05-07 16:59:25 -2011-05-07 17:05:36 -2011-05-07 17:11:49 -2011-05-07 17:17:59 -2011-05-07 17:24:18 -2011-05-07 17:30:33 -2011-05-07 17:36:49 -2011-05-07 17:42:59 -2011-05-07 17:48:55 -2011-05-07 17:54:59 -2011-05-07 18:00:54 -2011-05-07 18:06:45 -2011-05-07 18:12:40 -2011-05-07 18:18:30 -2011-05-07 18:24:15 -2011-05-07 18:30:06 -2011-05-07 18:36:08 -2011-05-07 18:42:10 -2011-05-07 18:48:17 -2011-05-07 18:54:32 -2011-05-07 19:00:46 -2011-05-07 19:06:56 -2011-05-07 19:13:16 -2011-05-07 19:19:32 -2011-05-07 19:26:07 -2011-05-08 04:54:07 -2011-05-08 05:00:12 -2011-05-08 05:06:16 -2011-05-08 05:12:18 -2011-05-08 05:18:41 -2011-05-08 05:25:12 -2011-05-08 05:31:12 -2011-05-08 05:37:11 -2011-05-08 05:43:13 -2011-05-08 05:49:25 -2011-05-08 05:55:44 -2011-05-08 06:02:06 -2011-05-08 08:15:11 -2011-05-08 08:21:16 -2011-05-08 08:27:24 -2011-05-08 08:33:29 -2011-05-08 08:39:24 -2011-05-08 08:45:23 -2011-05-08 08:51:26 -2011-05-08 08:57:29 -2011-05-08 09:03:33 -2011-05-08 09:09:39 -2011-05-08 09:15:45 -2011-05-08 09:21:49 -2011-05-08 09:27:51 -2011-05-08 09:33:54 -2011-05-08 09:39:57 -2011-05-08 09:46:01 -2011-05-08 09:52:06 -2011-05-08 09:58:10 -2011-05-08 10:04:19 -2011-05-08 10:10:31 -2011-05-08 10:16:40 -2011-05-08 10:22:49 -2011-05-08 10:28:55 -2011-05-08 10:35:04 -2011-05-08 10:41:13 -2011-05-08 10:47:25 -2011-05-08 10:53:38 -2011-05-08 10:59:49 -2011-05-08 11:06:00 -2011-05-08 11:12:06 -2011-05-08 11:18:13 -2011-05-08 11:24:22 -2011-05-08 11:30:30 -2011-05-08 11:36:44 -2011-05-08 11:43:06 -2011-05-08 11:49:33 -2011-05-08 11:55:51 -2011-05-08 12:02:13 -2011-05-08 12:08:28 -2011-05-08 12:14:28 -2011-05-08 13:34:41 -2011-05-08 13:40:52 -2011-05-08 13:47:03 -2011-05-08 13:53:11 -2011-05-08 13:59:26 -2011-05-08 14:05:52 -2011-05-08 14:12:07 -2011-05-08 14:18:18 -2011-05-08 14:24:40 -2011-05-08 14:31:06 -2011-05-08 14:37:23 -2011-05-08 14:43:43 -2011-05-08 14:50:03 -2011-05-08 14:56:42 -2011-05-08 15:03:05 -2011-05-08 15:09:36 -2011-05-08 15:15:50 -2011-05-08 15:22:24 -2011-05-08 15:28:51 -2011-05-08 15:35:18 -2011-05-08 15:41:58 -2011-05-08 15:48:27 -2011-05-08 15:54:52 -2011-05-08 16:01:16 -2011-05-08 16:08:26 -2011-05-08 16:15:50 -2011-05-08 16:22:24 -2011-05-08 19:19:09 -2011-05-08 19:25:19 -2011-05-08 19:31:21 -2011-05-08 19:37:39 -2011-05-08 19:43:39 -2011-05-08 19:49:39 -2011-05-08 19:55:38 -2011-05-10 11:06:22 -2011-05-10 11:12:12 -2011-05-10 11:18:13 -2011-05-10 11:24:16 -2011-05-10 11:30:12 -2011-05-10 11:36:13 -2011-05-10 11:42:06 -2011-05-10 11:48:03 -2011-05-10 11:54:04 -2011-05-10 12:00:05 -2011-05-10 12:06:38 -2011-05-10 12:14:12 -2011-05-10 14:07:09 -2011-05-10 14:13:18 -2011-05-10 14:19:25 -2011-05-10 14:25:38 -2011-05-10 14:31:53 -2011-05-10 14:38:11 -2011-05-10 14:44:29 -2011-05-10 14:50:32 -2011-05-10 14:56:36 -2011-05-10 15:02:33 -2011-05-10 15:08:32 -2011-05-10 15:14:32 -2011-05-10 15:20:30 -2011-05-10 15:26:24 -2011-05-10 15:32:20 -2011-05-10 15:38:17 -2011-05-10 15:44:20 -2011-05-10 15:50:25 -2011-05-10 15:56:29 -2011-05-10 16:02:36 -2011-05-10 16:08:50 -2011-05-10 16:15:00 -2011-05-10 16:21:00 -2011-05-10 16:26:59 -2011-05-10 16:33:07 -2011-05-10 16:39:15 -2011-05-10 16:45:21 -2011-05-10 16:51:27 -2011-05-10 16:57:36 -2011-05-10 17:03:40 -2011-05-10 17:09:46 -2011-05-10 17:15:49 -2011-05-10 17:21:59 -2011-05-10 17:28:04 -2011-05-10 17:34:09 -2011-05-11 05:00:10 -2011-05-11 05:06:09 -2011-05-11 05:12:10 -2011-05-11 05:18:10 -2011-05-11 05:24:16 -2011-05-11 05:30:19 -2011-05-11 05:36:27 -2011-05-11 05:42:35 -2011-05-11 05:48:43 -2011-05-11 05:54:51 -2011-05-11 06:01:00 -2011-05-11 06:07:05 -2011-05-11 06:13:07 -2011-05-11 06:19:09 -2011-05-11 06:25:12 -2011-05-11 06:31:20 -2011-05-11 06:37:28 -2011-05-11 06:43:36 -2011-05-11 06:49:43 -2011-05-11 06:55:50 -2011-05-11 07:02:01 -2011-05-11 07:08:11 -2011-05-11 07:14:53 -2011-05-11 07:23:15 -2011-05-11 09:55:59 -2011-05-11 10:01:56 -2011-05-11 10:07:53 -2011-05-11 10:13:50 -2011-05-11 10:19:48 -2011-05-11 10:25:46 -2011-05-11 10:31:43 -2011-05-11 10:37:42 -2011-05-11 10:43:45 -2011-05-11 10:49:49 -2011-05-11 10:55:53 -2011-05-11 11:01:52 -2011-05-11 11:07:35 -2011-05-11 11:13:30 -2011-05-11 11:19:23 -2011-05-11 11:25:10 -2011-05-11 11:30:58 -2011-05-11 11:36:53 -2011-05-11 11:42:52 -2011-05-11 13:02:40 -2011-05-11 13:08:45 -2011-05-11 13:14:45 -2011-05-11 13:20:47 -2011-05-11 13:26:51 -2011-05-11 13:32:57 -2011-05-11 13:38:58 -2011-05-11 13:46:18 -2011-05-11 16:06:57 -2011-05-11 16:12:55 -2011-05-11 16:18:52 -2011-05-11 16:24:48 -2011-05-11 16:30:43 -2011-05-11 16:36:38 -2011-05-11 16:42:32 -2011-05-11 16:48:25 -2011-05-11 16:54:21 -2011-05-11 17:00:22 -2011-05-11 17:06:16 -2011-05-11 17:12:11 -2011-05-11 17:18:07 -2011-05-11 17:24:01 -2011-05-11 17:29:55 -2011-05-11 17:35:54 -2011-05-11 17:41:53 -2011-05-11 17:47:52 -2011-05-11 17:53:50 -2011-05-11 17:59:47 -2011-05-11 18:05:46 -2011-05-11 18:11:43 -2011-05-11 18:17:35 -2011-05-11 18:23:25 -2011-05-11 18:29:13 -2011-05-11 18:35:00 -2011-05-11 18:40:50 -2011-05-12 04:50:27 -2011-05-12 04:56:37 -2011-05-12 05:02:46 -2011-05-12 05:08:56 -2011-05-12 05:15:02 -2011-05-12 05:21:06 -2011-05-12 05:27:12 -2011-05-12 05:33:15 -2011-05-12 05:39:17 -2011-05-12 05:45:18 -2011-05-12 05:51:17 -2011-05-12 05:57:19 -2011-05-12 06:03:20 -2011-05-12 06:09:20 -2011-05-12 06:15:24 -2011-05-12 06:21:39 -2011-05-12 06:27:47 -2011-05-12 09:08:40 -2011-05-12 09:14:39 -2011-05-12 09:20:38 -2011-05-12 09:26:35 -2011-05-12 09:32:31 -2011-05-12 09:38:26 -2011-05-12 09:44:23 -2011-05-12 09:50:26 -2011-05-12 09:56:28 -2011-05-12 10:02:32 -2011-05-12 10:08:32 -2011-05-12 10:14:36 -2011-05-12 10:20:38 -2011-05-12 10:26:38 -2011-05-12 10:32:33 -2011-05-12 10:38:23 -2011-05-12 10:44:11 -2011-05-12 10:50:00 -2011-05-12 10:55:47 -2011-05-12 11:01:30 -2011-05-12 11:07:11 -2011-05-12 11:12:56 -2011-05-12 11:18:41 -2011-05-12 11:24:38 -2011-05-12 11:30:39 -2011-05-12 13:49:05 -2011-05-12 13:55:08 -2011-05-12 14:01:12 -2011-05-12 14:07:12 -2011-05-12 14:13:15 -2011-05-12 14:19:17 -2011-05-12 14:25:21 -2011-05-12 14:31:24 -2011-05-12 14:37:36 -2011-05-12 14:43:45 -2011-05-12 14:49:58 -2011-05-12 14:56:17 -2011-05-12 15:02:19 -2011-05-12 15:08:15 -2011-05-12 15:13:51 -2011-05-12 16:34:27 -2011-05-12 16:40:37 -2011-05-12 16:46:43 -2011-05-12 16:52:46 -2011-05-12 16:58:47 -2011-05-12 17:04:45 -2011-05-12 17:10:45 -2011-05-12 17:16:40 -2011-05-12 17:22:27 -2011-05-12 17:28:11 -2011-05-12 17:33:52 -2011-05-12 17:39:33 -2011-05-12 17:45:15 -2011-05-12 17:50:58 -2011-05-12 17:56:36 -2011-05-12 18:02:19 -2011-05-12 18:08:02 -2011-05-12 18:13:39 -2011-05-12 18:19:15 -2011-05-12 18:24:49 -2011-05-12 18:30:23 -2011-05-12 18:35:57 -2011-05-12 18:41:43 -2011-05-12 18:47:29 -2011-05-12 18:53:13 -2011-05-12 18:58:58 -2011-05-12 19:04:46 -2011-05-12 19:10:33 -2011-05-12 19:16:27 -2011-05-12 19:22:25 -2011-05-13 05:45:06 -2011-05-13 05:51:07 -2011-05-13 05:57:05 -2011-05-13 06:03:03 -2011-05-13 06:09:04 -2011-05-13 06:15:04 -2011-05-13 06:21:01 -2011-05-13 06:27:01 -2011-05-13 06:32:58 -2011-05-13 06:38:52 -2011-05-13 06:44:44 -2011-05-13 06:50:30 -2011-05-13 06:56:16 -2011-05-13 09:05:09 -2011-05-13 09:11:11 -2011-05-13 09:17:16 -2011-05-13 10:37:14 -2011-05-13 10:43:23 -2011-05-13 10:49:33 -2011-05-13 10:55:46 -2011-05-13 11:01:56 -2011-05-13 11:08:02 -2011-05-13 11:14:06 -2011-05-13 11:20:02 -2011-05-13 11:25:58 -2011-05-13 11:31:50 -2011-05-13 11:37:43 -2011-05-13 11:43:41 -2011-05-13 11:49:38 -2011-05-13 11:55:35 -2011-05-13 12:01:32 -2011-05-13 12:07:34 -2011-05-13 12:13:37 -2011-05-13 12:19:44 -2011-05-13 12:25:49 -2011-05-13 12:31:52 -2011-05-13 12:37:50 -2011-05-13 12:43:47 -2011-05-13 12:49:39 -2011-05-13 12:55:27 -2011-05-13 13:01:18 -2011-05-13 13:07:11 -2011-05-13 13:13:06 -2011-05-13 13:19:06 -2011-05-13 13:25:07 -2011-05-13 13:31:15 -2011-05-13 15:51:02 -2011-05-13 15:56:53 -2011-05-13 16:02:42 -2011-05-13 16:08:29 -2011-05-13 16:14:20 -2011-05-13 16:20:08 -2011-05-13 16:26:03 -2011-05-13 16:31:59 -2011-05-13 16:37:54 -2011-05-13 16:43:49 -2011-05-13 16:49:55 -2011-05-13 16:56:04 -2011-05-13 17:02:14 -2011-05-13 17:08:18 -2011-05-13 17:14:20 -2011-05-13 17:20:25 -2011-05-13 17:26:31 -2011-05-13 17:32:26 -2011-05-13 17:38:19 -2011-05-13 17:44:21 -2011-05-13 17:50:22 -2011-05-13 17:56:30 -2011-05-13 18:02:33 -2011-05-13 18:08:31 -2011-05-13 18:14:27 -2011-05-13 18:20:25 -2011-05-13 18:26:22 -2011-05-13 18:32:24 -2011-05-13 18:38:19 -2011-05-13 18:44:11 -2011-05-13 18:50:05 -2011-05-13 18:55:52 -2011-05-13 19:01:38 -2011-05-13 19:07:26 -2011-05-13 19:13:12 -2011-05-13 19:18:51 -2011-05-13 19:24:35 -2011-05-13 19:30:19 -2011-05-13 19:36:11 -2011-05-13 19:42:03 -2011-05-13 19:48:02 -2011-05-13 19:53:57 -2011-05-13 19:59:48 -2011-05-13 20:05:44 -2011-05-13 20:11:41 -2011-05-13 20:17:38 -2011-05-13 20:23:39 -2011-05-13 20:29:42 -2011-05-13 20:35:48 -2011-05-14 04:54:48 -2011-05-14 05:01:01 -2011-05-14 05:07:12 -2011-05-14 05:13:22 -2011-05-14 05:19:25 -2011-05-14 05:25:31 -2011-05-14 05:46:17 -2011-05-14 05:52:34 -2011-05-14 05:58:46 -2011-05-14 06:04:50 -2011-05-14 06:10:51 -2011-05-14 06:16:48 -2011-05-14 06:22:41 -2011-05-14 06:28:39 -2011-05-14 06:34:44 -2011-05-14 06:41:30 -2011-05-14 09:29:03 -2011-05-14 09:35:00 -2011-05-14 09:40:52 -2011-05-14 09:46:50 -2011-05-14 09:52:42 -2011-05-14 09:58:28 -2011-05-14 10:04:17 -2011-05-14 10:10:05 -2011-05-14 10:15:56 -2011-05-14 10:21:49 -2011-05-14 10:27:44 -2011-05-14 10:33:36 -2011-05-14 10:39:28 -2011-05-14 10:45:25 -2011-05-14 10:51:20 -2011-05-14 10:57:17 -2011-05-14 11:03:23 -2011-05-14 11:09:27 -2011-05-14 11:15:31 -2011-05-14 11:21:35 -2011-05-14 11:27:34 -2011-05-14 11:33:35 -2011-05-14 11:39:36 -2011-05-14 11:45:34 -2011-05-14 11:51:35 -2011-05-14 11:57:44 -2011-05-14 12:03:50 -2011-05-14 12:09:54 -2011-05-14 12:16:01 -2011-05-14 12:22:11 -2011-05-14 13:44:30 -2011-05-14 13:50:41 -2011-05-14 13:56:40 -2011-05-14 14:02:42 -2011-05-14 14:08:40 -2011-05-14 14:14:43 -2011-05-14 14:20:48 -2011-05-14 14:26:48 -2011-05-14 14:32:47 -2011-05-14 14:38:42 -2011-05-14 14:44:32 -2011-05-14 14:50:13 -2011-05-14 14:55:55 -2011-05-14 15:01:37 -2011-05-14 15:07:16 -2011-05-14 15:12:52 -2011-05-14 15:18:27 -2011-05-14 15:24:02 -2011-05-14 15:29:42 -2011-05-14 15:35:23 -2011-05-14 15:41:06 -2011-05-14 15:46:46 -2011-05-14 15:52:30 -2011-05-14 15:58:06 -2011-05-14 16:03:37 -2011-05-14 16:09:04 -2011-05-14 16:14:33 -2011-05-14 16:20:06 -2011-05-14 16:25:46 -2011-05-14 16:31:28 -2011-05-14 16:37:13 -2011-05-14 16:43:01 -2011-05-14 16:48:53 -2011-05-14 16:54:43 -2011-05-14 17:00:38 -2011-05-14 17:06:28 -2011-05-14 17:12:15 -2011-05-14 17:17:58 -2011-05-14 17:23:38 -2011-05-14 17:29:19 -2011-05-14 17:35:07 -2011-05-14 17:41:01 -2011-05-14 17:46:50 -2011-05-14 17:52:49 -2011-05-14 20:16:06 -2011-05-14 20:22:02 -2011-05-14 20:27:55 -2011-05-14 20:33:48 -2011-05-14 20:39:46 -2011-05-14 20:45:44 -2011-05-15 05:59:53 -2011-05-15 06:06:52 -2011-05-15 06:13:41 -2011-05-15 06:19:58 -2011-05-15 06:26:02 -2011-05-15 06:32:03 -2011-05-15 06:38:00 -2011-05-15 06:43:54 -2011-05-15 08:51:14 -2011-05-15 08:57:06 -2011-05-15 09:03:07 -2011-05-15 09:09:06 -2011-05-15 09:15:05 -2011-05-15 09:21:04 -2011-05-15 09:27:06 -2011-05-15 09:33:09 -2011-05-15 09:39:16 -2011-05-15 09:45:13 -2011-05-15 09:51:12 -2011-05-15 09:57:12 -2011-05-15 10:03:14 -2011-05-15 10:09:16 -2011-05-15 10:15:19 -2011-05-15 10:21:19 -2011-05-15 10:27:14 -2011-05-15 10:33:21 -2011-05-15 10:39:30 -2011-05-15 10:45:31 -2011-05-15 10:51:25 -2011-05-15 10:57:05 -2011-05-15 11:02:37 -2011-05-15 11:08:14 -2011-05-15 11:14:01 -2011-05-15 11:19:54 -2011-05-15 11:25:48 -2011-05-15 11:31:46 -2011-05-15 15:35:50 -2011-05-15 15:41:37 -2011-05-15 15:47:26 -2011-05-15 15:53:18 -2011-05-15 15:59:09 -2011-05-15 16:04:55 -2011-05-15 16:10:44 -2011-05-15 16:16:31 -2011-05-15 16:22:21 -2011-05-15 16:28:12 -2011-05-15 16:34:02 -2011-05-15 16:39:49 -2011-05-15 16:45:33 -2011-05-15 16:51:14 -2011-05-15 16:56:58 -2011-05-15 17:02:41 -2011-05-15 17:08:24 -2011-05-15 17:14:05 -2011-05-15 17:19:44 -2011-05-15 17:25:26 -2011-05-15 17:31:12 -2011-05-15 17:36:54 -2011-05-15 17:42:35 -2011-05-15 17:48:15 -2011-05-15 17:53:57 -2011-05-15 17:59:33 -2011-05-15 18:05:13 -2011-05-15 18:11:12 -2011-05-15 18:17:29 -2011-05-15 18:23:49 -2011-05-15 18:30:18 -2011-05-15 18:36:32 -2011-05-15 18:42:41 -2011-05-15 18:48:43 -2011-05-15 18:54:41 -2011-05-15 19:00:39 -2011-05-15 19:06:36 -2011-05-15 19:12:32 -2011-05-15 19:18:27 -2011-05-15 19:24:29 -2011-05-16 04:54:40 -2011-05-16 05:00:24 -2011-05-16 05:06:15 -2011-05-16 05:11:58 -2011-05-16 05:17:29 -2011-05-16 05:23:02 -2011-05-16 05:28:40 -2011-05-16 05:34:25 -2011-05-16 05:40:07 -2011-05-16 05:45:51 -2011-05-16 05:51:36 -2011-05-16 05:57:23 -2011-05-16 06:03:15 -2011-05-16 06:09:09 -2011-05-16 06:15:03 -2011-05-16 06:20:47 -2011-05-16 06:26:31 -2011-05-16 06:32:13 -2011-05-16 06:37:55 -2011-05-16 09:45:24 -2011-05-16 09:51:41 -2011-05-16 09:58:07 -2011-05-16 10:04:26 -2011-05-16 10:10:35 -2011-05-16 10:16:41 -2011-05-16 10:22:44 -2011-05-16 10:28:41 -2011-05-16 10:34:40 -2011-05-16 10:40:38 -2011-05-16 10:46:34 -2011-05-16 10:52:28 -2011-05-16 10:58:23 -2011-05-16 11:04:20 -2011-05-16 11:10:17 -2011-05-16 11:16:18 -2011-05-16 11:22:21 -2011-05-16 11:28:21 -2011-05-16 14:09:12 -2011-05-16 14:15:15 -2011-05-16 14:21:19 -2011-05-16 14:27:28 -2011-05-16 14:33:34 -2011-05-16 14:39:39 -2011-05-16 14:45:40 -2011-05-16 14:51:37 -2011-05-16 14:57:36 -2011-05-16 15:03:31 -2011-05-16 15:09:26 -2011-05-16 16:17:11 -2011-05-16 16:23:15 -2011-05-16 16:29:18 -2011-05-16 16:35:22 -2011-05-16 16:41:28 -2011-05-16 16:47:40 -2011-05-16 16:53:56 -2011-05-16 17:00:14 -2011-05-16 17:06:32 -2011-05-16 17:12:50 -2011-05-16 17:19:07 -2011-05-16 17:25:23 -2011-05-16 17:31:41 -2011-05-16 17:37:49 -2011-05-16 17:43:53 -2011-05-16 17:50:01 -2011-05-16 17:56:05 -2011-05-16 18:02:13 -2011-05-16 18:08:17 -2011-05-16 18:14:21 -2011-05-16 18:20:34 -2011-05-16 18:26:38 -2011-05-16 18:32:38 -2011-05-16 18:38:35 -2011-05-16 18:44:35 -2011-05-16 18:50:42 -2011-05-16 18:56:52 -2011-05-16 19:03:01 -2011-05-16 19:09:24 -2011-05-16 19:15:56 -2011-05-16 19:22:09 -2011-05-16 19:28:21 -2011-05-16 19:34:24 -2011-05-16 19:40:22 -2011-05-16 19:46:17 -2011-05-16 19:52:10 -2011-05-16 19:58:17 -2011-05-17 06:08:36 -2011-05-17 06:14:42 -2011-05-17 06:20:46 -2011-05-17 06:26:50 -2011-05-17 06:32:55 -2011-05-17 06:38:56 -2011-05-17 06:44:54 -2011-05-17 06:50:49 -2011-05-17 06:56:45 -2011-05-17 09:20:53 -2011-05-17 09:26:50 -2011-05-17 09:32:46 -2011-05-17 09:38:38 -2011-05-17 09:44:35 -2011-05-17 09:50:28 -2011-05-17 09:56:20 -2011-05-17 10:02:12 -2011-05-17 10:08:02 -2011-05-17 10:13:49 -2011-05-17 10:19:34 -2011-05-17 10:25:19 -2011-05-17 10:31:22 -2011-05-17 10:37:28 -2011-05-17 10:43:32 -2011-05-17 10:49:37 -2011-05-17 10:55:39 -2011-05-17 11:01:38 -2011-05-17 11:07:33 -2011-05-17 11:13:28 -2011-05-17 11:19:24 -2011-05-17 11:25:16 -2011-05-17 11:31:06 -2011-05-17 11:36:53 -2011-05-17 11:42:42 -2011-05-17 11:48:27 -2011-05-17 11:54:07 -2011-05-17 11:59:50 -2011-05-17 12:05:33 -2011-05-17 12:11:25 -2011-05-17 12:17:54 -2011-05-17 14:09:55 -2011-05-17 14:16:38 -2011-05-17 14:27:30 -2011-05-17 14:33:48 -2011-05-17 14:39:45 -2011-05-17 14:45:38 -2011-05-17 14:51:24 -2011-05-17 14:57:11 -2011-05-17 15:02:55 -2011-05-17 16:59:45 -2011-05-17 17:05:27 -2011-05-17 17:11:07 -2011-05-17 17:16:42 -2011-05-17 17:22:21 -2011-05-17 17:28:04 -2011-05-17 17:33:47 -2011-05-17 17:39:30 -2011-05-17 17:45:23 -2011-05-17 17:51:16 -2011-05-17 17:57:11 -2011-05-17 18:03:04 -2011-05-17 18:08:57 -2011-05-17 18:14:44 -2011-05-17 18:20:31 -2011-05-17 18:26:16 -2011-05-17 18:32:08 -2011-05-17 18:37:59 -2011-05-17 18:43:46 -2011-05-17 18:49:28 -2011-05-17 18:55:07 -2011-05-17 19:00:53 -2011-05-17 19:06:42 -2011-05-17 19:12:28 -2011-05-18 05:04:05 -2011-05-18 05:10:58 -2011-05-18 05:18:33 -2011-05-18 05:25:13 -2011-05-18 05:31:17 -2011-05-18 05:37:23 -2011-05-18 05:43:31 -2011-05-18 05:49:42 -2011-05-18 05:55:56 -2011-05-18 06:02:11 -2011-05-18 06:08:23 -2011-05-18 06:14:29 -2011-05-18 06:21:40 -2011-05-18 06:28:50 -2011-05-18 06:35:50 -2011-05-18 06:42:22 -2011-05-18 06:48:41 -2011-05-18 06:54:52 -2011-05-18 07:00:58 -2011-05-18 07:06:49 -2011-05-18 07:12:39 -2011-05-18 07:18:41 -2011-05-18 07:26:28 -2011-05-18 09:33:21 -2011-05-18 09:39:24 -2011-05-18 09:45:23 -2011-05-18 09:51:22 -2011-05-18 09:57:15 -2011-05-18 10:03:09 -2011-05-18 10:08:56 -2011-05-18 10:14:49 -2011-05-18 10:20:47 -2011-05-18 11:50:11 -2011-05-18 11:56:06 -2011-05-18 12:02:09 -2011-05-18 12:08:07 -2011-05-18 12:14:00 -2011-05-18 12:19:59 -2011-05-18 12:26:03 -2011-05-18 14:17:57 -2011-05-18 14:23:49 -2011-05-18 14:29:41 -2011-05-18 14:35:34 -2011-05-18 14:41:29 -2011-05-18 14:47:24 -2011-05-18 14:53:20 -2011-05-18 14:59:14 -2011-05-18 15:05:08 -2011-05-18 15:11:02 -2011-05-18 15:16:59 -2011-05-18 15:22:55 -2011-05-18 15:28:52 -2011-05-18 15:34:52 -2011-05-18 15:40:48 -2011-05-18 15:46:38 -2011-05-18 15:52:24 -2011-05-18 15:58:06 -2011-05-18 16:03:45 -2011-05-18 16:09:20 -2011-05-18 16:14:53 -2011-05-18 16:20:23 -2011-05-18 16:26:03 -2011-05-18 16:31:45 -2011-05-18 16:37:32 -2011-05-18 16:43:21 -2011-05-18 16:49:15 -2011-05-18 16:55:09 -2011-05-18 17:00:59 -2011-05-18 17:06:53 -2011-05-18 17:12:41 -2011-05-18 17:18:24 -2011-05-18 17:24:06 -2011-05-18 17:29:46 -2011-05-18 17:35:30 -2011-05-18 17:41:17 -2011-05-18 17:47:02 -2011-05-18 17:52:44 -2011-05-18 17:58:28 -2011-05-18 18:04:26 -2011-05-19 05:38:12 -2011-05-19 05:44:14 -2011-05-19 05:50:13 -2011-05-19 05:56:16 -2011-05-19 06:02:19 -2011-05-19 06:08:28 -2011-05-19 06:14:41 -2011-05-19 06:20:56 -2011-05-19 06:27:08 -2011-05-19 06:33:21 -2011-05-19 06:39:33 -2011-05-19 06:45:46 -2011-05-19 06:51:57 -2011-05-19 06:58:03 -2011-05-19 07:04:10 -2011-05-19 07:10:17 -2011-05-19 07:16:20 -2011-05-19 07:22:21 -2011-05-19 07:28:15 -2011-05-19 07:34:12 -2011-05-19 07:40:03 -2011-05-19 07:45:55 -2011-05-19 07:51:56 -2011-05-19 07:57:54 -2011-05-19 08:03:58 -2011-05-19 08:10:00 -2011-05-19 08:16:05 -2011-05-19 08:22:08 -2011-05-19 08:28:02 -2011-05-19 08:33:54 -2011-05-19 10:30:12 -2011-05-19 10:36:20 -2011-05-19 10:42:28 -2011-05-19 10:48:24 -2011-05-19 10:54:14 -2011-05-19 11:00:09 -2011-05-19 11:05:56 -2011-05-19 11:11:51 -2011-05-19 11:17:51 -2011-05-19 11:23:45 -2011-05-19 11:29:40 -2011-05-19 11:35:39 -2011-05-19 11:41:39 -2011-05-19 11:47:49 -2011-05-19 11:54:11 -2011-05-19 12:00:26 -2011-05-19 12:06:47 -2011-05-19 12:13:07 -2011-05-19 12:19:29 -2011-05-19 12:25:49 -2011-05-19 12:32:09 -2011-05-19 12:38:31 -2011-05-19 12:44:51 -2011-05-19 12:51:06 -2011-05-19 12:57:29 -2011-05-19 15:14:07 -2011-05-19 15:20:15 -2011-05-19 15:26:25 -2011-05-19 15:32:37 -2011-05-19 15:38:56 -2011-05-19 15:45:12 -2011-05-19 15:51:26 -2011-05-19 15:57:41 -2011-05-19 16:03:58 -2011-05-19 16:10:11 -2011-05-19 16:16:24 -2011-05-20 07:57:51 -2011-05-20 08:03:40 -2011-05-20 08:09:29 -2011-05-20 08:15:23 -2011-05-20 08:21:15 -2011-05-20 08:27:13 -2011-05-20 08:33:07 -2011-05-20 08:39:03 -2011-05-20 08:44:57 -2011-05-20 08:50:48 -2011-05-20 08:56:35 -2011-05-20 09:02:20 -2011-05-20 09:08:01 -2011-05-20 09:13:45 -2011-05-20 09:19:33 -2011-05-20 09:25:23 -2011-05-20 09:31:11 -2011-05-20 09:37:04 -2011-05-20 09:42:54 -2011-05-20 09:48:43 -2011-05-20 09:54:34 -2011-05-20 10:00:30 -2011-05-20 10:06:27 -2011-05-20 10:12:26 -2011-05-20 10:18:22 -2011-05-20 10:24:19 -2011-05-20 10:30:11 -2011-05-20 10:36:02 -2011-05-20 10:42:00 -2011-05-20 10:48:18 -2011-05-20 10:54:38 -2011-05-20 13:08:18 -2011-05-20 13:14:33 -2011-05-20 13:20:53 -2011-05-20 13:27:08 -2011-05-20 13:33:23 -2011-05-20 13:39:38 -2011-05-20 13:45:40 -2011-05-20 13:51:41 -2011-05-20 13:57:43 -2011-05-20 14:03:48 -2011-05-20 14:09:54 -2011-05-20 14:16:04 -2011-05-20 14:22:10 -2011-05-20 14:28:17 -2011-05-20 14:34:23 -2011-05-20 14:40:29 -2011-05-20 14:46:43 -2011-05-20 14:52:58 -2011-05-20 14:59:13 -2011-05-20 15:05:23 -2011-05-20 19:12:35 -2011-05-20 19:18:32 -2011-05-20 19:24:30 -2011-05-20 19:30:36 -2011-05-20 19:36:36 -2011-05-20 19:42:26 -2011-05-20 19:48:17 -2011-05-20 19:54:11 -2011-05-20 20:00:09 -2011-05-20 20:06:13 -2011-05-20 20:12:13 -2011-05-21 05:05:24 -2011-05-21 05:11:37 -2011-05-21 05:17:37 -2011-05-21 05:23:36 -2011-05-21 05:29:34 -2011-05-21 05:35:33 -2011-05-21 05:41:39 -2011-05-21 05:48:25 -2011-05-21 05:55:04 -2011-05-21 06:01:12 -2011-05-21 06:07:11 -2011-05-21 06:13:07 -2011-05-21 06:18:59 -2011-05-21 06:24:47 -2011-05-21 06:30:35 -2011-05-21 06:36:22 -2011-05-21 06:42:11 -2011-05-21 06:48:02 -2011-05-21 06:53:56 -2011-05-21 06:59:53 -2011-05-21 07:05:50 -2011-05-21 07:11:49 -2011-05-21 07:17:40 -2011-05-21 07:23:24 -2011-05-21 07:29:07 -2011-05-21 07:34:51 -2011-05-21 07:40:47 -2011-05-21 07:46:46 -2011-05-21 07:52:43 -2011-05-21 07:58:45 -2011-05-21 08:04:49 -2011-05-21 08:10:53 -2011-05-21 08:17:02 -2011-05-21 08:23:13 -2011-05-21 08:29:23 -2011-05-21 08:35:23 -2011-05-21 08:41:17 -2011-05-21 08:46:59 -2011-05-21 08:52:49 -2011-05-21 08:58:37 -2011-05-21 09:04:28 -2011-05-21 09:10:23 -2011-05-21 09:16:15 -2011-05-21 09:22:06 -2011-05-21 09:28:08 -2011-05-21 09:34:16 -2011-05-21 09:40:33 -2011-05-21 09:46:51 -2011-05-21 09:53:03 -2011-05-21 09:59:15 -2011-05-21 10:05:18 -2011-05-21 10:11:15 -2011-05-21 14:02:02 -2011-05-21 14:07:57 -2011-05-21 14:13:54 -2011-05-21 14:19:51 -2011-05-21 14:25:49 -2011-05-21 14:31:46 -2011-05-21 14:37:39 -2011-05-21 14:43:33 -2011-05-21 14:49:26 -2011-05-21 14:55:28 -2011-05-21 15:01:37 -2011-05-21 15:07:45 -2011-05-21 15:13:59 -2011-05-21 15:20:11 -2011-05-21 15:26:28 -2011-05-21 15:32:42 -2011-05-21 15:38:59 -2011-05-21 15:45:13 -2011-05-21 15:51:26 -2011-05-21 15:57:41 -2011-05-21 16:04:05 -2011-05-21 16:10:29 -2011-05-21 16:16:56 -2011-05-21 16:23:21 -2011-05-21 16:29:49 -2011-05-21 16:36:07 -2011-05-21 16:42:19 -2011-05-21 16:48:31 -2011-05-21 16:54:44 -2011-05-21 17:00:53 -2011-05-21 17:07:02 -2011-05-21 17:13:05 -2011-05-21 17:19:06 -2011-05-21 17:25:16 -2011-05-21 17:31:27 -2011-05-21 17:37:26 -2011-05-21 17:43:22 -2011-05-21 17:49:15 -2011-05-21 17:55:10 -2011-05-21 18:01:02 -2011-05-21 18:06:57 -2011-05-21 18:12:51 -2011-05-21 18:18:38 -2011-05-21 18:24:24 -2011-05-21 18:30:12 -2011-05-21 18:35:58 -2011-05-21 18:41:42 -2011-05-22 04:55:04 -2011-05-22 05:01:10 -2011-05-22 05:07:22 -2011-05-22 05:13:30 -2011-05-22 05:19:42 -2011-05-22 05:25:50 -2011-05-22 08:11:04 -2011-05-22 08:17:15 -2011-05-22 08:23:34 -2011-05-22 08:29:44 -2011-05-22 08:35:51 -2011-05-22 08:42:04 -2011-05-22 08:48:28 -2011-05-22 08:54:53 -2011-05-22 09:01:18 -2011-05-22 09:07:40 -2011-05-22 09:13:55 -2011-05-22 09:20:06 -2011-05-22 09:26:13 -2011-05-22 09:32:13 -2011-05-22 09:38:14 -2011-05-22 09:44:17 -2011-05-22 09:50:10 -2011-05-22 09:55:57 -2011-05-22 10:01:41 -2011-05-22 10:07:26 -2011-05-22 10:13:11 -2011-05-22 10:19:02 -2011-05-22 10:24:59 -2011-05-22 10:30:59 -2011-05-22 10:37:00 -2011-05-22 10:42:59 -2011-05-22 10:49:00 -2011-05-22 10:55:00 -2011-05-22 11:00:58 -2011-05-22 11:06:52 -2011-05-22 11:12:42 -2011-05-22 11:18:28 -2011-05-22 11:24:13 -2011-05-22 11:29:59 -2011-05-22 11:35:41 -2011-05-22 14:35:58 -2011-05-22 14:41:58 -2011-05-22 14:47:54 -2011-05-22 14:53:55 -2011-05-22 14:59:54 -2011-05-22 15:05:55 -2011-05-22 15:11:58 -2011-05-22 15:17:59 -2011-05-22 15:23:57 -2011-05-22 15:29:55 -2011-05-22 15:35:52 -2011-05-22 15:41:44 -2011-05-22 15:47:38 -2011-05-22 15:53:30 -2011-05-22 15:59:20 -2011-05-22 16:05:12 -2011-05-22 17:14:28 -2011-05-22 17:20:31 -2011-05-22 17:26:29 -2011-05-22 17:32:20 -2011-05-22 17:38:15 -2011-05-22 17:44:04 -2011-05-22 17:49:59 -2011-05-22 17:55:56 -2011-05-22 18:01:54 -2011-05-22 18:08:12 -2011-05-24 10:41:05 -2011-05-24 10:47:03 -2011-05-24 10:53:00 -2011-05-24 10:59:03 -2011-05-24 11:05:07 -2011-05-24 11:11:09 -2011-05-24 11:17:12 -2011-05-24 11:23:16 -2011-05-24 11:29:17 -2011-05-24 12:42:48 -2011-05-24 12:48:47 -2011-05-24 12:54:35 -2011-05-24 13:00:34 -2011-05-24 13:06:40 -2011-05-24 13:12:47 -2011-05-24 13:19:01 -2011-05-24 13:25:10 -2011-05-24 13:31:14 -2011-05-24 13:37:23 -2011-05-24 13:43:23 -2011-05-24 13:49:19 -2011-05-24 13:55:15 -2011-05-24 14:01:06 -2011-05-24 14:06:59 -2011-05-24 14:16:26 -2011-05-24 14:22:22 -2011-05-24 14:28:23 -2011-05-24 14:34:24 -2011-05-24 14:40:21 -2011-05-24 14:46:20 -2011-05-24 14:52:17 -2011-05-24 14:58:16 -2011-05-24 15:04:15 -2011-05-24 15:10:13 -2011-05-24 15:16:13 -2011-05-24 15:22:12 -2011-05-24 15:28:09 -2011-05-24 15:34:12 -2011-05-24 15:40:17 -2011-05-24 15:46:19 -2011-05-24 15:52:18 -2011-05-24 15:58:23 -2011-05-24 16:04:27 -2011-05-24 16:10:38 -2011-05-24 16:16:51 -2011-05-24 16:23:01 -2011-05-24 16:29:13 -2011-05-24 16:35:25 -2011-05-24 16:41:41 -2011-05-24 16:47:59 -2011-05-24 16:54:11 -2011-05-24 17:00:15 -2011-05-24 17:06:14 -2011-05-25 04:35:54 -2011-05-25 04:41:57 -2011-05-25 04:47:59 -2011-05-25 04:54:03 -2011-05-25 05:00:12 -2011-05-25 05:06:21 -2011-05-25 05:12:36 -2011-05-25 05:18:51 -2011-05-25 05:25:06 -2011-05-25 05:31:19 -2011-05-25 05:37:29 -2011-05-25 05:43:41 -2011-05-25 05:49:52 -2011-05-25 05:55:59 -2011-05-25 06:02:06 -2011-05-25 06:08:19 -2011-05-25 06:14:39 -2011-05-25 06:20:51 -2011-05-25 06:26:51 -2011-05-25 06:32:50 -2011-05-25 06:38:52 -2011-05-25 06:44:47 -2011-05-25 06:50:43 -2011-05-25 06:56:49 -2011-05-25 07:03:00 -2011-05-25 09:38:01 -2011-05-25 09:44:10 -2011-05-25 09:50:19 -2011-05-25 09:56:22 -2011-05-25 10:02:24 -2011-05-25 10:08:20 -2011-05-25 10:14:15 -2011-05-25 10:20:17 -2011-05-25 10:26:15 -2011-05-25 10:32:13 -2011-05-25 10:38:10 -2011-05-25 10:44:09 -2011-05-25 12:04:13 -2011-05-25 12:10:12 -2011-05-25 12:16:15 -2011-05-25 12:22:18 -2011-05-25 12:28:27 -2011-05-25 12:34:34 -2011-05-25 15:08:26 -2011-05-25 15:21:20 -2011-05-25 15:35:36 -2011-05-25 16:24:08 -2011-05-25 16:30:10 -2011-05-25 16:36:13 -2011-05-25 16:42:11 -2011-05-25 16:48:11 -2011-05-25 16:54:14 -2011-05-25 17:00:20 -2011-05-25 17:06:26 -2011-05-25 17:12:31 -2011-05-25 17:18:33 -2011-05-25 17:24:35 -2011-05-25 17:30:30 -2011-05-25 17:36:22 -2011-05-25 17:42:11 -2011-05-25 17:47:56 -2011-05-25 17:53:43 -2011-05-25 17:59:36 -2011-05-25 18:05:32 -2011-05-25 18:11:28 -2011-05-25 18:17:24 -2011-05-25 18:23:31 -2011-05-25 18:29:42 -2011-05-25 18:35:58 -2011-05-25 18:42:09 -2011-05-25 18:48:22 -2011-05-25 18:54:34 -2011-05-25 19:00:42 \ No newline at end of file Modified: trunk/echobase-services/update-import-data-db.sh =================================================================== --- trunk/echobase-services/update-import-data-db.sh 2012-03-27 16:18:54 UTC (rev 415) +++ trunk/echobase-services/update-import-data-db.sh 2012-03-27 17:39:50 UTC (rev 416) @@ -44,8 +44,12 @@ executeMaven fr.ifremer.echobase.services.importdata.CatchesDataImportServiceIT catches -executeMaven fr.ifremer.echobase.services.importdata.AcousticDataImportServiceIT catches-and-acoustic +executeMaven fr.ifremer.echobase.services.importdata.ResultsVoyageImportServiceIT catches-and-voyage-result -executeMaven fr.ifremer.echobase.services.importdata.ResultsImportServiceIT catches-and-acoustic-and-voyage-result +#executeMaven fr.ifremer.echobase.services.importdata.AcousticDataImportServiceIT catches-and-acoustic-and-voyage-result -executeMaven fr.ifremer.echobase.services.importdata.ResultsEsduImportServiceIT +#executeMaven fr.ifremer.echobase.services.importdata.ResultsEsduCellImportServiceIT + +#executeMaven fr.ifremer.echobase.services.importdata.ResultsRegionCellImportServiceIT + +#executeMaven fr.ifremer.echobase.services.importdata.ResultsMapCellImportServiceIT

1 0

r414 - in trunk/echobase-entities/src/main/java/fr/ifremer/echobase: csv entities/data
by tchemit＠users.forge.codelutin.com March 27, 2012

March 27, 2012

Author: tchemit Date: 2012-03-27 18:14:19 +0200 (Tue, 27 Mar 2012) New Revision: 414 Url: http://forge.codelutin.com/repositories/revision/echobase/414 Log: improve Category decorator + remove old fixme stuff for esdu cell result import Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2012-03-27 13:03:51 UTC (rev 413) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2012-03-27 16:14:19 UTC (rev 414) @@ -32,21 +32,14 @@ import org.nuiton.util.csv.ImportRuntimeException; import org.nuiton.util.csv.ValueParser; -import java.text.DateFormat; import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import java.util.Map; public class CellValueParser implements ValueParser<Cell> { - public static final String CELLULE_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss.SSSS"; - final Voyage voyage; -// private final Pattern ID_PATTERN = Pattern.compile("(.[^_]+)(_(.+)){0,1}"); - private final CellDAO cellDAO; private final Map<String, Cell> esduCells; @@ -57,28 +50,9 @@ esduCells = Maps.newTreeMap(); } - private static final DateFormat cellDateFormatOne = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - - private static final DateFormat cellDateFormat = new SimpleDateFormat( - CELLULE_DATE_FORMAT); - - public static String reformatDate(String date) throws ParseException { - Date parse = cellDateFormatOne.parse(date); - date = cellDateFormat.format(parse); - return date; - } - @Override public Cell parse(String value) throws ParseException { -// // must find it -// Matcher matcher = ID_PATTERN.matcher(value); -// if (!matcher.matches()) { -// throw new ImportRuntimeException( -// "Can not match cell id pattern with value " + value); -// } - int separatorIndex = value.indexOf("_"); String esduCellId; @@ -123,9 +97,6 @@ protected Cell getEsduCell(String esduCellId) throws ParseException { -//FIXME Remove this when using same date formatter everywhere... - esduCellId = reformatDate(esduCellId); - Cell result = esduCells.get(esduCellId); if (result == null) { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java 2012-03-27 13:03:51 UTC (rev 413) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java 2012-03-27 16:14:19 UTC (rev 414) @@ -67,7 +67,7 @@ public static final ValueParser<Date> IMPORT_DAY_TIME2 = new DateValue("yyyy-MM-dd HH:mm:ss"); - public static final String CELLULE_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss.SSSS"; + public static final String CELLULE_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSS"; public static final ValueParser<Date> IMPORT_DAY_TIME3 = new DateValue(CELLULE_DATE_FORMAT); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2012-03-27 13:03:51 UTC (rev 413) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2012-03-27 16:14:19 UTC (rev 414) @@ -29,26 +29,26 @@ @Override public String getEchotypeLabel() { - return echotype == null ? "" : (" echotype: " + echotype.getName()); + return echotype == null ? "" : ("echotype: " + echotype.getName()); } @Override public String getSpeciesLabel() { return speciesCategory == null || speciesCategory.getSpecies() == null ? "" : - (" species: " + speciesCategory.getSpecies().getBaracoudaCode()); + ("species: " + speciesCategory.getSpecies().getBaracoudaCode()); } @Override public String getProcessedAgeLabel() { return speciesCategory == null || speciesCategory.getAgeCategory() == null ? "" : - (" ageCategory: " + speciesCategory.getAgeCategoryName()); + ("ageCategory: " + speciesCategory.getAgeCategoryName()); } @Override public String getProcessedLengthLabel() { return speciesCategory == null || speciesCategory.getSizeCategory() == null ? "" : - (" sizeCategory: " + speciesCategory.getSizeCategoryName()); + ("sizeCategory: " + speciesCategory.getSizeCategoryName()); } } //CategoryImpl

1 0

r413 - in trunk/echobase-entities/src/main: java/fr/ifremer/echobase java/fr/ifremer/echobase/entities/data xmi
by tchemit＠users.forge.codelutin.com March 27, 2012

March 27, 2012

Author: tchemit Date: 2012-03-27 15:03:51 +0200 (Tue, 27 Mar 2012) New Revision: 413 Url: http://forge.codelutin.com/repositories/revision/echobase/413 Log: fix Category decoration Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java trunk/echobase-entities/src/main/xmi/echobase.zargo 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-26 23:28:36 UTC (rev 412) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-03-27 13:03:51 UTC (rev 413) @@ -114,7 +114,7 @@ registerJXPathDecorator(locale, Calibration.class, "${date}$s - acquisition ${aquisitionMethod}$s"); // Category decorator - registerJXPathDecorator(locale, Category.class, "${echotype/name}$s - (species: ${speciesLabel}$s) - (age: ${processedAgeLabel}$s) - (lenght: ${processedLengthLabel}$s)"); + registerJXPathDecorator(locale, Category.class, "${echotypeLabel}$s ${speciesLabel}$s ${processedAgeLabel}$s ${processedLengthLabel}$s"); // CategoryMeaning decorator registerJXPathDecorator(locale, CategoryMeaning.class, "${name}$s"); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2012-03-26 23:28:36 UTC (rev 412) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CategoryImpl.java 2012-03-27 13:03:51 UTC (rev 413) @@ -28,21 +28,27 @@ private static final long serialVersionUID = 1L; @Override + public String getEchotypeLabel() { + return echotype == null ? "" : (" echotype: " + echotype.getName()); + } + + @Override public String getSpeciesLabel() { return speciesCategory == null || speciesCategory.getSpecies() == null - ? "" : speciesCategory.getSpecies().getBaracoudaCode(); + ? "" : + (" species: " + speciesCategory.getSpecies().getBaracoudaCode()); } @Override public String getProcessedAgeLabel() { - return speciesCategory == null ? "" : - speciesCategory.getAgeCategoryName(); + return speciesCategory == null || speciesCategory.getAgeCategory() == null ? "" : + (" ageCategory: " + speciesCategory.getAgeCategoryName()); } @Override public String getProcessedLengthLabel() { - return speciesCategory == null ? "" : - speciesCategory.getSizeCategoryName(); + return speciesCategory == null || speciesCategory.getSizeCategory() == null ? "" : + (" sizeCategory: " + speciesCategory.getSizeCategoryName()); } } //CategoryImpl Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)

1 0

← Newer
1
2
3
4
5
6
7
8
...
13
Older →

Jump to page: