From 3a14872c7c204a7e3cadbd0c29fa957bdec88274 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Mon, 25 Jul 2022 13:56:20 +0200 Subject: [PATCH] fix: float validation regex (#318) Co-authored-by: Georgy Litvinov --- .../validators/DefaultDataPropertyFormValidator.java | 2 +- .../body/partials/individual/propStatement-dataDefault.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java index d581f859a..35ae74bed 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java @@ -42,7 +42,7 @@ public class DefaultDataPropertyFormValidator implements N3ValidatorVTwo{ private final Pattern ymPattern = Pattern.compile(ymRegex); private final String monthRegex = "^--(0[1-9]|1[012])"; private final Pattern monthPattern = Pattern.compile(monthRegex); - private final String floatRegex = "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?."; + private final String floatRegex = "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?"; private final Pattern floatPattern = Pattern.compile(floatRegex); private final String intRegex = "^-?\\d+$"; private final Pattern intPattern = Pattern.compile(intRegex); diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl index 5e6e66fc8..3dd247cb9 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl @@ -81,7 +81,7 @@ invalid format <#break> <#case "float"> - <#if !value?matches("^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?.") > + <#if !value?matches("^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?") >  ${i18n().invalid_format} invalid format