Author: tchemit Date: 2014-01-23 14:57:45 +0100 (Thu, 23 Jan 2014) New Revision: 1528 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1528 Log: refs #3876: Import de donn?\195?\169es depuis un ictyom?\195?\168tre (par lot) (utilisation des grammes pour les poids) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-01-23 12:47:00 UTC (rev 1527) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-01-23 13:57:45 UTC (rev 1528) @@ -31,6 +31,7 @@ import com.google.common.collect.Sets; import com.google.common.io.Files; import fr.ifremer.shared.application.ApplicationBusinessException; +import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -104,17 +105,6 @@ TAIL, CATE, LONG -// // ignored -// HEUR(true), -// AGEN(true), -// CAIS(true), -// TAXO(true), -// OUTI(true), -// PORT(true), -// DATE(true), -// HERE(true), -// NAVI(true), -// ENGI(true); } protected PersistenceService persistenceService; @@ -407,7 +397,7 @@ continue; } - if ("N".equals(value)) { + if ("n".equals(value) || "N".equals(value)) { // special case, no category @@ -647,10 +637,17 @@ batch.setSampleCategoryId(categoryId); batch.setSampleCategoryValue(cqv); batch.setSpecies(species); - batch.setSampleCategoryWeight(catchWeight == null ? null : TuttiEntities.roundKiloGram(catchWeight)); - //FIXME Check this is ok. - batch.setWeight(sampleWeight == null ? null : TuttiEntities.roundKiloGram(sampleWeight)); + if (catchWeight != null) { + catchWeight = TuttiEntities.roundKiloGram(WeightUnit.G.toEntity(catchWeight)); + batch.setSampleCategoryWeight(catchWeight); + } + if (sampleWeight != null) { + + sampleWeight = TuttiEntities.roundKiloGram(WeightUnit.G.toEntity(sampleWeight)); + batch.setWeight(sampleWeight); + } + batch.setChildBatchs(Lists.<SpeciesBatch>newArrayList()); return batch; }