--- a/do_edit_kw.py	Sun Sep 28 11:39:55 2003 -0400
+++ b/do_edit_kw.py	Tue Oct 07 00:05:17 2003 -0400
@@ -13,33 +13,30 @@
 import cgi
 from htmltmpl import TemplateManager, TemplateProcessor
 import my_db
-import time
 from bkmark import Bookmark
+from webutils import get_keywords
 import os
 
-def main(action, id, kwname, name, merge, mergename):
+def main(action, sel_keywords, keywords):
     tmpl = TemplateManager().prepare("kw_confirm.tmpl")
     tproc = TemplateProcessor()
     tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Confirmation")
     tproc.set("confirm_delete", action == 'delete')
     tproc.set("confirm_merge", action == 'merge')
-    tproc.set("confirm_update", action == 'update')
+    tproc.set("confirm_rename", action == 'rename')
     tproc.set("action", action)
-    tproc.set("id", id)
-    tproc.set("name", kwname)
-    tproc.set("newname", name)
-    tproc.set("mergeid", merge)
-    tproc.set("mergename", mergename)
+    tproc.set("Selected", sel_keywords)
+    tproc.set("Keywords", keywords)
     print tproc.process(tmpl)
 
 if (__name__ == "__main__"):
     form = cgi.FieldStorage()
     db = my_db.connect(os.environ["REMOTE_USER"])
-    id = int(form['id'].value)
+    ids = get_keywords(form, 'kw')
+    keywords = map(lambda e: { 'id': e[0], 'keyword': e[1]},
+   	 db.get_all_keywords())
+    keywords.sort(lambda x, y: cmp(x['keyword'],y['keyword']))
+    sel_keywords = filter(lambda e: e['id'] in ids, keywords)
     action = form['action'].value
-    kwname = db.get_keyword(id)
-    name = form['name'].value
-    merge = int(form['keywords'].value)
-    mergename = db.get_keyword(merge)
-    main(action, id, kwname, name, merge, mergename)
+    main(action, sel_keywords, keywords)