diff -r 57932e991854 -r 5275135955c0 kw_result.py --- a/kw_result.py Fri Oct 24 17:51:57 2003 -0400 +++ b/kw_result.py Fri Oct 24 17:55:22 2003 -0400 @@ -20,10 +20,15 @@ fromids = get_keywords(form, 'id') toid = int(form['kw'].value) tokw = db.get_keyword(toid) + remove_them = form.has_key('remove') for id in fromids: fromkw = db.get_keyword(id) - print "Merging '%s' into '%s'.
" % (fromkw, tokw) - db.merge_keywords(id, toid) + if remove_them: + print "Merging '%s' into '%s'.
" % (fromkw, tokw) + db.merge_keywords(id, toid) + else: + print "Adding '%s' into '%s'.
" % (fromkw, tokw) + db.merge_keywords(id, toid) def do_rename(form, db): ids = get_keywords(form, 'id')