projects
/
pnews.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
multi-language support
[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
63040c8
..
4003fed
100644
(file)
--- a/
war/src/main/java/pnews/servlet/Pnews.java
+++ b/
war/src/main/java/pnews/servlet/Pnews.java
@@
-22,6
+22,7
@@
import com.rometools.rome.io.FeedException;
import pnews.Article;
import pnews.Category;
import pnews.Article;
import pnews.Category;
+import pnews.Language;
public class Pnews extends HttpServlet {
private static final String CLASS_NAME = Pnews.class.getName();
public class Pnews extends HttpServlet {
private static final String CLASS_NAME = Pnews.class.getName();
@@
-90,12
+91,17
@@
public class Pnews extends HttpServlet {
LOG.exiting(Pnews.class.getName(), "redirect");
}
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");
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()
));
+ rp.getWriter().write(JSON.getStats(
provider, config
));
}
}
@@
-168,12
+174,11
@@
public class Pnews extends HttpServlet {
}
if (path.equals("/")) {
}
if (path.equals("/")) {
-
writeArticles(config.getDefaultCategory
(), resp);
+
doTemporaryRedirect(config.getDefaultLanguage().toURL
(), resp);
return ;
}
try {
return ;
}
try {
-
if (path.equals("/stats")) {
writeStats(resp);
return ;
if (path.equals("/stats")) {
writeStats(resp);
return ;
@@
-185,10
+190,17
@@
public class Pnews extends HttpServlet {
return ;
}
}
return ;
}
}
+
+ for (Language l: config.getLanguages()) {
+ if (path.equals(l.toURL())) {
+ doTemporaryRedirect(config.getDefaultCategory(l).getURL(), resp);
+ return ;
+ }
+ }
resp.getWriter().write("Not found " + req.getPathInfo());
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
resp.getWriter().write("Not found " + req.getPathInfo());
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
- } catch (IOException e) {
+ } catch (IOException
| RuntimeException
e) {
LOG.log(Level.SEVERE, "doGet failure", e);
resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
LOG.log(Level.SEVERE, "doGet failure", e);
resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}