ServletModule exception cleanup + different error templates for admin + open postings...

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 8235d74..ca0377c 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -44,8 +44,11 @@ import mir.misc.HTMLTemplateProcessor;
 import mir.misc.StringUtil;
 import mir.servlet.AbstractServlet;
 import mir.servlet.ServletModuleDispatch;
-import mir.servlet.ServletModuleException;
-import mir.servlet.ServletModuleUserException;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleUserExc;
+import mir.servlet.ServletModuleFailure;
+import mir.util.ExceptionFunctions;
+
 import mircoders.servlet.ServletModuleOpenIndy;
 import freemarker.template.SimpleHash;
 import freemarker.template.SimpleScalar;
@@ -54,71 +57,69 @@ import freemarker.template.SimpleScalar;
  *  OpenMir.java - main servlet for open posting and comment feature to articles
  *
  *  @author RK 1999-2001, the mir-coders group
- *  @version $Id: OpenMir.java,v 1.21 2003/03/05 19:23:14 idfx Exp $
+ *  @version $Id: OpenMir.java,v 1.22 2003/03/06 05:40:38 zapata Exp $
  *
  */
 
 
 public class OpenMir extends AbstractServlet {
-
-  //private static boolean                confed=false;
   private static String lang;
   public HttpSession session;
 
-  public void doGet(HttpServletRequest req, HttpServletResponse res)
-    throws ServletException, IOException {
-    doPost(req,res);
+  public void doGet(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletException, IOException {
+    doPost(aRequest,aResponse);
   }
 
-  public void doPost(HttpServletRequest req, HttpServletResponse res)
-    throws ServletException, IOException {
-
+  public void doPost(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletException, IOException {
     long startTime = System.currentTimeMillis();
     long sessionConnectTime=0;
 
-    session = req.getSession();
+    session = aRequest.getSession();
 
     if(session.getAttribute("Language")==null){
-      if (req.getParameter("language")!=null) {
-        setLanguage(session, req.getParameter("language"));
+      if (aRequest.getParameter("language")!=null) {
+        setLanguage(session, aRequest.getParameter("language"));
       }
       else {
-        setLanguage(session, getAcceptLanguage(req));
+        setLanguage(session, getAcceptLanguage(aRequest));
       }
     }
 
-    if (req.getParameter("language")!=null)
-      setLocale(session, new Locale(req.getParameter("language"), "") );
+    if (session.getAttribute("language")!=null)
+      setLocale(session, new Locale((String) session.getAttribute("language"), "") );
 
     //make sure client browsers don't cache anything
-    setNoCaching(res);
+    setNoCaching(aResponse);
+
+    aResponse.setContentType("text/html");
+    //aResponse.setContentType("text/html; charset="+MirPropertiesConfiguration.instance().getString("Mir.DefaultHTMLCharset"));
 
-    res.setContentType("text/html");
-    //res.setContentType("text/html; charset="+MirPropertiesConfiguration.instance().getString("Mir.DefaultHTMLCharset"));
     try {
-      ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
+      ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(), aRequest, aResponse);
     }
-    catch (ServletModuleUserException e) {
-      handleUserError(req,res,res.getWriter(), e.getMessage());
-    }
-    catch (ServletModuleException e){
-      e.printStackTrace();
-      handleError(req,res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.getMessage());
+    catch (Throwable e) {
+      Throwable cause = ExceptionFunctions.traceCauseException(e);
+
+      if (cause instanceof ServletModuleUserExc)
+        handleUserError(aRequest, aResponse, aResponse.getWriter(), (ServletModuleUserExc) cause);
+      else
+        handleError(aRequest, aResponse, aResponse.getWriter(), cause);
+
     }
-    // timing...
+
     sessionConnectTime = System.currentTimeMillis() - startTime;
     logger.debug("EXECTIME (ServletModuleOpenIndy): " + sessionConnectTime + " ms");
   }
 
-  private void handleUserError(HttpServletRequest req, HttpServletResponse res,
-                               PrintWriter out, String errorString) {
+  private void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse,
+                               PrintWriter out, Throwable anException) {
     try {
-      logger.error(errorString);
+      logger.info("user error: " + anException.getMessage());
       SimpleHash modelRoot = new SimpleHash();
-      modelRoot.put("errorstring", new SimpleScalar(errorString));
+      modelRoot.put("errorstring", new SimpleScalar(anException.getMessage()));
       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
-      HTMLTemplateProcessor.process(res,MirPropertiesConfiguration.instance().getString("Mir.UserErrorTemplate"),
-                                    modelRoot, out, req.getLocale() );
+      HTMLTemplateProcessor.process(aResponse,MirPropertiesConfiguration.instance().getString("Mir.UserErrorTemplate"),
+                                    modelRoot, out, aRequest.getLocale() );
       out.close();
     }
     catch (Exception e) {
@@ -127,16 +128,16 @@ public class OpenMir extends AbstractServlet {
 
   }
 
-  private void handleError(HttpServletRequest req, HttpServletResponse res,PrintWriter out, String errorString) {
+  private void handleError(HttpServletRequest aRequest, HttpServletResponse aResponse,PrintWriter out, Throwable anException) {
 
     try {
-      logger.error(errorString);
+      logger.error("error: " + anException);
       SimpleHash modelRoot = new SimpleHash();
-      modelRoot.put("errorstring", new SimpleScalar(errorString));
+      modelRoot.put("errorstring", new SimpleScalar(anException.getMessage()));
       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(
                                                new GregorianCalendar())));
-      HTMLTemplateProcessor.process(res,MirPropertiesConfiguration.instance().getString("Mir.ErrorTemplate"),
-                                    modelRoot,out, req.getLocale());
+      HTMLTemplateProcessor.process(aResponse,MirPropertiesConfiguration.instance().getString("Mir.ErrorTemplate"),
+                                    modelRoot,out, aRequest.getLocale());
       out.close();
     }
     catch (Exception e) {