--- a/lib/xbelimp.py	Sat Sep 27 01:32:50 2003 -0400
+++ b/lib/xbelimp.py	Sat Sep 27 01:44:43 2003 -0400
@@ -18,17 +18,20 @@
 	_keywords = {}
 	for elem in db.get_all_keywords():
 		_keywords[elem[1]] = elem[0]
-	for folder in bms.folders:
-		import_folder(db,folder)
+	for child in bms.folders:
+		if isinstance(child, bookmark.Bookmark):
+			import_bookmark(db, child)
+		else:
+			import_folder(db, child)
 
 def import_folder(db, folder, keywords = []):
 	global _keywords
-	kw = folder.title.strip()
+	kw = folder.title.strip().encode('utf-8')
 	if _keywords.has_key(kw):
 		id = _keywords[kw]
 	else:
 		#id = db.add_keyword(kw)
-		print "add keyword '" +  kw + "'"
+		print "add keyword '" +  kw + "'" 
 		id = len(_keywords)+100
 		_keywords[kw] = id
 	for child in folder.children:
@@ -37,17 +40,14 @@
 		else:
 			import_folder(db, child, keywords+[id])
 
-def import_bookmark(db, bookmark, keywords):
+def import_bookmark(db, bookmark, keywords = []):
 	bk = bkmark.Bookmark()
-	bk.name = bookmark.title
-	bk.url = bookmark.href
-	if has_attr(bookmark, 'desc'):
-		bk.desc = bookmark.desc
-	try:
-		print "add bookmark '" + bk.name + "'"
-		# id = db.add_bookmark(bk)
-		print "with keywords '" + join(',',keywords)[-1] + "'"
-		# db.update_keywords(id, keywords)
-	except:
-		pass
+	bk.name = bookmark.title.encode('utf-8')
+	bk.url = bookmark.href.encode('utf-8')
+	if hasattr(bookmark, 'desc'):
+		bk.desc = bookmark.desc.encode('utf-8')
+	print "add bookmark '" + bk.name + "'",
+	# id = db.add_bookmark(bk)
+	print " with keywords '" + ','.join(map(str,keywords)) + "'"
+	# db.update_keywords(id, keywords)