--- a/kw_result.py	Sun Sep 28 11:39:55 2003 -0400
+++ b/kw_result.py	Tue Oct 07 00:05:17 2003 -0400
@@ -13,21 +13,31 @@
 import cgi
 import my_db
 from os import environ
-from index import load_index
+from webutils import load_index, get_keywords
 
 def do_merge(form, db):
-	fromid = int(form['id'].value)	
-	toid = int(form['merge'].value)	
-	db.merge_keywords(fromid, toid)
+	fromids = get_keywords(form, 'id')
+	toid = int(form['kw'].value)	
+	tokw = db.get_keyword(toid)
+	for id in fromids:
+		fromkw = db.get_keyword(id)
+		print "<em>Merging '%s' into '%s'.</em><br/>" % (fromkw, tokw)
+		db.merge_keywords(id, toid)
 
-def do_update(form, db):
-	id = int(form['id'].value)
-	newname = form['name'].value
-	db.update_keyword(id, newname)
+def do_rename(form, db):
+	ids = get_keywords(form, 'id')
+	for id in ids:
+		oldname = db.get_keyword(id)
+		newname = form['name%d' % id].value
+		print "<em>Renaming '%s' into '%s'.</em><br/>" % (oldname, newname)
+		db.update_keyword(id, newname)
  
 def do_delete(form, db):
-	id = int(form['id'].value)
-	db.remove_keyword(id)
+	ids = get_keywords(form, 'id')
+	for id in ids:
+		kw = db.get_keyword(id)
+		print "<em>Removing '%s'.</em><br/>" % kw
+		db.remove_keyword(id)
 
 if (__name__ == "__main__"):
     form = cgi.FieldStorage()
@@ -35,8 +45,8 @@
     action = form['action'].value
     if action == 'merge':
 	do_merge(form, db)
-    elif action == 'update':
-	do_update(form, db)
+    elif action == 'rename':
+	do_rename(form, db)
     elif action == 'delete':
     	do_delete(form, db)
     load_index(db)