projects / mir.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b99a2f)
some tiny fixes
authorzapata <zapata>
Sat, 22 Jan 2005 23:27:36 +0000 (23:27 +0000)
committerzapata <zapata>
Sat, 22 Jan 2005 23:27:36 +0000 (23:27 +0000)
etc/open/error.template patch | blob | history
etc/producer/startpage.template patch | blob | history
source/OpenMir.java patch | blob | history
source/mir/log/Logger.java patch | blob | history
source/mir/log/LoggerEngine.java patch | blob | history
source/mir/log/LoggerWrapper.java patch | blob | history
source/mir/log/log4j/LoggerImpl.java patch | blob | history
source/mircoders/abuse/FilterEngine.java patch | blob | history

diff --git a/etc/open/error.template b/etc/open/error.template
index b4e01c3..78b90f7 100755 (executable)
--- a/etc/open/error.template
+++ b/etc/open/error.template
@@ -20,7 +20,7 @@
   <tr>
     <td>
       <p>
-      <p align="center"><font color="red">${errorstring}</font>
+      <p align="center"><font color="red">${data.errorstring}</font>
       <p>
     </td>
   </tr>
diff --git a/etc/producer/startpage.template b/etc/producer/startpage.template
index afdd74b..2242e27 100755 (executable)
--- 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
-</comment>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+</comment><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}"> 
diff --git a/source/OpenMir.java b/source/OpenMir.java
index dfdbe4d..7a06b08 100755 (executable)
--- 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 1f959be..af3a171 100755 (executable)
--- 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 2b66599..ebea701 100755 (executable)
--- 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 9f4deba..749d9d2 100755 (executable)
--- 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 c6af2db..9941499 100755 (executable)
--- 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 79f63d8..7a61c85 100755 (executable)
--- a/source/mircoders/abuse/FilterEngine.java
+++ b/source/mircoders/abuse/FilterEngine.java
@@ -340,18 +340,22 @@ public class FilterEngine {
     filterGroups.clear();\r
     idToFilterGroup.clear();\r
 \r
-    Iterator i = new EntityIteratorAdapter("", "priority asc", 100, model, "filterGroup");\r
+    try {\r
+      Iterator i = new EntityIteratorAdapter("", "priority asc", 100, model, "filterGroup");\r
+      while (i.hasNext()) {\r
+        EntityAdapter entityAdapter = (EntityAdapter) i.next();\r
+        List filters = new ArrayList();\r
+        Iterator j = (Iterator) entityAdapter.get("to_filters");\r
+        while (j.hasNext()) {\r
+          filters.add(((EntityAdapter) j.next()).getEntity());\r
+        }\r
 \r
-    while (i.hasNext()) {\r
-      EntityAdapter entityAdapter = (EntityAdapter) i.next();\r
-      List filters = new ArrayList();\r
-      Iterator j = (Iterator) entityAdapter.get("to_filters");\r
-      while (j.hasNext()) {\r
-        filters.add(((EntityAdapter) j.next()).getEntity());\r
+        FilterGroup filterGroup = new FilterGroup(entityAdapter.getEntity(), filters);\r
+        introduceFilterGroup(filterGroup);\r
       }\r
-\r
-      FilterGroup filterGroup = new FilterGroup(entityAdapter.getEntity(), filters);\r
-      introduceFilterGroup(filterGroup);\r
+    }\r
+    catch (Throwable e) {\r
+      logger.error("Can't load filters: " + e.getMessage());\r
     }\r
   }\r
 \r
The Mir CMS