From d75148193aee4a9005616392d7ae02b52608555a Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Thu, 15 Oct 2020 02:10:21 +0200 Subject: [PATCH] Fixed path matching. --- src/fr/devinsy/statoolinfos/core/Service.java | 6 +++++- src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/fr/devinsy/statoolinfos/core/Service.java b/src/fr/devinsy/statoolinfos/core/Service.java index 9740ed9..8e6028c 100644 --- a/src/fr/devinsy/statoolinfos/core/Service.java +++ b/src/fr/devinsy/statoolinfos/core/Service.java @@ -27,6 +27,8 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import fr.devinsy.statoolinfos.properties.PathProperties; import fr.devinsy.statoolinfos.properties.PathProperty; @@ -40,6 +42,8 @@ public class Service extends PathPropertyList { private static final long serialVersionUID = 3629841771102288863L; + private static Logger logger = LoggerFactory.getLogger(Service.class); + public enum Status { OK, @@ -261,7 +265,7 @@ public class Service extends PathPropertyList result = new StringList(); - Pattern pattern = Pattern.compile("^" + path + "\\.(?\\d{4}).*=.*$"); + Pattern pattern = Pattern.compile("^" + path + "\\.(?\\d{4}).*$"); for (PathProperty property : getByPrefix(path)) { diff --git a/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java b/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java index 193d1e4..0e70fec 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java +++ b/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java @@ -319,6 +319,7 @@ public class Htmlizer page = OrganizationPage.build(organization); FileUtils.write(new File(htmlizeDirectory, organization.getTechnicalName() + ".xhtml"), page, StandardCharsets.UTF_8); + // for (Service service : organization.getServices()) { // Manage the logo file.