Author: chatellier Date: 2010-12-15 10:40:42 +0000 (Wed, 15 Dec 2010) New Revision: 410 Log: Ajustements sur les controles Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-fatal-validation.xml trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml 2010-12-15 10:35:25 UTC (rev 409) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml 2010-12-15 10:40:42 UTC (rev 410) @@ -34,14 +34,15 @@ </field> <field name="year"> <field-validator type="regex"> - <param name="expression">[0-9]{4}</param> - <message>year is not valid (4 digits)</message> + <param name="expression">[0-9]{4}(\.[0-9]{1,2})?</param> + <message>year is not valid (4 digits.2 digits)</message> </field-validator> </field> <field name="haul"> - <field-validator type="requiredstring"> - <param name="trim">true</param> - <message>Missing haul name</message> + <field-validator type="regex"> + <param name="expression">[0-9a-z]+</param> + <param name="caseSensitive">false</param> + <message>haul name is not valid</message> </field-validator> </field> <field name="species"> Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml 2010-12-15 10:35:25 UTC (rev 409) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml 2010-12-15 10:40:42 UTC (rev 410) @@ -33,13 +33,15 @@ </field> <field name="year"> <field-validator type="regex"> - <param name="expression">[0-9]{4}</param> - <message>year is not valid (4 digits)</message> + <param name="expression">[0-9]{4}(\.[0-9]{1,2})?</param> + <message>year is not valid (4 digits.2 digits)</message> </field-validator> </field> <field name="haul"> - <field-validator type="requiredstring"> - <message>Missing haul name</message> + <field-validator type="regex"> + <param name="expression">[0-9a-z]+</param> + <param name="caseSensitive">false</param> + <message>haul name is not valid</message> </field-validator> </field> <field name="month"> @@ -54,6 +56,11 @@ </field-validator> </field> <field name="sweptSurfaceAsString"> + <field-validator type="requiredstring"> + <message>Missing sweptSurface attribute</message> + </field-validator> + </field> + <field name="sweptSurfaceAsString"> <field-validator type="checkDouble"> <param name="notAvailable">NA</param> <message>sweptSurface attribute is not a valid double</message> Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-fatal-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-fatal-validation.xml 2010-12-15 10:35:25 UTC (rev 409) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-fatal-validation.xml 2010-12-15 10:40:42 UTC (rev 410) @@ -34,14 +34,14 @@ </field> <field name="lat"> <field-validator type="regex"> - <param name="expression">\-?[0-9]+\.[0-9]{5,}</param> - <message>lat must contain at least 5 decimals</message> + <param name="expression">\-?[0-9]+\.[0-9]{4,}</param> + <message>lat must contain at least 4 decimals</message> </field-validator> </field> <field name="long"> <field-validator type="regex"> - <param name="expression">\-?[0-9]+\.[0-9]{5,}</param> - <message>long must contain at least 5 decimals</message> + <param name="expression">\-?[0-9]+\.[0-9]{4,}</param> + <message>long must contain at least 4 decimals</message> </field-validator> </field> </validators> \ No newline at end of file Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-12-15 10:35:25 UTC (rev 409) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-12-15 10:40:42 UTC (rev 410) @@ -34,14 +34,15 @@ </field> <field name="year"> <field-validator type="regex"> - <param name="expression">[0-9]{4}</param> - <message>year is not valid (4 digits)</message> + <param name="expression">[0-9]{4}(\.[0-9]{1,2})?</param> + <message>year is not valid (4 digits.2 digits)</message> </field-validator> </field> <field name="haul"> - <field-validator type="requiredstring"> - <param name="trim">true</param> - <message>Missing haul name</message> + <field-validator type="regex"> + <param name="expression">[0-9a-z]+</param> + <param name="caseSensitive">false</param> + <message>haul name is not valid</message> </field-validator> </field> <field name="species"> Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-15 10:35:25 UTC (rev 409) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-15 10:40:42 UTC (rev 410) @@ -6,12 +6,12 @@ Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= Creating\ matrix\ \:\ %d*%d*%d*%d= Missing\ file\ %s= -Missing\ haul\ name= Missing\ maturity\ attribute= Missing\ sex\ attribute= Missing\ species\ name= Missing\ stratum\ name= Missing\ survey\ name= +Missing\ sweptSurface\ attribute= Project\ %s\ already\ exist= Project\ %s\ doesn't\ exists\ \!= Selection\ %s\ already\ exists= @@ -89,15 +89,16 @@ coser.config.selection.occurrenceFilter.description=Default occurrence filter value coser.config.validator.directory.description=Validation files directory location depth\ attribute\ is\ not\ a\ valid\ double= +haul\ name\ is\ not\ valid= lat\ attribute\ is\ not\ a\ valid\ double= -lat\ must\ contain\ at\ least\ 5\ decimals= +lat\ must\ contain\ at\ least\ 4\ decimals= length\ attribute\ is\ not\ a\ valid\ double= long\ attribute\ is\ not\ a\ valid\ double= -long\ must\ contain\ at\ least\ 5\ decimals= +long\ must\ contain\ at\ least\ 4\ decimals= month\ is\ not\ valid\ (2\ digits)= number\ attribute\ is\ not\ a\ valid\ double= surface\ attribute\ is\ not\ a\ valid\ double= sweptSurface\ attribute\ is\ not\ a\ valid\ double= sweptSurface\ must\ contain\ at\ least\ 3\ decimals= weight\ attribute\ is\ not\ a\ valid\ double= -year\ is\ not\ valid\ (4\ digits)= +year\ is\ not\ valid\ (4\ digits.2\ digits)= Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-15 10:35:25 UTC (rev 409) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-15 10:40:42 UTC (rev 410) @@ -6,12 +6,12 @@ Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= Creating\ matrix\ \:\ %d*%d*%d*%d= Missing\ file\ %s=Fichier manquant \: %s -Missing\ haul\ name=Nom de trait manquant Missing\ maturity\ attribute=Attribut maturit\u00E9 manquant Missing\ sex\ attribute=Attribut sex manquant Missing\ species\ name=Nom d'esp\u00E8ce manquant Missing\ stratum\ name=Nom de strate manquant Missing\ survey\ name=Nom de campagne manquant +Missing\ sweptSurface\ attribute=SurfaceBalayee manquante Project\ %s\ already\ exist=Le projet %s existe d\u00E9j\u00E0 \! Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \! Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \! @@ -89,15 +89,16 @@ coser.config.selection.occurrenceFilter.description=Filtre par d\u00E9faut sur la moyenne des occurrences coser.config.validator.directory.description=Emplacement des fichiers de validations depth\ attribute\ is\ not\ a\ valid\ double=L'attribut ProfMoy n'est pas un r\u00E9el valide +haul\ name\ is\ not\ valid=L'attribut Trait n'est pas valide lat\ attribute\ is\ not\ a\ valid\ double=L'attribut Lat n'est pas un r\u00E9el valide -lat\ must\ contain\ at\ least\ 5\ decimals=L'attribut Lat doit contenir au moins 5 decimales +lat\ must\ contain\ at\ least\ 4\ decimals=L'attribut Lat doit contenir au moins 4 decimales length\ attribute\ is\ not\ a\ valid\ double=L'attribut Longueur n'est pas un r\u00E9el valide long\ attribute\ is\ not\ a\ valid\ double=L'attribut Long n'est pas un r\u00E9el valide -long\ must\ contain\ at\ least\ 5\ decimals=L'attribut Long doit contenir au moins 5 decimales +long\ must\ contain\ at\ least\ 4\ decimals=L'attribut Long doit contenir au moins 4 decimales month\ is\ not\ valid\ (2\ digits)=L'attribut Mois n'est pas valide (2 chiffres) number\ attribute\ is\ not\ a\ valid\ double=L'attribut Nombre n'est pas un r\u00E9el valide surface\ attribute\ is\ not\ a\ valid\ double=L'attribut Surface n'est pas un r\u00E9el valide sweptSurface\ attribute\ is\ not\ a\ valid\ double=L'attribut SurfaceBalayee n'est pas un r\u00E9el valide sweptSurface\ must\ contain\ at\ least\ 3\ decimals=L'attribut SurfaceBalayee doit contenir au moins 3 decimales weight\ attribute\ is\ not\ a\ valid\ double=L'attribut Poids n'est pas un r\u00E9el valide -year\ is\ not\ valid\ (4\ digits)=L'attribut Ann\u00E9e n'est pas valide (4 chiffres) +year\ is\ not\ valid\ (4\ digits.2\ digits)=L'attribut Ann\u00E9e n'est pas valide (4 chiffres.2 chiffres) Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java 2010-12-15 10:35:25 UTC (rev 409) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java 2010-12-15 10:40:42 UTC (rev 410) @@ -81,7 +81,7 @@ @Test public void testDoubleValidation() { Catch myCatch = new Catch(); - myCatch.setData(new String[]{"1", "Test survey","1999","Test trait","Test sp","NA","12"}); + myCatch.setData(new String[]{"1", "Test survey","1999","Testtrait","Test sp","NA","12"}); List<ControlError> errors = controlService.validate(myCatch, Category.CATCH); log.warn(errors); Assert.assertTrue(errors.isEmpty()); @@ -94,7 +94,7 @@ public void testLengthStep() { Length myLength = new Length(); // "Survey","Year","Haul","Species","Sex","Maturity","Length","Number","Weight","Age" - myLength.setData(new String[]{"1", "Test survey","1999","Test trait","Test sp","i","m","23.25", "3.00", "44.99", "12"}); + myLength.setData(new String[]{"1", "Test survey","1999","Testtrait","Test sp","i","m","23.25", "3.00", "44.99", "12"}); List<ControlError> errors = controlService.validate(myLength, Category.LENGTH); log.warn(errors); // TODO test a refaire (croisement de fichier) @@ -124,7 +124,7 @@ Control control = new Control(); DataStorage dataCatch = new MemoryDataStorage(); dataCatch.add(new String[]{"Line", "Campagne","Annee","Trait","Espece","Nombre","Poids"}); - dataCatch.add(new String[]{"1", "Test survey","1999","Test trait","Test sp","0","12"}); + dataCatch.add(new String[]{"1", "Test survey","1999","Testtrait","Test sp","0","12"}); control.setCatch(dataCatch); List<ControlError> errors = controlService.validateCategory(control, Category.CATCH, null); if (log.isDebugEnabled()) {