From cb91cc5c7cce7dee5de64a5ecbbe54c7bc3098a9 Mon Sep 17 00:00:00 2001
From: apfelmaennchen <apfelmaennchen@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Fri, 25 Jan 2008 19:23:15 +0000
Subject: [PATCH] fixed import Netscape Bookmarks

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4402 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/Bookmarks.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java
index 4283c045b..8856f85c6 100644
--- a/htroot/Bookmarks.java
+++ b/htroot/Bookmarks.java
@@ -67,6 +67,7 @@ import de.anomic.plasma.plasmaSwitchboard;
 import de.anomic.server.serverDate;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
+import de.anomic.server.logging.serverLog;
 import de.anomic.yacy.yacyCore;
 import de.anomic.yacy.yacyNewsPool;
 import de.anomic.yacy.yacyNewsRecord;
@@ -141,7 +142,7 @@ public class Bookmarks {
     				prop.put("mode", "2");
     			}else if(mode.equals("importxml")){
     				prop.put("mode", "3");
-    			}else if(mode.equals("exportXBEL")){
+    			}else if(mode.equals("manage")){
     				prop.put("mode", "4");
     			}
     		}else if(post.containsKey("add")){ //add an Entry
@@ -230,7 +231,7 @@ public class Bookmarks {
                         }
                     }
                 }
-    		}else if(post.containsKey("bookmarksfile")){
+    		} else if(post.containsKey("htmlfile")){
     			boolean isPublic=false;
     			if(((String) post.get("public")).equals("public")){
     				isPublic=true;
@@ -239,10 +240,12 @@ public class Bookmarks {
     			if(tags.equals("")){
     				tags="unsorted";
     			}
+    			serverLog.logInfo("BOOKMARKS", "I try to import bookmarks from HTML-file");
     			try {
-    				File file=new File((String)post.get("bookmarksfile"));
-    				switchboard.bookmarksDB.importFromBookmarks(new yacyURL(file) , post.get("bookmarksfile$file"), tags, isPublic);
+    				File file=new File((String)post.get("htmlfile"));    			
+    				switchboard.bookmarksDB.importFromBookmarks(new yacyURL(file) , post.get("htmlfile$file"), tags, isPublic);
     			} catch (MalformedURLException e) {}
+    			serverLog.logInfo("BOOKMARKS", "success!!");
     		}else if(post.containsKey("xmlfile")){
     			boolean isPublic=false;
     			if(((String) post.get("public")).equals("public")){