X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2FOpenMir.java;h=2c6f09200f7eb997b9600edeb30e4f786d05772f;hb=a300626210e27544f288406c52113e715b37b036;hp=1b10a98d26643e6002efdc19cc0097014233376f;hpb=d7ff9b48279d6b8f94089cf36fde6e8290fb631d;p=mir.git

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 1b10a98d..2c6f0920 100755
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * 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.
+ */
+
 import java.io.*;
 import java.util.*;
 import java.net.*;
@@ -25,7 +56,7 @@ import mircoders.storage.*;
 
 
 public class OpenMir extends AbstractServlet {
-  
+
   //private static boolean                confed=false;
   private static String lang;
   public HttpSession session;
@@ -41,26 +72,38 @@ public class OpenMir extends AbstractServlet {
     long            startTime = (new java.util.Date()).getTime();
     long            sessionConnectTime=0;
 
-    // get the configration
+    // get the configration - this could conflict if 2 mirs are in the
+    // VM maybe? to be checked. -mh
+    // -- they would have different servlet contexts, so the following is
+    // no problem (br1)
     if(getServletContext().getAttribute("mir.confed") == null) {
       getConfig(req);
     }
     session = req.getSession();
 
     if(session.getAttribute("Language")==null){
-      setLanguage(session,getAcceptLanguage(req));
+      if (req.getParameter("language")!=null) {
+        setLanguage(session, req.getParameter("language"));
+      }
+      else {
+        setLanguage(session, getAcceptLanguage(req));
+      }
     }
 
-    res.setContentType("text/html");
+    if (req.getParameter("language")!=null)
+      setLocale(session, new Locale(req.getParameter("language"), "") );
+
+    res.setContentType("text/html; charset="
+                      +MirConfig.getProp("Mir.DefaultEncoding"));
     try {
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
     }
     catch (ServletModuleUserException e) {
-      handleUserError(req,res,res.getWriter(), e.getMsg());
+      handleUserError(req,res,res.getWriter(), e.getMessage());
     }
     catch (ServletModuleException e){
       e.printStackTrace();
-      handleError(req,res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.toString());
+      handleError(req,res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.getMessage());
     }
     // timing...
     sessionConnectTime = new java.util.Date().getTime() - startTime;
@@ -68,18 +111,18 @@ public class OpenMir extends AbstractServlet {
   }
 
   private void handleUserError(HttpServletRequest req, HttpServletResponse res,
-															 PrintWriter out, String errorString) {
+                               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, req.getLocale() );
+                                    modelRoot, out, req.getLocale() );
       out.close();
     }
     catch (Exception e) {
-      System.err.println("Fehler in UserErrorTemplate");
+      System.err.println("Error in UserErrorTemplate");
     }
 
   }
@@ -91,18 +134,20 @@ public class OpenMir extends AbstractServlet {
       SimpleHash modelRoot = new SimpleHash();
       modelRoot.put("errorstring", new SimpleScalar(errorString));
       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(
-																							 new GregorianCalendar())));
+                                               new GregorianCalendar())));
       HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.ErrorTemplate"),
-																		modelRoot,out, req.getLocale());
+                                    modelRoot,out, req.getLocale());
       out.close();
     }
     catch (Exception e) {
-      System.err.println("Fehler in ErrorTemplate");
+      System.err.println("Error in ErrorTemplate");
     }
 
   }
 
-  public String getServletInfo(){ return "OpenIndy 1.0 rev01"; }
+  public String getServletInfo(){
+    return "OpenMir "+MirConfig.getProp("Mir.Version");
+  }
 
 }