X-Git-Url: https://git.wpitchoune.net/gitweb/?p=pnews.git;a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FPnews.java;h=c51f9468d6de242c4a25d5a774de75448ed0fa63;hp=777f7fd08fb7f26ff09d77ddf20605ef088e2992;hb=aff83c8798602b535d13edeaffdb8f4238e2bbf5;hpb=56c07f5de3319eb61182b7100855801644538e6f

diff --git a/war/src/main/java/pnews/servlet/Pnews.java b/war/src/main/java/pnews/servlet/Pnews.java
index 777f7fd..c51f946 100644
--- a/war/src/main/java/pnews/servlet/Pnews.java
+++ b/war/src/main/java/pnews/servlet/Pnews.java
@@ -20,9 +20,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.rometools.rome.io.FeedException;
 
-import pnews.Article;
-import pnews.Category;
-import pnews.Language;
+import net.wpitchoune.pnews.Article;
+import net.wpitchoune.pnews.ArticleStore;
+import net.wpitchoune.pnews.Category;
+import net.wpitchoune.pnews.Config;
+import net.wpitchoune.pnews.Language;
 
 public class Pnews extends HttpServlet {
         private static final String CLASS_NAME = Pnews.class.getName();
@@ -72,7 +74,7 @@ public class Pnews extends HttpServlet {
                         if (redirectURL != null) {
                                 a = ArticleStore.singleton.get(redirectURL);
                                 if (a != null)
-                                        a.readCount.incrementAndGet();
+                                        a.incrementReadCount();
                                 else
                                         LOG.severe("Cannot find the article " + redirectURL);
                                 
@@ -105,20 +107,20 @@ public class Pnews extends HttpServlet {
         }
 
         
-        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, provider);
+                                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, provider);
+                                html = HTML.toHTML(new ArrayList<Article>(), cat, entity, config, provider);
                                 rp.setContentType("text/html");
                                 rp.getWriter().write(html);
                         }
@@ -186,7 +188,7 @@ public class Pnews extends HttpServlet {
                 
                         for (Category cat: config.getCategories()) {
                                 if (path.equals(cat.getURL())) {
-                                        writeArticles(cat, resp);
+                                        writeArticles(cat, getQueryParameter(req, "entity"), resp);
                                         return ;
                                 }
                         }