From 0e56675596794291d7a37ba0489deb52ce673f32 Mon Sep 17 00:00:00 2001
From: low012 <low012@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sat, 27 Dec 2008 20:09:36 +0000
Subject: [PATCH] *) cleaning up ;-)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5413 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/BlacklistImpExp_p.html | 5 +++--
 htroot/sharedBlacklist_p.html | 2 +-
 htroot/sharedBlacklist_p.java | 5 +----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/htroot/BlacklistImpExp_p.html b/htroot/BlacklistImpExp_p.html
index 2a9e1f74a..97f3058cd 100644
--- a/htroot/BlacklistImpExp_p.html
+++ b/htroot/BlacklistImpExp_p.html
@@ -36,13 +36,14 @@
           <input type="submit" value="Load new blacklist items" />
         </fieldset>
       </form>
-    
-      <!-- blacklist import from file -->	
+
+      <!-- blacklist import from text file -->
       <form action="sharedBlacklist_p.html" method="post" enctype="multipart/form-data">
         <fieldset>
           <legend>plain text file:</legend>
           Upload a regular text file which contains one blacklist entry per line.<br /><br />
           <input type="hidden" name="currentBlacklist" value="#[currentBlacklist]#" />
+          <input type="hidden" name="type" value="plaintext" />
           <input type="file" name="file" />
           <input type="submit" value="Load new blacklist items" />
         </fieldset>
diff --git a/htroot/sharedBlacklist_p.html b/htroot/sharedBlacklist_p.html
index c7ac0033a..f56f6caa8 100644
--- a/htroot/sharedBlacklist_p.html
+++ b/htroot/sharedBlacklist_p.html
@@ -36,7 +36,7 @@
 	  <font color="red">#[error]#</font>
 ::
       <!-- [2] -->
-	  File Error! Wrong Path?
+	  File Error! Unable to fetch data from file.
 ::
       <!-- [3] -->
 	  YaCy-Peer &quot;<span class="settingsValue">#[name]#</span>&quot; not found.
diff --git a/htroot/sharedBlacklist_p.java b/htroot/sharedBlacklist_p.java
index eaf3baf9b..a46ff3aa8 100644
--- a/htroot/sharedBlacklist_p.java
+++ b/htroot/sharedBlacklist_p.java
@@ -48,9 +48,6 @@ import de.anomic.server.serverSwitch;
 import de.anomic.tools.nxTools;
 import de.anomic.yacy.yacySeed;
 import de.anomic.yacy.yacyURL;
-import java.util.LinkedList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class sharedBlacklist_p {
 
@@ -177,7 +174,7 @@ public class sharedBlacklist_p {
                     try {
                         otherBlacklist = nxTools.strings(fileString.getBytes("UTF-8"), "UTF-8");
                     } catch (IOException ex) {
-                        Logger.getLogger(sharedBlacklist_p.class.getName()).log(Level.SEVERE, null, ex);
+                        prop.put("status", STATUS_FILE_ERROR);
                     }
                 }