From 04e41a392f74e41053c1ff4eae2ac702029d092a Mon Sep 17 00:00:00 2001
From: low012 <low012@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Wed, 29 Oct 2008 22:49:44 +0000
Subject: [PATCH] *) fixed bug where RegExes were not deleted and even added to
 the list a second time when the user tried to edit them

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5308 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/BlacklistCleaner_p.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/htroot/BlacklistCleaner_p.java b/htroot/BlacklistCleaner_p.java
index 7dcccb7ce..1eec11270 100644
--- a/htroot/BlacklistCleaner_p.java
+++ b/htroot/BlacklistCleaner_p.java
@@ -41,6 +41,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
@@ -264,13 +265,24 @@ public class BlacklistCleaner_p {
         // load blacklist data from file
         final ArrayList<String> list = listManager.getListArray(new File(listManager.listsPath, blacklistToUse));
         
+        boolean listChanged = false;
+        
         // delete the old entry from file
         String s;
         for (int i=0; i<entries.length; i++) {
             s = entries[i];
+            
             if (list != null){
-                while (list.contains(s)) {
+                
+                // getting rid of escape characters which make it impossible to
+                // properly use contains()
+                if (s.contains("\\\\")) {
+                    s = s.replaceAll(Pattern.quote("\\\\"), Matcher.quoteReplacement("\\"));
+                }
+                
+                if (list.contains(s)) {
                     list.remove(s);
+                    listChanged = true;
                 }
             }
             
@@ -289,7 +301,7 @@ public class BlacklistCleaner_p {
                 }                
             }    
         }
-        if (list != null){
+        if (listChanged){
             listManager.writeList(new File(listManager.listsPath, blacklistToUse), list.toArray(new String[list.size()]));
         }
         return entries.length;