X-Git-Url: https://git.wpitchoune.net/gitweb/?p=pnews.git;a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FHTML.java;h=ac7a749b3db7e4499ba22c798d1c90427edc79e2;hp=42564e896d9e857e1da5e685521f2e7bb982e56e;hb=aff83c8798602b535d13edeaffdb8f4238e2bbf5;hpb=6a601c7b03d36f95fbb69ba487c8a4953828c71d diff --git a/war/src/main/java/pnews/servlet/HTML.java b/war/src/main/java/pnews/servlet/HTML.java index 42564e8..ac7a749 100644 --- a/war/src/main/java/pnews/servlet/HTML.java +++ b/war/src/main/java/pnews/servlet/HTML.java @@ -9,10 +9,11 @@ import java.util.logging.Logger; import com.rometools.rome.io.FeedException; -import pnews.Article; -import pnews.Category; -import pnews.EntityStat; -import pnews.Language; +import net.wpitchoune.pnews.Article; +import net.wpitchoune.pnews.Category; +import net.wpitchoune.pnews.Config; +import net.wpitchoune.pnews.EntityStat; +import net.wpitchoune.pnews.Language; public class HTML { private static final String CLASS_NAME= HTML.class.getName(); @@ -48,9 +49,9 @@ public class HTML { buf.append("
\n"); buf.append("
\n"); - if (a.thumbnail != null) { + if (a.getThumbnail() != null) { buf.append("\n"); } buf.append("
\n"); @@ -58,15 +59,20 @@ public class HTML { buf.append("
\n"); buf.append("
\n"); - appendA(buf, a.title, "/redirect?url=" + URLEncoder.encode(a.link, "UTF-8"), null); + appendA(buf, a.getTitle(), "/redirect?url=" + URLEncoder.encode(a.getLink(), "UTF-8"), null); buf.append("
\n"); - buf.append("
" + a.website + " - " + a.publicationDate + "
"); + buf.append("
" + a.getWebsite() + " - " + a.getPublicationDate() + "
"); buf.append("
\n"); - if (a.description != null) { + if (a.getDescription() != null) { buf.append("

"); - buf.append(a.description); + if (a.getDescription().length() < 512) { + buf.append(a.getDescription()); + } else { + buf.append(a.getDescription().substring(0, 512)); + buf.append("[..]"); + } buf.append("

"); } buf.append("
\n"); @@ -105,11 +111,20 @@ public class HTML { buf.append("\n"); } - public static String toHTML(List
articles, Category catActive, Config cfg, ArticleProvider provider) { + private static String toURL(Category catActive, String entity) { + try { + return catActive.getURL() + "?entity=" + URLEncoder.encode(entity, "UTF-8"); + } catch (UnsupportedEncodingException e) { + LOG.log(Level.SEVERE, "Failed to generate link to entity " + entity, e); + return catActive.getURL(); + } + } + + public static String toHTML(List
articles, Category catActive, String entityActive, Config cfg, ArticleProvider provider) { StringBuffer buf; int i; - Category[] cats; List entities; + String cl; buf = new StringBuffer(); buf.append("\n"); @@ -123,8 +138,6 @@ public class HTML { buf.append("\n"); buf.append("\n"); - cats = cfg.getCategories(); - appendMenu(buf, catActive, cfg); try { @@ -136,7 +149,11 @@ public class HTML { i = 0; for (EntityStat s: entities) { buf.append("
  • "); - buf.append(s.getEntity()); + if (entityActive != null && s.getEntity().equals(entityActive)) + cl = "active"; + else + cl = null; + appendA(buf, s.getEntity(), toURL(catActive, s.getEntity()), cl); buf.append("
    • \n"); i++; if (i > 10)