--- a/do_edit_kw.py Fri Sep 26 11:31:09 2003 -0400
+++ b/do_edit_kw.py Fri Sep 26 18:18:33 2003 -0400
@@ -15,18 +15,12 @@
import my_db
import time
from bkmark import Bookmark
+import os
-if (__name__ == "__main__"):
- form = cgi.FieldStorage()
- db = my_db.connect()
- id = int(form['id'].value)
- action = form['action'].value
- kwname = db.get_keyword(id)
- name = form['name'].value
- merge = int(form['keywords'].value)
- mergename = db.get_keyword(merge)
+def main(action, id, kwname, merge, mergename):
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')
@@ -38,3 +32,14 @@
tproc.set("mergename", mergename)
print tproc.process(tmpl)
+if (__name__ == "__main__"):
+ form = cgi.FieldStorage()
+ db = my_db.connect(os.environ["REMOTE_USER"])
+ id = int(form['id'].value)
+ 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)
+