Author: tchemit Date: 2014-05-21 09:39:03 +0200 (Wed, 21 May 2014) New Revision: 1799 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1799 Log: fixes #5110 [EXPORT GENERIQUE] calcul du coef ?\195?\169l?\195?\169vation finale ?\195?\160 corriger Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2014-05-20 14:47:17 UTC (rev 1798) +++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2014-05-21 07:39:03 UTC (rev 1799) @@ -277,6 +277,8 @@ boolean isVracBatch(SpeciesAbleBatch speciesBatch); + boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch); + boolean isTemporary(TuttiReferentialEntity entity); List<Gear> getAllScientificGear(); Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-05-20 14:47:17 UTC (rev 1798) +++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-05-21 07:39:03 UTC (rev 1799) @@ -437,6 +437,11 @@ } @Override + public boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch) { + return !batchVracPredicate.apply(speciesBatch); + } + + @Override public Predicate<SpeciesAbleBatch> getVracBatchPredicate() { return batchVracPredicate; } Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2014-05-20 14:47:17 UTC (rev 1798) +++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2014-05-21 07:39:03 UTC (rev 1799) @@ -260,6 +260,11 @@ } @Override + public boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch) { + throw notImplemented(); + } + + @Override public Predicate<SpeciesAbleBatch> getVracBatchPredicate() { throw notImplemented(); } Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-20 14:47:17 UTC (rev 1798) +++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-21 07:39:03 UTC (rev 1799) @@ -895,6 +895,11 @@ } @Override + public boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch) { + return driver.isHorsVracBatch(speciesBatch); + } + + @Override public Predicate<SpeciesAbleBatch> getVracBatchPredicate() { return driver.getVracBatchPredicate(); } Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java =================================================================== --- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-05-20 14:47:17 UTC (rev 1798) +++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-05-21 07:39:03 UTC (rev 1799) @@ -118,24 +118,29 @@ String batchWeightUnit = weightMeasuredCaracteristic.getUnit(); for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { - CatchExportRow row = new CatchExportRow(); + + boolean vracBatch = persistenceService.isVracBatch(speciesBatch); + + CatchExportRow row = new CatchExportRow(vracBatch, false); row.setCruise(cruise); row.setFishingOperation(operation); row.setSpecies(speciesBatch.getSpecies()); row.setBatchWeightUnit(batchWeightUnit); - if (!persistenceService.isVracBatch(speciesBatch)) { + float raisingFactor = speciesCatchRaisingFactor; + + if (!vracBatch) { + // for HV, always use a 1.0 raising factor - speciesCatchRaisingFactor = 1.f; + raisingFactor = 1.f; } Float batchWeight = TuttiEntities.getValueOrComputedValue( speciesBatch.getSampleCategoryWeight(), speciesBatch.getSampleCategoryComputedWeight()); - float totalBatchWeight = batchWeight == null ? 0 : speciesCatchRaisingFactor * - batchWeight; + float totalBatchWeight = batchWeight == null ? 0 : raisingFactor * batchWeight; addSpeciesBatch(persistenceService, row, @@ -145,24 +150,28 @@ } for (BenthosBatch benthosBatch : rootBenthosBatch.getChildren()) { - CatchExportRow row = new CatchExportRow(); + + boolean vracBatch = persistenceService.isVracBatch(benthosBatch); + + CatchExportRow row = new CatchExportRow(vracBatch, true); row.setCruise(cruise); row.setFishingOperation(operation); row.setSpecies(benthosBatch.getSpecies()); row.setBatchWeightUnit(batchWeightUnit); - if (!persistenceService.isVracBatch(benthosBatch)) { + float raisingFactor = benthosCatchRaisingFactor; + if (!vracBatch) { + // for HV, always use a 1.0 raising factor - benthosCatchRaisingFactor = 1.f; + raisingFactor = 1.f; } Float batchWeight = TuttiEntities.getValueOrComputedValue( benthosBatch.getSampleCategoryWeight(), benthosBatch.getSampleCategoryComputedWeight()); - float totalBatchWeight = batchWeight == null ? 0 : benthosCatchRaisingFactor * - batchWeight; + float totalBatchWeight = batchWeight == null ? 0 : raisingFactor * batchWeight; addBenthosBatch(persistenceService, row, @@ -173,21 +182,38 @@ // compute final raising factor // see http://forge.codelutin.com/issues/4135 + // see http://forge.codelutin.com/issues/5110 for (CatchExportRow row : rows) { - float finalRaisingFactor = 1f; + float finalRaisingFactor; + if (row.isVrac()) { + + finalRaisingFactor = row.isBenthosRow() ? benthosCatchRaisingFactor : speciesCatchRaisingFactor; + + } else { + + finalRaisingFactor = 1f; + + } + for (ExportSampleCategory exportSampleCategory : row.getSampleCategory()) { if (exportSampleCategory != null) { Float totalWeight = exportSampleCategory.getCategoryWeight(); - Float sampleWeight = exportSampleCategory.getSampleWeight(); + Float sampleWeight = TuttiEntities.getValueOrComputedValue( + exportSampleCategory.getSampleWeight(), + exportSampleCategory.getSampleComputedWeight()); if (totalWeight != null && sampleWeight != null) { - // the only case which can change the final rate + float currentRate = totalWeight / sampleWeight; - finalRaisingFactor *= currentRate; + if (TuttiEntities.isNotEqualWeight(1.0f, currentRate)) { + + // the only case which can change the final rate + finalRaisingFactor *= currentRate; + } } } } @@ -282,6 +308,10 @@ } else { + int categoryIndex = currentRow.getSampleCategory().size(); + + float sampleComputedWeight = 0f; + for (SpeciesBatch childBatch : speciesBatch.getChildBatchs()) { // always use a copy, otherwise sample categories can be shared by brothers CatchExportRow childRow = currentRow.copy(); @@ -291,7 +321,15 @@ childBatch, totalBatchWeight ); + ExportSampleCategory exportSampleCategory = childRow.getSampleCategory().get(categoryIndex); + if (exportSampleCategory != null) { + float categoryWeight = TuttiEntities.getValueOrComputedValue( + exportSampleCategory.getCategoryWeight(), + exportSampleCategory.getComputedWeight()); + sampleComputedWeight += categoryWeight; + } } + currentRow.getSampleCategory().get(categoryIndex - 1).setSampleComputedWeight(sampleComputedWeight); } } @@ -393,6 +431,10 @@ } else { + int categoryIndex = currentRow.getSampleCategory().size(); + + float sampleComputedWeight = 0f; + for (BenthosBatch childBatch : benthosBatch.getChildBatchs()) { // always use a copy, otherwise sample categories can be shared by brothers CatchExportRow childRow = currentRow.copy(); @@ -401,7 +443,13 @@ rows, childBatch, totalBatchWeight); + ExportSampleCategory exportSampleCategory = childRow.getSampleCategory().get(categoryIndex); + float categoryWeight = TuttiEntities.getValueOrComputedValue( + exportSampleCategory.getCategoryWeight(), + exportSampleCategory.getComputedWeight()); + sampleComputedWeight += categoryWeight; } + currentRow.getSampleCategory().get(categoryIndex - 1).setSampleComputedWeight(sampleComputedWeight); } } Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java =================================================================== --- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-05-20 14:47:17 UTC (rev 1798) +++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-05-21 07:39:03 UTC (rev 1799) @@ -78,6 +78,8 @@ public static final String FINAL_RAISING_FACTOR = "finalRaisingFactor"; + public static final String BENTHOS_ROW = "benthosRow"; + protected Cruise cruise; protected FishingOperation fishingOperation; @@ -100,8 +102,17 @@ protected String batchWeightUnit; + protected final boolean benthosRow; + + protected final boolean vrac; + protected final List<String> comment = new ArrayList<>(); + public CatchExportRow(boolean vrac, boolean benthosRow) { + this.vrac = vrac; + this.benthosRow = benthosRow; + } + public void setCruise(Cruise cruise) { this.cruise = cruise; } @@ -218,11 +229,22 @@ this.batchWeightUnit = batchWeightUnit; } + public boolean isVrac() { + return vrac; + } + + public boolean isHorsVrac() { + return !isVrac(); + } + + public boolean isBenthosRow() { + return benthosRow; + } + public CatchExportRow copy() { - CatchExportRow result = new CatchExportRow(); + CatchExportRow result = new CatchExportRow(vrac, benthosRow); result.setCruise(cruise); result.setFishingOperation(fishingOperation); -// result.setSpeciesCategory(speciesCategory); result.sampleCategory.addAll(sampleCategory); if (benthosFrequency != null) { result.setBenthosFrequency(benthosFrequency); Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java =================================================================== --- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java 2014-05-20 14:47:17 UTC (rev 1798) +++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java 2014-05-21 07:39:03 UTC (rev 1799) @@ -42,10 +42,6 @@ public static final String PROPERTY_CATEGORY_CARACTERISTIC = "categoryCaracteristic"; - public static final String PROPERTY_CATEGORY_VALUE = "categoryValue"; - - public static final String PROPERTY_CATEGORY_WEIGHT = "categoryWeight"; - public static final String PROPERTY_NUMBER = "number"; public static final String PROPERTY_COMPUTED_WEIGHT = "computedWeight"; @@ -64,6 +60,8 @@ private Float sampleWeight; + private Float sampleComputedWeight; + public String getWeightOrVolType() { return weightOrVolType; } @@ -88,6 +86,14 @@ this.sampleWeight = sampleWeight; } + public Float getSampleComputedWeight() { + return sampleComputedWeight; + } + + public void setSampleComputedWeight(Float sampleComputedWeight) { + this.sampleComputedWeight = sampleComputedWeight; + } + public Caracteristic getCategoryCaracteristic() { return categoryDef.getCaracteristic(); } Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java =================================================================== --- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-05-20 14:47:17 UTC (rev 1798) +++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-05-21 07:39:03 UTC (rev 1799) @@ -132,7 +132,7 @@ URL url = new URL(urlPrefix + "species.csv"); ServiceDbResource.assertFileContent("species export:\n", url, - "Id;Code_Rubin;Nom Scientifique;Code campagne\n" + + "Id;Code_Rubin;Nom_scientifique;Code_campagne\n" + "380;ACANECH;Acanthocardia echinata;\n" + "1358;ALOSALO;Alosa alosa;\n" + "1938;AGONCAT;Agonus cataphractus;\n" + @@ -192,16 +192,16 @@ ServiceDbResource.assertFileContent("Catch export:\n", url, "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri;Num_Ordre_Class_Tri_H2;Tot_Class_Tri;Ech_Class_Tri;Type_Volume_Poids_Class_Tri;Unite_Volume_Poids_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture;Coef_Final_Elevation\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-vrac 80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;3.5;1.0\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;5.8333335;1.0\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Femelle 40.0;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;40.0;8.75;1.0\n" + + "2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-vrac 80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;3.5;3.5\n" + + "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;5.8333335;3.5\n" + + "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Femelle 40.0;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;40.0;8.75;3.5\n" + "2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-horsvrac 20;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;1.0;1.0\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;4622;;Abietinaria abietina;Trait B-2-1 Benthos ABIEABI Vrac 30@@@@avec @@@@commentaire...;Vrac;101;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;7.0;1.0\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;380;;Acanthocardia echinata;Trait B-2-1 Benthos ACANECH Vrac 18@@@@avec @@@@commentaire...;Vrac;102;18.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;18.0;7.0;1.0\n" + - "2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-vrac-80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;5.4444447;1.0\n" + - "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;9.074075;1.0\n" + - "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;5.0;1;0.6;cm;1.0;4;0.6;907.4074;1.0\n" + - "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;6.0;2;0.4;cm;1.0;10;0.4;1361.1111;1.0\n" + + "2013;test elevation;1;OTB 20/28.10;B;2;1;4622;;Abietinaria abietina;Trait B-2-1 Benthos ABIEABI Vrac 30@@@@avec @@@@commentaire...;Vrac;101;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;7.0;7.0\n" + + "2013;test elevation;1;OTB 20/28.10;B;2;1;380;;Acanthocardia echinata;Trait B-2-1 Benthos ACANECH Vrac 18@@@@avec @@@@commentaire...;Vrac;102;18.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;18.0;7.0;7.0\n" + + "2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-vrac-80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;5.4444447;5.4444447\n" + + "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;9.074075;5.4444447\n" + + "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;5.0;1;0.6;cm;1.0;4;0.6;907.4074;5.4444447\n" + + "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;6.0;2;0.4;cm;1.0;10;0.4;1361.1111;5.4444447\n" + "2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-horsvrac-20;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;1.0;1.0\n" + "2013;test elevation;1;;C;3;1;11183;;Brissopsis atlantica;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;0.0;1.0\n" + "2013;test elevation;1;;C;3;1;11183;;Brissopsis atlantica;|;Vrac;1;;;Poids;kg;NA;;;;;kg;Mâle;2;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;0.0;1.0\n" + Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java =================================================================== --- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-05-20 14:47:17 UTC (rev 1798) +++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-05-21 07:39:03 UTC (rev 1799) @@ -100,10 +100,10 @@ public static final String CATCH_CONTENT = "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri;Num_Ordre_Class_Tri_H2;Tot_Class_Tri;Ech_Class_Tri;Type_Volume_Poids_Class_Tri;Unite_Volume_Poids_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture;Coef_Final_Elevation\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;1;;cm;0.5;5;5.0;20.0;2.0\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;5.0;20.0;2.0\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;3;;cm;0.5;1;5.0;20.0;2.0\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;1;;cm;0.5;5;10.0;10.0;1.0\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;1;;cm;0.5;5;5.0;20.0;3.0\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;5.0;20.0;3.0\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;3;;cm;0.5;1;5.0;20.0;3.0\n" + + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;1;;cm;0.5;5;10.0;10.0;1.5\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;10.0;1;;cm;;5;30.0;3.3333333;1.6666666\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;11.0;2;;cm;;6;30.0;3.3333333;1.6666666\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;12.0;3;;cm;;7;30.0;3.3333333;1.6666666\n" + @@ -167,13 +167,13 @@ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;100001;3835;Abalistes;;1425;4.0"; public static final String SPECIES_CONTENT = - "Id;Code_Rubin;Nom Scientifique;Code campagne\n" + + "Id;Code_Rubin;Nom_scientifique;Code_campagne\n" + "3835;ABAL;Abalistes;\n" + "11242;AAPT;Aaptos;\n" + "11243;AAPTAAP;Aaptos aaptos;"; public static final String SPECIES_CONTENT_2 = - "Id;Code_Rubin;Nom Scientifique;Code campagne\n" + + "Id;Code_Rubin;Nom_scientifique;Code_campagne\n" + "300;BUCCUND;Buccinum undatum;\n" + "365;AEQUOPE;Aequipecten opercularis;\n" + "489;LOLIVUL;Loligo vulgaris;LOLIVUL\n" +