Author: tchemit Date: 2012-03-29 23:45:42 +0200 (Thu, 29 Mar 2012) New Revision: 455 Url: http://forge.codelutin.com/repositories/revision/echobase/455 Log: fixes #1061: Utilisation de ageCategory dans les imports de cell Maps 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/csv/MapCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java trunk/echobase-services/src/test/resources/import-data/result/map/maps.csv.gz 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-29 21:44:59 UTC (rev 454) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-03-29 21:45:42 UTC (rev 455) @@ -41,6 +41,7 @@ import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.entities.data.ResultDAO; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.AgeCategory; import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.SizeCategory; @@ -141,6 +142,10 @@ 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); @@ -159,6 +164,7 @@ voyageMap, speciesMap, sizeCategoryMap, + ageCategoryMap, metas); if (log.isInfoEnabled()) { @@ -246,7 +252,7 @@ null, row.getSpecies(), row.getSizeCategory(), - null, + row.getAgeCategory(), importResult); for (Result result : results) { Modified: 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/MapCellImportModel.java 2012-03-29 21:44:59 UTC (rev 454) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java 2012-03-29 21:45:42 UTC (rev 455) @@ -26,6 +26,7 @@ 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.AgeCategory; import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.SizeCategory; @@ -52,7 +53,8 @@ MapCellImportRow.PROPERTY_DATA_GRID_LATITUDE_LAG, MapCellImportRow.PROPERTY_DATA_GRID_DEPTH_LAG, MapCellImportRow.PROPERTY_VOYAGE, - MapCellImportRow.PROPERTY_SIZE_CATEGORY + MapCellImportRow.PROPERTY_SIZE_CATEGORY, + MapCellImportRow.PROPERTY_AGE_CATEGORY }; protected final CellType cellType; @@ -62,6 +64,7 @@ Map<String, Voyage> voyageMap, Map<String, Species> speciesMap, Map<String, SizeCategory> sizeCategoryMap, + Map<String, AgeCategory> ageCategoryMap, List<DataMetadata> dataMetadatas) { super(separator); this.cellType = cellType; @@ -70,6 +73,7 @@ newMandatoryColumn(MapCellImportRow.PROPERTY_NAME); newForeignKeyColumn("baracoudaCode", MapCellImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(MapCellImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); + newForeignKeyColumn(MapCellImportRow.PROPERTY_AGE_CATEGORY, AgeCategory.class, SizeCategory.PROPERTY_NAME, ageCategoryMap); newMandatoryColumn(MapCellImportRow.PROPERTY_DATA_GRID_CELL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); newMandatoryColumn(MapCellImportRow.PROPERTY_DATA_GRID_CELL_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); Modified: 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/MapCellImportRow.java 2012-03-29 21:44:59 UTC (rev 454) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java 2012-03-29 21:45:42 UTC (rev 455) @@ -29,6 +29,7 @@ import fr.ifremer.echobase.entities.data.CellImpl; 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.CellType; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; @@ -53,6 +54,8 @@ public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; + public static final String PROPERTY_AGE_CATEGORY = "ageCategory"; + public static final String PROPERTY_DATA_GRID_CELL_LONGITUDE = "gridCellLongitude"; public static final String PROPERTY_DATA_GRID_CELL_LATITUDE = "gridCellLatitude"; @@ -75,6 +78,8 @@ protected SizeCategory sizeCategory; + protected AgeCategory ageCategory; + protected float gridCellLongitude; protected float gridCellLatitude; @@ -108,6 +113,10 @@ return sizeCategory; } + public AgeCategory getAgeCategory() { + return ageCategory; + } + public List<Result> getResult() { return result; } @@ -152,6 +161,10 @@ this.sizeCategory = sizeCategory; } + public void setAgeCategory(AgeCategory ageCategory) { + this.ageCategory = ageCategory; + } + public void setGridCellLongitude(float GridCellLongitude) { this.gridCellLongitude = GridCellLongitude; } Modified: trunk/echobase-services/src/test/resources/import-data/result/map/maps.csv.gz =================================================================== (Binary files differ)