X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2FOpenMir.java;h=ebb321358d713a90e2a1268c6e83d11a853c01c3;hb=6b6b6215ebe066b81f1fa6b0c71a532ca7b4fc3f;hp=ca0377ca9ec252e1b9ab3aa8c180d71aa539cd19;hpb=d96e301d3d5b64037f4bd72c12e6ac0f7de69ec7;p=mir.git diff --git a/source/OpenMir.java b/source/OpenMir.java index ca0377ca..ebb32135 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,93 +18,74 @@ * 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.ServletModuleExc; import mir.servlet.ServletModuleUserExc; -import mir.servlet.ServletModuleFailure; -import mir.util.ExceptionFunctions; - +import mir.util.ExceptionRoutines; 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.22 2003/03/06 05:40:38 zapata Exp $ + * @version $Id: OpenMir.java,v 1.35.2.6 2005/08/21 17:09:18 zapata Exp $ * */ public class OpenMir extends AbstractServlet { - private static String lang; - public HttpSession session; - - public void doGet(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletException, IOException { - doPost(aRequest,aResponse); - } + 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 doPost(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletException, IOException { long startTime = System.currentTimeMillis(); long sessionConnectTime=0; - session = aRequest.getSession(); + HttpSession session = aRequest.getSession(); - if(session.getAttribute("Language")==null){ - if (aRequest.getParameter("language")!=null) { - setLanguage(session, aRequest.getParameter("language")); - } - else { - setLanguage(session, getAcceptLanguage(aRequest)); - } - } - - 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 { + // 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); else handleError(aRequest, aResponse, aResponse.getWriter(), cause); - } sessionConnectTime = System.currentTimeMillis() - startTime; @@ -112,43 +93,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.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.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"); } - }