X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2FOpenMir.java;h=1daa016ae715534e0d754e58920fe7b9a831336b;hb=60b6a064d662b992ef3c55487bb7f1e8542d5b19;hp=7b54da24a4e68a7325058e474994d116c7664b3b;hpb=77b8f79d3873d20aa10bb775e03047cd6a9de0bf;p=mir.git

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 7b54da24..1daa016a 100755
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,78 +18,59 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.GregorianCalendar;
-import java.util.Locale;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import mir.config.MirPropertiesConfiguration;
-import mir.misc.HTMLTemplateProcessor;
-import mir.misc.StringUtil;
 import mir.servlet.AbstractServlet;
 import mir.servlet.ServletModuleDispatch;
 import mir.servlet.ServletModuleUserExc;
 import mir.util.ExceptionFunctions;
 import mircoders.servlet.ServletModuleOpenIndy;
-import freemarker.template.SimpleHash;
-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.24 2003/03/08 17:18:19 idfx Exp $
+ *  @version $Id: OpenMir.java,v 1.35.2.2 2003/10/23 14:55:26 rk Exp $
  *
  */
 
 
 public class OpenMir extends AbstractServlet {
-  private static String lang;
-  public HttpSession session;
+  public void process(HttpServletRequest aRequest, HttpServletResponse aResponse)
+        throws ServletException, IOException {
+                if ((configuration.getString("RootUri") == null) ||
+                        configuration.getString("RootUri").equals("")) {
+                  configuration.setProperty("RootUri", aRequest.getContextPath());
+                }
 
-  public void doGet(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletException, IOException {
-    doPost(aRequest,aResponse);
-  }
-
-  public void doPost(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletException, IOException {
     long startTime = System.currentTimeMillis();
     long sessionConnectTime=0;
 
-    session = aRequest.getSession();
 
-    if(session.getAttribute("Language")==null){
-      if (aRequest.getParameter("language")!=null) {
-        setLanguage(session, aRequest.getParameter("language"));
-      }
-      else {
-        setLanguage(session, getAcceptLanguage(aRequest));
-      }
-    }
+    HttpSession session = aRequest.getSession();
 
-    if (session.getAttribute("language")!=null)
-      setLocale(session, new Locale((String) session.getAttribute("language"), "") );
+    checkLanguage(session, aRequest);
 
     //make sure client browsers don't cache anything
     setNoCaching(aResponse);
 
-    aResponse.setContentType("text/html");
-    //aResponse.setContentType("text/html; charset="+MirPropertiesConfiguration.instance().getString("Mir.DefaultHTMLCharset"));
+    aResponse.setContentType("text/html; charset="+configuration.getString("Mir.DefaultHTMLCharset"));
 
     try {
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(), aRequest, aResponse);
@@ -101,7 +82,6 @@ public class OpenMir extends AbstractServlet {
         handleUserError(aRequest, aResponse, aResponse.getWriter(), (ServletModuleUserExc) cause);
       else
         handleError(aRequest, aResponse, aResponse.getWriter(), cause);
-
     }
 
     sessionConnectTime = System.currentTimeMillis() - startTime;
@@ -109,41 +89,16 @@ public class OpenMir extends AbstractServlet {
   }
 
   private void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse,
-                               PrintWriter out, Throwable anException) {
-    try {
-      logger.info("user error: " + anException.getMessage());
-      SimpleHash modelRoot = new SimpleHash();
-      modelRoot.put("errorstring", new SimpleScalar(anException.getMessage()));
-      modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
-      HTMLTemplateProcessor.process(aResponse,MirPropertiesConfiguration.instance().getString("Mir.OpenIndy.UserErrorTemplate"),
-                                    modelRoot, out, aRequest.getLocale() );
-      out.close();
-    }
-    catch (Exception e) {
-      logger.error("Error in UserErrorTemplate");
-    }
+                               PrintWriter out, ServletModuleUserExc anException) {
+    ((ServletModuleOpenIndy) ServletModuleOpenIndy.getInstance()).handleUserError(aRequest, aResponse, out, anException);
   }
 
   private void handleError(HttpServletRequest aRequest, HttpServletResponse aResponse,PrintWriter out, Throwable anException) {
-    try {
-      logger.error("error: " + anException);
-      SimpleHash modelRoot = new SimpleHash();
-      modelRoot.put("errorstring", new SimpleScalar(anException.getMessage()));
-      modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(
-                                               new GregorianCalendar())));
-      HTMLTemplateProcessor.process(aResponse,MirPropertiesConfiguration.instance().getString("Mir.OpenIndy.ErrorTemplate"),
-                                    modelRoot,out, aRequest.getLocale());
-      out.close();
-    }
-    catch (Exception e) {
-      logger.error("Error in ErrorTemplate");
-    }
-
+    ((ServletModuleOpenIndy) ServletModuleOpenIndy.getInstance()).handleError(aRequest, aResponse, out, anException);
   }
 
   public String getServletInfo(){
     return "OpenMir "+configuration.getString("Mir.Version");
   }
-
 }