public class OpenMir extends AbstractServlet {
-
+
//private static boolean confed=false;
private static String lang;
public HttpSession session;
long startTime = (new java.util.Date()).getTime();
long sessionConnectTime=0;
-
-
- // get the configration
+ // get the configration - this could conflict if 2 mirs are in the
+ // VM maybe? to be checked. -mh
if(getServletContext().getAttribute("mir.confed") == null) {
getConfig(req);
}
session = req.getSession();
if(session.getAttribute("Language")==null){
- setLanguage(session,getAcceptLanguage(req));
+ if (req.getParameter("language")!=null) {
+ setLanguage(session, req.getParameter("language"));
+ }
+ else {
+ setLanguage(session, getAcceptLanguage(req));
+ }
}
+ if (req.getParameter("language")!=null)
+ setLocale(session, new Locale(req.getParameter("language"), "") );
+
res.setContentType("text/html");
try {
ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
}
catch (ServletModuleUserException e) {
- handleUserError(res,res.getWriter(), e.getMsg());
+ handleUserError(req,res,res.getWriter(), e.getMsg());
}
catch (ServletModuleException e){
e.printStackTrace();
- handleError(res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.toString());
+ handleError(req,res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.toString());
}
// timing...
sessionConnectTime = new java.util.Date().getTime() - startTime;
theLog.printInfo("EXECTIME (ServletModuleOpenIndy): " + sessionConnectTime + " ms");
}
- private void handleUserError(HttpServletResponse res,PrintWriter out, String errorString) {
-
+ private void handleUserError(HttpServletRequest req, HttpServletResponse res,
+ PrintWriter out, String errorString) {
try {
theLog.printError(errorString);
SimpleHash modelRoot = new SimpleHash();
modelRoot.put("errorstring", new SimpleScalar(errorString));
modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
- HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.UserErrorTemplate"),modelRoot,out);
+ HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.UserErrorTemplate"),
+ modelRoot, out, req.getLocale() );
out.close();
}
catch (Exception e) {
}
- private void handleError(HttpServletResponse res,PrintWriter out, String errorString) {
+ private void handleError(HttpServletRequest req, HttpServletResponse res,PrintWriter out, String errorString) {
try {
theLog.printError(errorString);
SimpleHash modelRoot = new SimpleHash();
modelRoot.put("errorstring", new SimpleScalar(errorString));
- modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
- HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.ErrorTemplate"),modelRoot,out);
+ modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(
+ new GregorianCalendar())));
+ HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.ErrorTemplate"),
+ modelRoot,out, req.getLocale());
out.close();
}
catch (Exception e) {