}
- private void writeArticles(Category cat, HttpServletResponse rp) {
+ private void writeArticles(Category cat, String entity, HttpServletResponse rp) {
String html;
List<Article> articles;
try {
- articles = provider.getArticles(cat);
+ articles = provider.getArticles(cat, entity);
if (articles != null) {
- html = HTML.toHTML(articles, cat, config.getCategories());
+ html = HTML.toHTML(articles, cat, entity, config, provider);
rp.setContentType("text/html;charset=utf-8");
rp.getWriter().write(html);
rp.setCharacterEncoding("utf-8");
} else {
LOG.severe("writeArticles cannot retrieve any articles");
- html = HTML.toHTML(new ArrayList<Article>(), cat, config.getCategories());
+ html = HTML.toHTML(new ArrayList<Article>(), cat, entity, config, provider);
rp.setContentType("text/html");
rp.getWriter().write(html);
}
for (Category cat: config.getCategories()) {
if (path.equals(cat.getURL())) {
- writeArticles(cat, resp);
+ writeArticles(cat, getQueryParameter(req, "entity"), resp);
return ;
}
}
for (Language l: config.getLanguages()) {
if (path.equals(l.toURL())) {
- doTemporaryRedirect(config.getDefaultCategory().getURL(), resp);
+ doTemporaryRedirect(config.getDefaultCategory(l).getURL(), resp);
return ;
}
}
resp.getWriter().write("Not found " + req.getPathInfo());
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
- } catch (IOException e) {
+ } catch (IOException | RuntimeException e) {
LOG.log(Level.SEVERE, "doGet failure", e);
resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}