X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FPnews.java;h=fc08d136ab112fff271ac878c8d0459e20ccefc4;hb=892111b2ecf385bd28bbe93ff6113cbc1e04409e;hp=662b47c45bd45d215840121ee0158fee0bfa8f63;hpb=be08403a647c060832561daa84514b076ef357c1;p=pnews.git

diff --git a/war/src/main/java/pnews/servlet/Pnews.java b/war/src/main/java/pnews/servlet/Pnews.java
index 662b47c..fc08d13 100644
--- a/war/src/main/java/pnews/servlet/Pnews.java
+++ b/war/src/main/java/pnews/servlet/Pnews.java
@@ -22,31 +22,36 @@ import com.rometools.rome.io.FeedException;
 
 import pnews.Article;
 import pnews.Category;
-import pnews.HTML;
 
 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 {
+                final String METHOD_NAME="getQueryParameter";                
                 String[] params;
                 int idx;
                 String q;
+                
+                
+                LOG.entering(CLASS_NAME, METHOD_NAME, new Object[] { rq, key} );
 
                 q = rq.getQueryString();
 
                 if (q == null)
                         return null;
 
-                params = URLDecoder.decode(q, "UTF-8").split("&");
+                params = q.split("&");
 
                 for (String p: params) {
                         idx = p.indexOf('=');
 
                         if (idx > 1 && p.substring(0, idx).equals(key))
-                                return p.substring(idx + 1);
+                                return URLDecoder.decode(p.substring(idx + 1), "UTF-8");
                 }
 
                 return null;
@@ -54,8 +59,9 @@ public class Pnews extends HttpServlet {
 
         private static void redirect(HttpServletRequest rq, HttpServletResponse rp) {
                 String redirectURL;
+                Article a;
 
-                LOG.entering(Pnews.class.getName(), "redirect");
+                LOG.entering(Pnews.class.getName(), "redirect", new Object[] { rq, rp });
 
                 try {
                         redirectURL = getQueryParameter(rq, "url");
@@ -63,6 +69,12 @@ public class Pnews extends HttpServlet {
                         LOG.info("Request redirection to " + redirectURL);
 
                         if (redirectURL != null) {
+                                a = ArticleStore.singleton.get(redirectURL);
+                                if (a != null)
+                                        a.readCount.incrementAndGet();
+                                else
+                                        LOG.severe("Cannot find the article " + redirectURL);
+                                
                                 rp.setHeader("Location", redirectURL);
                                 rp.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT);
                         } else {
@@ -78,7 +90,20 @@ 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()));
+        }
 
+        
         private void writeArticles(Category cat, HttpServletResponse rp) {
                 String html;
                 List<Article> articles;
@@ -86,12 +111,13 @@ public class Pnews extends HttpServlet {
                 try {
                         articles = provider.getArticles(cat);
                         if (articles != null) {
-                                html = HTML.toHTML(articles, cat);
-                                rp.setContentType("text/html");
+                                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);
                         }
@@ -114,6 +140,7 @@ public class Pnews extends HttpServlet {
 
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
+                final String METHOD_NAME = "doGet";
                 String path;
                 InputStream in;
 
@@ -121,6 +148,8 @@ public class Pnews extends HttpServlet {
               
                 LOG.info("doGet " + req.getRemoteAddr().toString() + " " + req.getRequestURI() + " " + req.getQueryString());
                                 
+                LOG.info(METHOD_NAME + " queryString=" + req.getQueryString());
+                
                 path = req.getPathInfo();
 
                 if (path.equals("/redirect")) {
@@ -144,18 +173,30 @@ public class Pnews extends HttpServlet {
                 }
 
                 if (path.equals("/")) {
-                        writeArticles(Category.TOP, resp);
+                        writeArticles(config.getDefaultCategory(), resp);
                         return ;
                 }
 
-                for (Category cat: Category.values()) {
-                        if (path.equals('/' + cat.getId())) {
-                                writeArticles(cat, resp);
+                try {
+                        if (path.equals("/stats")) {
+                                writeStats(resp);
                                 return ;
                         }
-                }
-
-                try {
+                
+                        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);
                 } catch (IOException e) {
@@ -165,8 +206,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);
         }
 }