import pnews.Article;
import pnews.Category;
-import pnews.HTML;
-import pnews.JSON;
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;
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");
rp.setContentType("application/json;charset=utf-8");
rp.setCharacterEncoding("utf-8");
- rp.getWriter().write(JSON.getStats());
+ rp.getWriter().write(JSON.getStats(config.getCategories()));
}
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);
}
}
if (path.equals("/")) {
- writeArticles(Category.TOP, resp);
+ writeArticles(config.getDefaultCategory(), resp);
return ;
}
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 ;
}
}
@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);
}
}