litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: float validation regex (#318)

Browse source 
Co-authored-by: Georgy Litvinov <georgy.litvinov@tib.eu>
This commit is contained in:
Georgy Litvinov 2022-07-25 13:56:20 +02:00 • committed by GitHub
parent 1168d1961a
commit 3a14872c7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java
View file

@ -42,7 +42,7 @@ public class DefaultDataPropertyFormValidator implements N3ValidatorVTwo{
private final Pattern ymPattern = Pattern.compile(ymRegex); private final Pattern ymPattern = Pattern.compile(ymRegex);
private final String monthRegex = "^--(0[1-9]|1[012])"; private final String monthRegex = "^--(0[1-9]|1[012])";
private final Pattern monthPattern = Pattern.compile(monthRegex); 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 Pattern floatPattern = Pattern.compile(floatRegex);
private final String intRegex = "^-?\\d+$"; private final String intRegex = "^-?\\d+$";
private final Pattern intPattern = Pattern.compile(intRegex); private final Pattern intPattern = Pattern.compile(intRegex);

2
webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl
View file

@ -81,7 +81,7 @@
<span class="invalidFormatText">invalid format</span> <span class="invalidFormatText">invalid format</span>
<#break> <#break>
<#case "float"> <#case "float">
<#if !value?matches("^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?.") > <#if !value?matches("^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?") >
<img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}"> <img class="invalidFormatImg" src="${urls.base}/images/iconAlert.png" width="18" alt=" ${i18n().invalid_format}" title=" ${i18n().invalid_format}">
<span class="invalidFormatText">invalid format</span> <span class="invalidFormatText">invalid format</span>
</#if> </#if>