--- a/lib/actions/add.py	Sun Dec 28 13:45:41 2008 -0500
+++ b/lib/actions/add.py	Sun Dec 28 13:45:59 2008 -0500
@@ -79,6 +79,17 @@
     tmpl.set('Keywords', keywords)
     print tmpl.process()
 
+def update_bookmark(db, form):
+	bk = get_bk_from_form(form)
+	id = bk.id
+	if (bk.id == -1):
+		id = db.add_bookmark(bk)
+	else:
+		db.update_bookmark(bk)
+	kw = map(db.add_keyword, get_new_kw_from_form(form))
+      	kw += map(db.get_keyword, get_kw_from_form(form))
+	db.update_keywords(id, kw)
+
 def do_it(action, db, prefs, form):
         if form.has_key('id'):
                 id = int(form['id'].value)
@@ -91,9 +102,7 @@
         if step == 'edit':
                 edit(db, prefs, form, id)
 	elif step == 'confirm':
-		bk = get_bk_from_form(form)
-		kw = get_unique_keywords(form, db)
-		db.update_bookmark(bk)
+		update_bookmark(db, form)
                 load_index(db, prefs, form, "result", "Bookmark update")
         elif step == 'cancel' or (action == 'delete' and id == -1):
                 load_index(db, prefs, form, "err", "Operation cancel")