X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2FOpenMir.java;h=8c57e54cf1121c99326fa9124515cc476690584a;hb=ab8a464008f47c9854dde58a8ca253a3702e65d7;hp=56002889824e3c9cc5aaa67a362729cef299d49e;hpb=a697014f29f7a71878e535947556ae5d92db22b3;p=mir.git diff --git a/source/OpenMir.java b/source/OpenMir.java index 56002889..8c57e54c 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,75 +18,60 @@ * 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.global.MirGlobal; import mircoders.servlet.ServletModuleOpenIndy; -import org.apache.struts.util.MessageResources; - -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.29 2003/03/16 13:10:45 zapata Exp $ + * @version $Id: OpenMir.java,v 1.34 2003/04/21 12:42:46 idfx 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 process(HttpServletRequest aRequest, HttpServletResponse aResponse) + throws ServletException, IOException { + if ((configuration.getString("RootUri") == null) || + configuration.getString("RootUri").equals("")) { + configuration.setProperty("RootUri", aRequest.getContextPath()); + } long startTime = System.currentTimeMillis(); long sessionConnectTime=0; - session = aRequest.getSession(); + + HttpSession session = aRequest.getSession(); 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); @@ -98,7 +83,6 @@ public class OpenMir extends AbstractServlet { handleUserError(aRequest, aResponse, aResponse.getWriter(), (ServletModuleUserExc) cause); else handleError(aRequest, aResponse, aResponse.getWriter(), cause); - } sessionConnectTime = System.currentTimeMillis() - startTime; @@ -107,61 +91,42 @@ public class OpenMir extends AbstractServlet { private void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse, PrintWriter out, ServletModuleUserExc anException) { - try { - logger.info("user error: " + anException.getMessage()); - SimpleHash modelRoot = new SimpleHash(); - MessageResources messages = MessageResources.getMessageResources("bundles.open"); - modelRoot.put("errorstring", - new SimpleScalar( - messages.getMessage(getLocale(aRequest), anException.getMessage(), anException.getParameters()) - )); - modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar()))); - HTMLTemplateProcessor.process(aResponse,MirPropertiesConfiguration.instance().getString("ServletModule.OpenIndy.UserErrorTemplate"), - modelRoot, out, getLocale(aRequest)); - out.close(); - } - catch (Exception e) { - logger.error("Error in UserErrorTemplate"); - } + ((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("ServletModule.OpenIndy.ErrorTemplate"), - modelRoot,out, getLocale(aRequest)); - 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"); } - private void checkLanguage(HttpSession session, HttpServletRequest aRequest) { - // a lang parameter always sets the language - String lang = aRequest.getParameter("language"); - if (lang != null) { - logger.info("selected language " + lang + " overrides accept-language"); - setLanguage(session, lang); - setLocale(session, new Locale(lang, "")); - } - // otherwise store language from accept header in session - else if (session.getAttribute("Language") == null) { - logger.info("accept-language is " + aRequest.getLocale().getLanguage()); - setLanguage(session, aRequest.getLocale().getLanguage()); - setLocale(session, aRequest.getLocale()); - } + /** + * 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 = MirGlobal.config().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); } }