From: Jean-Philippe Orsini Date: Fri, 13 Oct 2017 15:47:00 +0000 (+0200) Subject: Merge branch 'master' of ssh://wpitchoune.net/srv/git/pnews X-Git-Url: http://git.wpitchoune.net/gitweb/?p=pnews.git;a=commitdiff_plain;h=782edbcad560e9aba5a0ae0c731bfd76491618c8 Merge branch 'master' of ssh://wpitchoune.net/srv/git/pnews --- 782edbcad560e9aba5a0ae0c731bfd76491618c8 diff --cc war/src/main/java/pnews/servlet/Pnews.java index 529a40e,4edfb7a..845abbb --- a/war/src/main/java/pnews/servlet/Pnews.java +++ b/war/src/main/java/pnews/servlet/Pnews.java @@@ -28,40 -28,40 +28,40 @@@ public class Pnews extends HttpServlet private static final Logger LOG = Logger.getLogger(Pnews.class.getName()); private static final long serialVersionUID = 1L; private static final ArticleProvider provider = ArticleProvider.singleton; -- ++ private static String getQueryParameter(HttpServletRequest rq, String key) throws UnsupportedEncodingException { String[] params; int idx; String q; -- ++ q = rq.getQueryString(); -- ++ if (q == null) return null; -- ++ params = URLDecoder.decode(q, "UTF-8").split("&"); -- -- for (String p: params) { ++ ++ for (String p: params) { idx = p.indexOf('='); -- ++ if (idx > 1 && p.substring(0, idx).equals(key)) return p.substring(idx + 1); } -- ++ return null; } -- ++ private static void redirect(HttpServletRequest rq, HttpServletResponse rp) { String redirectURL; -- ++ LOG.entering(Pnews.class.getName(), "redirect"); -- ++ try { redirectURL = getQueryParameter(rq, "url"); -- ++ LOG.info("Request redirection to " + redirectURL); -- ++ if (redirectURL != null) { rp.setHeader("Location", redirectURL); rp.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT); @@@ -74,16 -74,16 +74,16 @@@ e.printStackTrace(); LOG.log(Level.SEVERE, "redirect failure", e); rp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); -- } -- ++ } ++ LOG.exiting(Pnews.class.getName(), "redirect"); } -- ++ private void writeArticles(Category cat, HttpServletResponse rp) { String html; List
articles; -- -- try { ++ ++ try { articles = provider.getArticles(cat); if (articles != null) { html = HTML.toHTML(articles, cat); @@@ -100,59 -100,58 +100,59 @@@ rp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } } -- ++ private void copy(InputStream in, Writer writer) throws IOException { Reader r; char[] buf; int n; -- ++ buf = new char[1024]; r = new InputStreamReader(in); while ( (n = r.read(buf, 0, buf.length)) != -1) -- writer.write(buf, 0, n); ++ writer.write(buf, 0, n); } -- ++ @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) { String path; InputStream in; -- ++ LOG.info("doGet " + req.getRequestURI()); path = req.getPathInfo(); -- ++ if (path.equals("/redirect")) { redirect(req, resp); return ; -- } -- ++ } ++ if (path.equals("/style.css")) { try { in = HTML.class.getClassLoader().getResourceAsStream("style.css"); copy(in, resp.getWriter()); resp.setContentType("text/css"); -- ++ return ; } catch (IOException e) { LOG.log(Level.SEVERE, "doGet failure", e); resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); -- ++ return ; } } -- ++ if (path.equals("/")) { writeArticles(Category.TOP, resp); return ; } - ++ for (Category cat: Category.values()) { if (path.equals('/' + cat.getId())) { writeArticles(cat, resp); return ; } } -- ++ try { resp.getWriter().write("Not found " + req.getPathInfo()); resp.setStatus(HttpServletResponse.SC_NOT_FOUND); @@@ -161,10 -160,10 +161,10 @@@ resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } } -- ++ @Override public void init(ServletConfig config) throws ServletException { LOG.info("Pnews servlet init " + config.getServletContext().getContextPath()); -- ++ } }