X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FPnews.java;h=57ea4be6accb90f0553dece7ec464dc53a0a1702;hb=6f411daf8bfd05580744e3c46a8c1497e8cd7898;hp=e254a61cac03691f1d5185e3c2d2f062d0ccf2d7;hpb=386f46525e32212ac5f3653135a6539c1b2639eb;p=pnews.git

diff --git a/war/src/main/java/pnews/servlet/Pnews.java b/war/src/main/java/pnews/servlet/Pnews.java
index e254a61..57ea4be 100644
--- a/war/src/main/java/pnews/servlet/Pnews.java
+++ b/war/src/main/java/pnews/servlet/Pnews.java
@@ -90,12 +90,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(config.getCategories()));
+                rp.getWriter().write(JSON.getStats(provider, config));
         }
 
         
@@ -173,7 +178,6 @@ public class Pnews extends HttpServlet {
                 }
 
                 try {
-                
                         if (path.equals("/stats")) {
                                 writeStats(resp);
                                 return ;
@@ -185,6 +189,13 @@ public class Pnews extends HttpServlet {
                                         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);
@@ -199,7 +210,11 @@ public class Pnews extends HttpServlet {
                 LOG.info("Pnews servlet init " + cfg.getServletContext().getContextPath());
                 
                 config = new Config();
-                config.loadConfig();
+                try {
+                        config.loadConfig();
+                } catch (UnsupportedEncodingException e) {
+                        throw new ServletException(e);
+                }
                 
                 provider = new ArticleProvider(config);
         }