From 83e53f3d9420662e4e5bcab2dc80a24c4aa899a9 Mon Sep 17 00:00:00 2001 From: zapata Date: Sat, 22 Jan 2005 23:27:36 +0000 Subject: [PATCH] some tiny fixes --- etc/open/error.template | 2 +- etc/producer/startpage.template | 3 +-- source/OpenMir.java | 4 +++- source/mir/log/Logger.java | 1 + source/mir/log/LoggerEngine.java | 4 ++++ source/mir/log/LoggerWrapper.java | 4 ++++ source/mir/log/log4j/LoggerImpl.java | 5 +++++ source/mircoders/abuse/FilterEngine.java | 24 ++++++++++++++---------- 8 files changed, 33 insertions(+), 14 deletions(-) diff --git a/etc/open/error.template b/etc/open/error.template index b4e01c30..78b90f7b 100755 --- a/etc/open/error.template +++ b/etc/open/error.template @@ -20,7 +20,7 @@

-

${errorstring} +

${data.errorstring}

diff --git a/etc/producer/startpage.template b/etc/producer/startpage.template index afdd74b4..2242e27d 100755 --- a/etc/producer/startpage.template +++ b/etc/producer/startpage.template @@ -3,8 +3,7 @@ - virtually no CSS functions - all paths relative to / - no complicated freemarker code - - + diff --git a/source/OpenMir.java b/source/OpenMir.java index dfdbe4dc..7a06b083 100755 --- a/source/OpenMir.java +++ b/source/OpenMir.java @@ -46,7 +46,7 @@ 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.2.3 2004/11/21 22:07:13 zapata Exp $ + * @version $Id: OpenMir.java,v 1.35.2.4 2005/01/22 23:27:36 zapata Exp $ * */ @@ -75,6 +75,8 @@ public class OpenMir extends AbstractServlet { ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(), aRequest, aResponse); } catch (Throwable e) { + logger.warn("Error in open publishing", e); + Throwable cause = ExceptionFunctions.traceCauseException(e); if (cause instanceof ServletModuleUserExc) diff --git a/source/mir/log/Logger.java b/source/mir/log/Logger.java index 1f959be9..af3a1718 100755 --- a/source/mir/log/Logger.java +++ b/source/mir/log/Logger.java @@ -36,6 +36,7 @@ public interface Logger { public void debug(Object o, String s); public void info(Object o, String s); public void warn(Object o, String s); + public void warn(Object o, String s, Throwable anException); public void error(Object o, String s); public void error(Object o, String s, Throwable anException); public void fatal(Object o, String s); diff --git a/source/mir/log/LoggerEngine.java b/source/mir/log/LoggerEngine.java index 2b665997..ebea701d 100755 --- a/source/mir/log/LoggerEngine.java +++ b/source/mir/log/LoggerEngine.java @@ -67,6 +67,10 @@ public class LoggerEngine { loggerInstance.warn(o, s); } + public static void warn(Object o, String s, Throwable anException) { + loggerInstance.warn(o, s, anException); + } + public static void error(Object o, String s) { loggerInstance.error(o, s); } diff --git a/source/mir/log/LoggerWrapper.java b/source/mir/log/LoggerWrapper.java index 9f4deba3..749d9d23 100755 --- a/source/mir/log/LoggerWrapper.java +++ b/source/mir/log/LoggerWrapper.java @@ -56,6 +56,10 @@ public class LoggerWrapper { LoggerEngine.warn(object, aMessage); }; + public void warn(String aMessage, Throwable anException) { + LoggerEngine.warn(object, aMessage, anException); + }; + public void error( String aMessage ) { LoggerEngine.error(object, aMessage); }; diff --git a/source/mir/log/log4j/LoggerImpl.java b/source/mir/log/log4j/LoggerImpl.java index c6af2db5..99414998 100755 --- a/source/mir/log/log4j/LoggerImpl.java +++ b/source/mir/log/log4j/LoggerImpl.java @@ -62,6 +62,11 @@ public class LoggerImpl implements mir.log.Logger { } /** {@inheritDoc} */ + public void warn(Object o, String s, Throwable anException) { + this.getLogger(o).warn(s, anException); + } + + /** {@inheritDoc} */ public void error(Object o, String s) { this.getLogger(o).error(s); } diff --git a/source/mircoders/abuse/FilterEngine.java b/source/mircoders/abuse/FilterEngine.java index 79f63d82..7a61c852 100755 --- a/source/mircoders/abuse/FilterEngine.java +++ b/source/mircoders/abuse/FilterEngine.java @@ -340,18 +340,22 @@ public class FilterEngine { filterGroups.clear(); idToFilterGroup.clear(); - Iterator i = new EntityIteratorAdapter("", "priority asc", 100, model, "filterGroup"); + try { + Iterator i = new EntityIteratorAdapter("", "priority asc", 100, model, "filterGroup"); + while (i.hasNext()) { + EntityAdapter entityAdapter = (EntityAdapter) i.next(); + List filters = new ArrayList(); + Iterator j = (Iterator) entityAdapter.get("to_filters"); + while (j.hasNext()) { + filters.add(((EntityAdapter) j.next()).getEntity()); + } - while (i.hasNext()) { - EntityAdapter entityAdapter = (EntityAdapter) i.next(); - List filters = new ArrayList(); - Iterator j = (Iterator) entityAdapter.get("to_filters"); - while (j.hasNext()) { - filters.add(((EntityAdapter) j.next()).getEntity()); + FilterGroup filterGroup = new FilterGroup(entityAdapter.getEntity(), filters); + introduceFilterGroup(filterGroup); } - - FilterGroup filterGroup = new FilterGroup(entityAdapter.getEntity(), filters); - introduceFilterGroup(filterGroup); + } + catch (Throwable e) { + logger.error("Can't load filters: " + e.getMessage()); } } -- 2.11.0