X-Git-Url: http://git.wpitchoune.net/gitweb/?p=pnews.git;a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FArticleProvider.java;fp=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FArticleProvider.java;h=ba96fe39856c1aff444dc4dc2aabe0c9be5e5f8a;hp=5d4959b142c7491da908841a90f04e37d25ab742;hb=8372537c3503ab0ce4681fac13ccd65023fbcd84;hpb=e28fb81c2f705d5bc47464ccbf08481a06b1035d diff --git a/war/src/main/java/pnews/servlet/ArticleProvider.java b/war/src/main/java/pnews/servlet/ArticleProvider.java index 5d4959b..ba96fe3 100644 --- a/war/src/main/java/pnews/servlet/ArticleProvider.java +++ b/war/src/main/java/pnews/servlet/ArticleProvider.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -220,14 +221,17 @@ public class ArticleProvider { final String FUNCTION_NAME = "getEntities"; EntityStat s; List stats; + Instant minInstant; LOG.entering(CLASS_NAME, FUNCTION_NAME, cat); articles = getArticles(cat, null); + minInstant = Instant.now().minus(15, ChronoUnit.DAYS); + entities = new HashMap<>(); - for (Article a: articles) - if (a.getEntities() != null) { + for (Article a: articles) + if (a.getPublicationDate().isAfter(minInstant) && a.getEntities() != null) for (String e: a.getEntities()) { s = entities.get(e); if (s == null) { @@ -236,8 +240,7 @@ public class ArticleProvider { } s.increment(); } - } - + stats = new ArrayList<>(entities.values()); stats.sort(new Comparator() {