statool/statoolinfos
statool/statoolinfos
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Fixed path matching.

Browse source
This commit is contained in:
Christian P. MOMON 2020-10-15 02:10:21 +02:00
parent 3d9dc2a0c7
commit d75148193a
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/fr/devinsy/statoolinfos/core/Service.java
View file

@ -27,6 +27,8 @@ import java.util.regex.Pattern;
import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.RegExUtils;
import org.apache.commons.lang3.StringUtils; 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.PathProperties;
import fr.devinsy.statoolinfos.properties.PathProperty; import fr.devinsy.statoolinfos.properties.PathProperty;
@ -40,6 +42,8 @@ public class Service extends PathPropertyList
{ {
private static final long serialVersionUID = 3629841771102288863L; private static final long serialVersionUID = 3629841771102288863L;
private static Logger logger = LoggerFactory.getLogger(Service.class);
public enum Status public enum Status
{ {
OK, OK,
@ -261,7 +265,7 @@ public class Service extends PathPropertyList
result = new StringList(); result = new StringList();
Pattern pattern = Pattern.compile("^" + path + "\\.(?<year>\\d{4}).*=.*$"); Pattern pattern = Pattern.compile("^" + path + "\\.(?<year>\\d{4}).*$");
for (PathProperty property : getByPrefix(path)) for (PathProperty property : getByPrefix(path))
{ {

1
src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java
View file

@ -319,6 +319,7 @@ public class Htmlizer
page = OrganizationPage.build(organization); page = OrganizationPage.build(organization);
FileUtils.write(new File(htmlizeDirectory, organization.getTechnicalName() + ".xhtml"), page, StandardCharsets.UTF_8); FileUtils.write(new File(htmlizeDirectory, organization.getTechnicalName() + ".xhtml"), page, StandardCharsets.UTF_8);
//
for (Service service : organization.getServices()) for (Service service : organization.getServices())
{ {
// Manage the logo file. // Manage the logo file.