cleanup / abuse system fix / prepping for a release

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 2a5b7cc..ebb3213 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -39,15 +39,14 @@ import javax.servlet.http.HttpSession;
 import mir.servlet.AbstractServlet;
 import mir.servlet.ServletModuleDispatch;
 import mir.servlet.ServletModuleUserExc;
-import mir.util.ExceptionFunctions;
-import mircoders.global.MirGlobal;
+import mir.util.ExceptionRoutines;
 import mircoders.servlet.ServletModuleOpenIndy;
 
 /**
  *  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.35 2003/05/01 01:42:11 zapata Exp $
+ *  @version $Id: OpenMir.java,v 1.35.2.6 2005/08/21 17:09:18 zapata Exp $
  *
  */
 
@@ -55,15 +54,14 @@ import mircoders.servlet.ServletModuleOpenIndy;
 public class OpenMir extends AbstractServlet {
   public void process(HttpServletRequest aRequest, HttpServletResponse aResponse)
         throws ServletException, IOException {
-                if ((configuration.getString("RootUri") == null) ||
-                        configuration.getString("RootUri").equals("")) {
-                  configuration.setProperty("RootUri", aRequest.getContextPath());
-                }
+    if ((configuration.getString("RootUri") == null) ||
+        configuration.getString("RootUri").equals("")) {
+      configuration.setProperty("RootUri", aRequest.getContextPath());
+    }
 
     long startTime = System.currentTimeMillis();
     long sessionConnectTime=0;
 
-
     HttpSession session = aRequest.getSession();
 
     checkLanguage(session, aRequest);
@@ -74,10 +72,15 @@ public class OpenMir extends AbstractServlet {
     aResponse.setContentType("text/html; charset="+configuration.getString("Mir.DefaultHTMLCharset"));
 
     try {
+      // call appropriate ServletModuleOpenIndy method 
+      // as specified in http request 
+      // example: OpenMir?do=opensession calls the opensession method
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(), aRequest, aResponse);
     }
     catch (Throwable e) {
-      Throwable cause = ExceptionFunctions.traceCauseException(e);
+      logger.warn("Error in open publishing", e);
+
+      Throwable cause = ExceptionRoutines.traceCauseException(e);
 
       if (cause instanceof ServletModuleUserExc)
         handleUserError(aRequest, aResponse, aResponse.getWriter(), (ServletModuleUserExc) cause);
@@ -101,32 +104,5 @@ public class OpenMir extends AbstractServlet {
   public String getServletInfo(){
     return "OpenMir "+configuration.getString("Mir.Version");
   }
-
-
-  /**
-   * Selects the language for the response.
-   *
-   * @param session
-   * @param aRequest
-   */
-  private void checkLanguage(HttpSession aSession, HttpServletRequest aRequest) {
-    String requestLanguage = aRequest.getParameter("language");
-    String sessionLanguage = (String) aSession.getAttribute("language");
-    String acceptLanguage = aRequest.getLocale().getLanguage();
-    String defaultLanguage = configuration.getString("Mir.Login.DefaultLanguage", "en");
-
-    String language = requestLanguage;
-
-    if (language==null)
-      language = sessionLanguage;
-
-    if (language==null)
-      language = acceptLanguage;
-
-    if (language==null)
-      language = defaultLanguage;
-
-    setLanguage(aSession, language);
-  }
 }