Author: tchemit Date: 2012-04-06 16:00:39 +0200 (Fri, 06 Apr 2012) New Revision: 495 Url: http://forge.codelutin.com/repositories/revision/echobase/495 Log: fixes #1093: Ajout du champs Strata sur l'entit?\195?\169 LengthWeightKey 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/csv/LengthWeightKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java 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-04-06 13:05:36 UTC (rev 494) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-04-06 14:00:39 UTC (rev 495) @@ -89,6 +89,9 @@ Species.class, EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + Map<String, Strata> strataMap = getEntitiesMap( + Strata.class, EchoBaseFunctions.STRATA_BY_NAME); + // get selected voyage Voyage voyage = getEntityById(Voyage.class, configuration.getVoyageId()); @@ -108,6 +111,7 @@ configuration, inputFile, voyageMap, + strataMap, speciesMap ); configuration.addResult(importResult); @@ -120,6 +124,7 @@ configuration, inputFile, voyageMap, + strataMap, speciesMap ); configuration.addResult(importResult); @@ -142,6 +147,7 @@ ResultsImportConfiguration configuration, InputFile inputFile, Map<String, Voyage> voyageMap, + Map<String, Strata> strataMap, Map<String, Species> speciesMap) throws ImportException { if (log.isInfoEnabled()) { @@ -159,6 +165,7 @@ LengthWeightKeyImportModel csvModel = new LengthWeightKeyImportModel( serviceContext.getConfiguration().getCsvSeparator(), voyageMap, + strataMap, sizeCategoryMap, speciesMap); @@ -216,6 +223,7 @@ ResultsImportConfiguration configuration, InputFile inputFile, Map<String, Voyage> voyageMap, + Map<String, Strata> strataMap, Map<String, Species> speciesMap) throws ImportException { if (log.isInfoEnabled()) { @@ -226,9 +234,6 @@ 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, 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-04-06 13:05:36 UTC (rev 494) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-04-06 14:00:39 UTC (rev 495) @@ -29,6 +29,7 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Strata; import java.util.Map; @@ -42,6 +43,7 @@ public LengthWeightKeyImportModel(char separator, Map<String, Voyage> voyageMap, + Map<String, Strata> strataMap, Map<String, SizeCategory> sizeCategoryMap, Map<String, Species> speciesMap) { super(separator); @@ -51,6 +53,7 @@ newForeignKeyColumn(LengthWeightKeyImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); newForeignKeyColumn(LengthWeightKeyImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, LengthWeightKeyImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(LengthWeightKey.PROPERTY_STRATA, Strata.class, Strata.PROPERTY_NAME, strataMap); } @Override Modified: 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/LengthWeightKeyImportRow.java 2012-04-06 13:05:36 UTC (rev 494) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java 2012-04-06 14:00:39 UTC (rev 495) @@ -28,6 +28,7 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Strata; import java.io.Serializable; @@ -94,4 +95,8 @@ public void setAParameter(float AParameter) { lengthWeightKey.setAParameter(AParameter); } + + public void setStrata(Strata strata) { + lengthWeightKey.setStrata(strata); + } } \ No newline at end of file