projects
/
pnews.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
provide some stats as json
[pnews.git]
/
war
/
src
/
main
/
java
/
pnews
/
servlet
/
Pnews.java
diff --git
a/war/src/main/java/pnews/servlet/Pnews.java
b/war/src/main/java/pnews/servlet/Pnews.java
index
db93bb3
..
428ec87
100644
(file)
--- a/
war/src/main/java/pnews/servlet/Pnews.java
+++ b/
war/src/main/java/pnews/servlet/Pnews.java
@@
-9,7
+9,6
@@
import java.io.Writer;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.List;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.logging.Level;
import java.util.logging.Logger;
@@
-24,6
+23,7
@@
import com.rometools.rome.io.FeedException;
import pnews.Article;
import pnews.Category;
import pnews.HTML;
import pnews.Article;
import pnews.Category;
import pnews.HTML;
+import pnews.JSON;
public class Pnews extends HttpServlet {
private static final Logger LOG = Logger.getLogger(Pnews.class.getName());
public class Pnews extends HttpServlet {
private static final Logger LOG = Logger.getLogger(Pnews.class.getName());
@@
-55,6
+55,7
@@
public class Pnews extends HttpServlet {
private static void redirect(HttpServletRequest rq, HttpServletResponse rp) {
String redirectURL;
private static void redirect(HttpServletRequest rq, HttpServletResponse rp) {
String redirectURL;
+ Article a;
LOG.entering(Pnews.class.getName(), "redirect");
LOG.entering(Pnews.class.getName(), "redirect");
@@
-64,6
+65,12
@@
public class Pnews extends HttpServlet {
LOG.info("Request redirection to " + redirectURL);
if (redirectURL != null) {
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 {
rp.setHeader("Location", redirectURL);
rp.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT);
} else {
@@
-80,6
+87,14
@@
public class Pnews extends HttpServlet {
LOG.exiting(Pnews.class.getName(), "redirect");
}
LOG.exiting(Pnews.class.getName(), "redirect");
}
+ private void writeStats(HttpServletResponse rp) throws IOException {
+ rp.setContentType("application/json;charset=utf-8");
+ rp.setCharacterEncoding("utf-8");
+
+ rp.getWriter().write(JSON.getStats());
+ }
+
+
private void writeArticles(Category cat, HttpServletResponse rp) {
String html;
List<Article> articles;
private void writeArticles(Category cat, HttpServletResponse rp) {
String html;
List<Article> articles;
@@
-90,7
+105,7
@@
public class Pnews extends HttpServlet {
html = HTML.toHTML(articles, cat);
rp.setContentType("text/html;charset=utf-8");
rp.getWriter().write(html);
html = HTML.toHTML(articles, cat);
rp.setContentType("text/html;charset=utf-8");
rp.getWriter().write(html);
- rp.setCharacterEncoding("utf
8
-8");
+ rp.setCharacterEncoding("utf-8");
} else {
LOG.severe("writeArticles cannot retrieve any articles");
html = HTML.toHTML(new ArrayList<Article>(), cat);
} else {
LOG.severe("writeArticles cannot retrieve any articles");
html = HTML.toHTML(new ArrayList<Article>(), cat);
@@
-116,6
+131,7
@@
public class Pnews extends HttpServlet {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
+ final String METHOD_NAME = "doGet";
String path;
InputStream in;
String path;
InputStream in;
@@
-123,6
+139,8
@@
public class Pnews extends HttpServlet {
LOG.info("doGet " + req.getRemoteAddr().toString() + " " + req.getRequestURI() + " " + req.getQueryString());
LOG.info("doGet " + req.getRemoteAddr().toString() + " " + req.getRequestURI() + " " + req.getQueryString());
+ LOG.info(METHOD_NAME + " queryString=" + req.getQueryString());
+
path = req.getPathInfo();
if (path.equals("/redirect")) {
path = req.getPathInfo();
if (path.equals("/redirect")) {
@@
-150,14
+168,20
@@
public class Pnews extends HttpServlet {
return ;
}
return ;
}
- for (Category cat: Category.values()) {
- if (path.equals('/' + cat.getId())) {
- writeArticles(cat, resp);
+ try {
+
+ if (path.equals("/stats")) {
+ writeStats(resp);
return ;
}
return ;
}
- }
-
- try {
+
+ for (Category cat: Category.values()) {
+ if (path.equals('/' + cat.getId())) {
+ writeArticles(cat, resp);
+ return ;
+ }
+ }
+
resp.getWriter().write("Not found " + req.getPathInfo());
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
} catch (IOException e) {
resp.getWriter().write("Not found " + req.getPathInfo());
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
} catch (IOException e) {