X-Git-Url: https://wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FPnews.java;h=94475f94f8d75eb91cdfd7e331302601c3abf24f;hb=d7e96345fdfabf8e66a94fdb5895f6b3b1cd45ac;hp=2e49a7a4b62f584ccfa830b9b71e9318b484510e;hpb=27591c1933180a43423c78cc8cda28a3da1bfccf;p=pnews.git

diff --git a/war/src/main/java/pnews/servlet/Pnews.java b/war/src/main/java/pnews/servlet/Pnews.java
index 2e49a7a..94475f9 100644
--- a/war/src/main/java/pnews/servlet/Pnews.java
+++ b/war/src/main/java/pnews/servlet/Pnews.java
@@ -22,12 +22,14 @@ import com.rometools.rome.io.FeedException;
 
 import pnews.Article;
 import pnews.Category;
+import pnews.Language;
 
 public class Pnews extends HttpServlet {
         private static final String CLASS_NAME = Pnews.class.getName();
         private static final Logger LOG = Logger.getLogger(Pnews.class.getName());
         private static final long serialVersionUID = 1L;
-        private static final ArticleProvider provider = ArticleProvider.singleton;
+        private ArticleProvider provider;
+        private Config config;
 
         private static String getQueryParameter(HttpServletRequest rq, String key)
                         throws UnsupportedEncodingException {
@@ -89,12 +91,17 @@ public class Pnews extends HttpServlet {
 
                 LOG.exiting(Pnews.class.getName(), "redirect");
         }
+        
+        private static void doTemporaryRedirect(String newURL, HttpServletResponse rp) {
+                rp.setHeader("Location", newURL);
+                rp.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT);             
+        }
 
         private void writeStats(HttpServletResponse rp) throws IOException {
                 rp.setContentType("application/json;charset=utf-8");
                 rp.setCharacterEncoding("utf-8");
 
-                rp.getWriter().write(JSON.getStats());
+                rp.getWriter().write(JSON.getStats(provider, config));
         }
 
         
@@ -105,13 +112,13 @@ public class Pnews extends HttpServlet {
                 try {
                         articles = provider.getArticles(cat);
                         if (articles != null) {
-                                html = HTML.toHTML(articles, cat);
+                                html = HTML.toHTML(articles, cat, config.getCategories());
                                 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);
+                                html = HTML.toHTML(new ArrayList<Article>(), cat, config.getCategories());
                                 rp.setContentType("text/html");
                                 rp.getWriter().write(html);
                         }
@@ -167,23 +174,29 @@ public class Pnews extends HttpServlet {
                 }
 
                 if (path.equals("/")) {
-                        writeArticles(Category.ACTUALITE, resp);
+                        doTemporaryRedirect(Language.toURL(config.getDefaultLanguage()), resp);
                         return ;
                 }
 
                 try {
-                
                         if (path.equals("/stats")) {
                                 writeStats(resp);
                                 return ;
                         }
                 
-                        for (Category cat: Category.values()) {
-                                if (path.equals('/' + cat.getId())) {
+                        for (Category cat: config.getCategories()) {
+                                if (path.equals(cat.getURL())) {
                                         writeArticles(cat, resp);
                                         return ;
                                 }
                         }
+                        
+                        for (String l: config.getLanguages()) {
+                                if (path.equals("/" + l) || path.equals("/" + l + "/")) {
+                                        doTemporaryRedirect(config.getDefaultCategory().getURL(), resp);
+                                        return ;
+                                }
+                        }
                 
                         resp.getWriter().write("Not found " + req.getPathInfo());
                         resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
@@ -194,8 +207,16 @@ public class Pnews extends HttpServlet {
         }
 
         @Override
-        public void init(ServletConfig config) throws ServletException {
-                LOG.info("Pnews servlet init " + config.getServletContext().getContextPath());
-
+        public void init(ServletConfig cfg) throws ServletException {
+                LOG.info("Pnews servlet init " + cfg.getServletContext().getContextPath());
+                
+                config = new Config();
+                try {
+                        config.loadConfig();
+                } catch (UnsupportedEncodingException e) {
+                        throw new ServletException(e);
+                }
+                
+                provider = new ArticleProvider(config);
         }
 }