From dc7c5237fb611a422c31b23fb2cbc732f6222872 Mon Sep 17 00:00:00 2001
From: theli <theli@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Tue, 23 Aug 2005 10:45:44 +0000
Subject: [PATCH] =?UTF-8?q?*)=20Bugfix=20for=20"Geh=C3=A4uselautsprecher"?=
 =?UTF-8?q?=20Bug=20=20=20=20If=20de.anomic.server.logging.ConsoleOutErrHa?=
 =?UTF-8?q?ndler.ignoreCtrlChr=20is=20set=20to=20true=20all=20control=20ch?=
 =?UTF-8?q?ars=20except=20=20=20=20space,tab,newline,=20are=20replaced=20w?=
 =?UTF-8?q?ith=20spaces=20=20=20=20See:=20http://www.yacy-forum.de/viewtop?=
 =?UTF-8?q?ic.php=3Fp=3D5528?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@578 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 .../server/logging/ConsoleOutErrHandler.java      | 15 ++++++++++++++-
 yacy.logging                                      |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/source/de/anomic/server/logging/ConsoleOutErrHandler.java b/source/de/anomic/server/logging/ConsoleOutErrHandler.java
index 81d8a97f9..f3913619e 100644
--- a/source/de/anomic/server/logging/ConsoleOutErrHandler.java
+++ b/source/de/anomic/server/logging/ConsoleOutErrHandler.java
@@ -9,8 +9,9 @@ import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.SimpleFormatter;
 
-public class ConsoleOutErrHandler extends Handler{
+public final class ConsoleOutErrHandler extends Handler{
 
+    private boolean ignoreCtrlChr = false;
     private Level splitLevel = Level.WARNING;
     private final Handler stdOutHandler = new ConsoleOutHandler();
     private final Handler stdErrHandler = new ConsoleHandler();    
@@ -41,6 +42,10 @@ public class ConsoleOutErrHandler extends Handler{
         
         String formatter = manager.getProperty(className + ".formatter");
         setFormatter(makeFormatter(formatter));
+        
+        String ignoreCtrlChrStr = manager.getProperty(className + ".ignoreCtrlChr");
+        this.ignoreCtrlChr = (ignoreCtrlChrStr.equalsIgnoreCase("true"));
+        
     }    
     
     private Level parseLevel(String levelName) {
@@ -83,6 +88,14 @@ public class ConsoleOutErrHandler extends Handler{
     public void publish(LogRecord record) {
         if (!isLoggable(record)) return;
         
+        if (this.ignoreCtrlChr) {
+            String msg = record.getMessage();
+            if (msg != null) {
+                msg = msg.replaceAll("[\u0000-\u0008\u000B\u000C\u000E-\u001F]"," ");
+            }
+            record.setMessage(msg);
+        }
+        
         if (record.getLevel().intValue() >= splitLevel.intValue()) {
             this.stdErrHandler.publish(record);
         } else {
diff --git a/yacy.logging b/yacy.logging
index a035f127b..2ae6b61b8 100644
--- a/yacy.logging
+++ b/yacy.logging
@@ -39,5 +39,7 @@ de.anomic.server.logging.ConsoleOutErrHandler.level = ALL
 de.anomic.server.logging.ConsoleOutErrHandler.levelStdOut = ALL
 de.anomic.server.logging.ConsoleOutErrHandler.levelSplit = WARNING
 de.anomic.server.logging.ConsoleOutErrHandler.levelStdErr = ALL
+de.anomic.server.logging.ConsoleOutErrHandler.ignoreChr7 = FALSE
 de.anomic.server.logging.ConsoleOutErrHandler.formatter=de.anomic.server.logging.serverSimpleLogFormatter
+de.anomic.server.logging.ConsoleOutErrHandler.ignoreCtrlChr=true