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
dcb86ef
..
428ec87
100644
(file)
--- a/
war/src/main/java/pnews/servlet/Pnews.java
+++ b/
war/src/main/java/pnews/servlet/Pnews.java
@@
-23,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());
@@
-87,10
+88,10
@@
public class Pnews extends HttpServlet {
}
private void writeStats(HttpServletResponse rp) throws IOException {
}
private void writeStats(HttpServletResponse rp) throws IOException {
- rp.setContentType("
text/html
;charset=utf-8");
- rp.setCharacterEncoding("utf
8
-8");
+ rp.setContentType("
application/json
;charset=utf-8");
+ rp.setCharacterEncoding("utf-8");
- rp.getWriter().write(
"" + ArticleStore.singleton
);
+ rp.getWriter().write(
JSON.getStats()
);
}
}
@@
-104,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);
@@
-130,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;
@@
-137,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")) {