producer timing finish to producer.java

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index fe9e1c9..96820b2 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -24,10 +24,9 @@ import mircoders.storage.*;
  */
 
 
-public class OpenMir extends AbstractServlet
-{
-  private static Logfile                theLog;
-  private static boolean                confed=false;
+public class OpenMir extends AbstractServlet {
+  
+  //private static boolean                confed=false;
   private static String lang;
   public HttpSession session;
 
@@ -42,12 +41,14 @@ public class OpenMir extends AbstractServlet
     long            startTime = (new java.util.Date()).getTime();
     long            sessionConnectTime=0;
 
-    session = req.getSession(true);
     
-    if (!confed){
-      confed = getConfig(req);
+    
+    // get the configration
+    if(getServletContext().getAttribute("mir.confed") == null) {
+      getConfig(req);
     }
-      
+    session = req.getSession();
+
     if(session.getAttribute("Language")==null){
       setLanguage(session,getAcceptLanguage(req));
     }
@@ -56,12 +57,34 @@ public class OpenMir extends AbstractServlet
     try {
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
     }
-    catch (ServletModuleException e){ handleError(res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.toString()); }
+    catch (ServletModuleUserException e) {
+      handleUserError(res,res.getWriter(), e.getMsg());  
+    }
+    catch (ServletModuleException e){
+      e.printStackTrace();
+      handleError(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) {
+
+    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);
+      out.close();
+    }
+    catch (Exception e) {
+      System.err.println("Fehler in UserErrorTemplate");
+    }
+
+  }
+
   private void handleError(HttpServletResponse res,PrintWriter out, String errorString) {
 
     try {
@@ -69,7 +92,7 @@ public class OpenMir extends AbstractServlet
       SimpleHash modelRoot = new SimpleHash();
       modelRoot.put("errorstring", new SimpleScalar(errorString));
       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
-      HTMLTemplateProcessor.process(res,Configuration.getProperty("Mir.ErrorTemplate"),modelRoot,out);
+      HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.ErrorTemplate"),modelRoot,out);
       out.close();
     }
     catch (Exception e) {