Author: tchemit Date: 2014-05-19 16:31:57 +0200 (Mon, 19 May 2014) New Revision: 1788 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1788 Log: refs #5085 (report from version 3.4.4) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java trunk/tutti-service/src/test/resources/pupitri/ano-5079.car trunk/tutti-service/src/test/resources/pupitri/evo-5060.car trunk/tutti-service/src/test/resources/pupitri/evo-5062.car Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2014-05-19 14:27:35 UTC (rev 1787) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2014-05-19 14:31:57 UTC (rev 1788) @@ -106,6 +106,11 @@ } public void setSign(Signs sign) { + if (Signs.UNSORTED.equals(sign)) { + + // Not use this sign (see https://forge.codelutin.com/issues/5085) + sign = Signs.DEFAULT; + } this.sign = sign; } @@ -127,7 +132,7 @@ public boolean isSorted() { - boolean sorted = Directions.VAT == direction && !Signs.UNSORTED.equals(sign); + boolean sorted = Directions.VAT == direction; return sorted; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-05-19 14:27:35 UTC (rev 1787) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-05-19 14:31:57 UTC (rev 1788) @@ -147,7 +147,7 @@ carrouselFile); importPupitriTrunk(result, trunkFile, operation); - importPupitriCarrousel(result, carrouselFile, operation, catchBatch); + importPupitriCarrousel(result, carrouselFile, operation); if (result.isFishingOperationFound()) { @@ -261,8 +261,7 @@ protected void importPupitriCarrousel(PupitriImportResult result, File carrouselFile, - FishingOperation operation, - CatchBatch catchBatch) { + FishingOperation operation) { if (log.isInfoEnabled()) { log.info("Will import pupitri operation [" + operation.toString() + @@ -304,13 +303,6 @@ String speciesId = bean.getSpeciesId(); - if (Directions.HOV.equals(bean.getDirection())) { - - // Do not accept any longer this direction (see https://forge.codelutin.com/issues/5060) - notFoundSpecies.add(speciesId); - continue; - } - List<Species> speciesList = speciesBySurveyCode.get(speciesId); Float beanWeight = bean.getWeight(); if (beanWeight < 0f) { Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java 2014-05-19 14:27:35 UTC (rev 1787) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java 2014-05-19 14:31:57 UTC (rev 1788) @@ -94,16 +94,17 @@ Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); - Assert.assertEquals(1, nbNotAdded); + Assert.assertEquals(0, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); - Assert.assertEquals(2, rootSpeciesBatchAfter.sizeChildren()); + Assert.assertEquals(3, rootSpeciesBatchAfter.sizeChildren()); Set<Integer> unexpectedSpecies = Sets.newHashSet( ); Set<Integer> expectedSpecies = Sets.newHashSet( 17186, // ACATPAL - 16328 // ACAPPEL + 16328, // ACAPPEL + 17005 //MERNMER ); Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class); Modified: trunk/tutti-service/src/test/resources/pupitri/ano-5079.car =================================================================== --- trunk/tutti-service/src/test/resources/pupitri/ano-5079.car 2014-05-19 14:27:35 UTC (rev 1787) +++ trunk/tutti-service/src/test/resources/pupitri/ano-5079.car 2014-05-19 14:31:57 UTC (rev 1788) @@ -8,7 +8,7 @@ $TSMES,27/11/13,08:13:25.383,BLCAR, 0,A,1,001,TRIG-LUC,P,VAT,1.2, $TSMES,27/11/13,08:13:57.072,BLCAR, 0,A,1,001,ENGR-ENC,0,VAT,6.5, $TSMES,27/11/13,08:13:57.072,BLCAR, 0,A,1,001,ENGR-ENC,0,VAT,1.3, -$TSMES,27/11/13,08:10:26.922,BLCAR, 0,A,1,002,TRAC-TRU,H,VAT,200.0, +$TSMES,27/11/13,08:10:26.922,BLCAR, 0,A,1,002,TRAC-TRU,H,HOV,200.0, $TSMES,27/11/13,07:58:47.624,BLCAR, 0,A,1,002,EUTR-GUR,T,VAT,14.0, $TSMES,27/11/13,08:09:31.330,BLCAR, 0,A,1,002,EUTR-GUR,T,VAT,4.0, -$TSMES,27/11/13,08:10:04.519,BLCAR, 0,A,1,002,EUTR-GUR,T,VAT,2.0, +$TSMES,27/11/13,08:10:04.519,BLCAR, 0,A,1,002,EUTR-GUR,T,VAT,2.0, \ No newline at end of file Modified: trunk/tutti-service/src/test/resources/pupitri/evo-5060.car =================================================================== --- trunk/tutti-service/src/test/resources/pupitri/evo-5060.car 2014-05-19 14:27:35 UTC (rev 1787) +++ trunk/tutti-service/src/test/resources/pupitri/evo-5060.car 2014-05-19 14:31:57 UTC (rev 1788) @@ -1,3 +1,3 @@ $TSMES,27/11/13,09:17:40.272,BLCAR, 0,A,1,002,MERLMNG,0,HOV,0021.1, -$TSMES,27/11/13,09:18:48.818,BLCAR, 0,A,1,002,ACAN-PEL,H,VAT,100.0, +$TSMES,27/11/13,09:18:48.818,BLCAR, 0,A,1,002,ACAN-PEL,H,HOV,100.0, $TSMES,27/11/13,09:18:48.818,BLCAR, 0,A,1,002,ACANPAL,0,VAT,200.0, Modified: trunk/tutti-service/src/test/resources/pupitri/evo-5062.car =================================================================== --- trunk/tutti-service/src/test/resources/pupitri/evo-5062.car 2014-05-19 14:27:35 UTC (rev 1787) +++ trunk/tutti-service/src/test/resources/pupitri/evo-5062.car 2014-05-19 14:31:57 UTC (rev 1788) @@ -3,7 +3,7 @@ $TSMES,27/11/13,13:16:41.355,BLCAR, 0,A,1,002,MELA-NGE,0,VAT,0013.2, $TSMES,27/11/13,13:17:21.436,BLCAR, 0,A,1,002,MELA-NGE,0,VAT,0016.9, $TSMES,27/11/13,13:17:36.955,BLCAR, 0,A,1,002,MELA-NGE,0,VAT,0013.6, -$TSMES,27/11/13,13:19:05.279,BLCAR, 0,A,1,001,EUPH-AUX,H,VAT,0011.7, (lettre H = hors vrac) +$TSMES,27/11/13,13:19:05.279,BLCAR, 0,A,1,001,EUPH-AUX,H,HOV,0011.7, (lettre H = hors vrac) $TSMES,27/11/13,13:19:39.641,BLCAR, 0,A,1,002,MELA-NGE,0,VAT,0015.5, $TSMES,27/11/13,13:20:06.166,BLCAR, 0,A,1,002,MELA-NGE,0,VAT,0014.9, $TSMES,27/11/13,13:20:23.156,BLCAR, 0,A,1,002,MELA-NGE,0,VAT,0014.3, @@ -26,4 +26,4 @@ $TSMES,27/11/13,13:36:40.963,BLCAR, 0,A,1,002,MICR-POU,T,VAT,0014.8, (lettre T pour du poutassou trié dans le mélange) $TSMES,27/11/13,13:37:18.484,BLCAR, 0,A,1,002,MICR-POU,T,VAT,0011.1, (lettre T pour du poutassou trié dans le mélange) $TSMES,27/11/13,13:38:26.381,BLCAR, 0,A,1,002,EUPH-AUX,T,VAT,0009.6, (lettre T pour des euphausiacés triés dans le mélange) -$TSMES,27/11/13,13:49:51.688,BLCAR, 0,A,1,001,MYCT-PUN,T,VAT,0001.1, (lettre T pour des myctophidés triés dans le mélange) +$TSMES,27/11/13,13:49:51.688,BLCAR, 0,A,1,001,MYCT-PUN,T,VAT,0001.1, (lettre T pour des myctophidés triés dans le mélange) \ No newline at end of file