kw_result.py
branchxbelweb
changeset 53 e80160a19653
parent 50 5275135955c0
--- a/kw_result.py	Sun Oct 26 22:56:49 2003 -0500
+++ b/kw_result.py	Mon Oct 27 02:26:39 2003 -0500
@@ -18,17 +18,20 @@
 
 def do_merge(form, db):
 	fromids = get_keywords(form, 'id')
-	toid = int(form['kw'].value)	
-	tokw = db.get_keyword(toid)
+	toids = get_keywords(form, 'kw')
 	remove_them = form.has_key('remove')
+	if remove_them:
+		lastid = toids.pop()
 	for id in fromids:
 		fromkw = db.get_keyword(id)
+		for dest in toids:
+			tokw = db.get_keyword(dest)
+			print "<em>Adding '%s' into '%s'.</em><br/>" % (fromkw, tokw)
+			db.add_keywords(id, dest) 
 		if remove_them:
+			tokw = db.get_keyword(lastid)
 			print "<em>Merging '%s' into '%s'.</em><br/>" % (fromkw, tokw)
-			db.merge_keywords(id, toid)
-		else:
-			print "<em>Adding '%s' into '%s'.</em><br/>" % (fromkw, tokw)
-			db.merge_keywords(id, toid) 
+			db.merge_keywords(id, lastid)
 
 def do_rename(form, db):
 	ids = get_keywords(form, 'id')