Author: chatellier Date: 2010-10-22 16:48:03 +0000 (Fri, 22 Oct 2010) New Revision: 90 Log: Improve data format (iso, ;) Modified: trunk/coser-business/src/test/resources/csv/correct/testhaul.csv trunk/coser-business/src/test/resources/csv/correct/testlength.csv trunk/coser-business/src/test/resources/csv/correct/testreftax.csv trunk/coser-business/src/test/resources/csv/correct/teststrata.csv Modified: trunk/coser-business/src/test/resources/csv/correct/testhaul.csv =================================================================== --- trunk/coser-business/src/test/resources/csv/correct/testhaul.csv 2010-10-22 14:45:31 UTC (rev 89) +++ trunk/coser-business/src/test/resources/csv/correct/testhaul.csv 2010-10-22 16:48:03 UTC (rev 90) @@ -1,4 +1,4 @@ -Survey,Year,Haul,Month,Stratum,SweptSurface,Lat,Long,Depth +Survey;Year;Haul;Month;Stratum;SweptSurface;Lat;Long;Depth COSER_TEST;2010;TRAIT1;10;STR1;0.06;43.75;-1.50;45.50 COSER_TEST;2010;TRAIT2;10;STR2;0.06;43.81;-1.45;31.00 COSER_TEST;2010;TRAIT3;10;STR3;0.06;43.89;-1.73;115.00 Modified: trunk/coser-business/src/test/resources/csv/correct/testlength.csv =================================================================== --- trunk/coser-business/src/test/resources/csv/correct/testlength.csv 2010-10-22 14:45:31 UTC (rev 89) +++ trunk/coser-business/src/test/resources/csv/correct/testlength.csv 2010-10-22 16:48:03 UTC (rev 90) @@ -1,4 +1,4 @@ -Survey,Year,Haul,Species,Sex,Maturity,Length,Number,Weight,Age +Survey;Year;Haul;Species;Sex;Maturity;Length;Number;Weight;Age COSER_TEST;2010;TRAIT1;COSER_SPECIES1;i;NA;29.19;1.00;NA COSER_TEST;2010;TRAIT1;COSER_SPECIES2;i;NA;19.60;2.00;NA COSER_TEST;2010;TRAIT1;COSER_SPECIES3;i;NA;32.93;5.00;NA Modified: trunk/coser-business/src/test/resources/csv/correct/testreftax.csv =================================================================== --- trunk/coser-business/src/test/resources/csv/correct/testreftax.csv 2010-10-22 14:45:31 UTC (rev 89) +++ trunk/coser-business/src/test/resources/csv/correct/testreftax.csv 2010-10-22 16:48:03 UTC (rev 90) @@ -1,5 +1,6 @@ -"C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxPère";"Taxa" +"C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxP�";"Taxa" "1";"000001";"1";"COSER_SPECIES1";"L'espece de test coser 1";"";"";""; "2";"000002";"2";"COSER_SPECIES2";"L'espece de test coser 2";"";"";""; "3";"000003";"3";"COSER_SPECIES3";"L'espece de test coser 3";"";"";""; "4";"000004";"4";"COSER_SPECIES4";"L'espece de test coser 4";"";"";""; +"5";"000005";"5";"COSER_SPECIES_MERGE";"L'espece de test coser pour fusion";"";"";""; Modified: trunk/coser-business/src/test/resources/csv/correct/teststrata.csv =================================================================== --- trunk/coser-business/src/test/resources/csv/correct/teststrata.csv 2010-10-22 14:45:31 UTC (rev 89) +++ trunk/coser-business/src/test/resources/csv/correct/teststrata.csv 2010-10-22 16:48:03 UTC (rev 90) @@ -1,4 +1,4 @@ -Survey,Stratum,Surface +Survey;Stratum;Surface COSER_TEST;STR1;15909.15 COSER_TEST;STR2;11184.27 COSER_TEST;STR3;5200.96