rework of media handling vis a vis storage and producing. making it more

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 96820b2..1b10a98 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -41,8 +41,6 @@ public class OpenMir extends AbstractServlet {
     long            startTime = (new java.util.Date()).getTime();
     long            sessionConnectTime=0;
 
-    
-    
     // get the configration
     if(getServletContext().getAttribute("mir.confed") == null) {
       getConfig(req);
@@ -58,25 +56,26 @@ public class OpenMir extends AbstractServlet {
       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) {
@@ -85,14 +84,16 @@ public class OpenMir extends AbstractServlet {
 
   }
 
-  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) {