Author: chatellier Date: 2011-03-14 16:11:07 +0000 (Mon, 14 Mar 2011) New Revision: 774 Log: Allow "e" in double Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2011-03-14 15:39:56 UTC (rev 773) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2011-03-14 16:11:07 UTC (rev 774) @@ -28,7 +28,7 @@ <validators> <field name="sweptSurface"> <field-validator type="regex"> - <param name="expression">\-?[0-9]+\.[0-9]{3,}</param> + <param name="expression">(\-?[0-9]+\.[0-9]{3,})|([0-9]+(\.[0-9]+)?(e\-?[0-9]+)?)</param> <message>sweptSurface must contain at least 3 decimals</message> </field-validator> </field> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2011-03-14 15:39:56 UTC (rev 773) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2011-03-14 16:11:07 UTC (rev 774) @@ -28,13 +28,13 @@ <validators> <field name="lat"> <field-validator type="regex"> - <param name="expression">\-?[0-9]+\.[0-9]{4,}</param> + <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?(e\-?[0-9]+)?)</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]{4,}</param> + <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?(e\-?[0-9]+)?)</param> <message>long must contain at least 4 decimals</message> </field-validator> </field>