diff -r 8c201fa3bdc7 -r 345ee7421989 add_confirm.py --- a/add_confirm.py Fri Sep 26 11:31:09 2003 -0400 +++ b/add_confirm.py Fri Sep 26 18:18:33 2003 -0400 @@ -19,6 +19,7 @@ from bkmark import Bookmark from index import load_index from utils import unique +import os def get_bk_from_form(form): bk = Bookmark() @@ -52,11 +53,13 @@ kw = get_kw_from_form(form) kw = map(db.get_keyword, kw) kw = kw + get_new_kw_from_form(form) - return unique(kw) + kw = unique(kw) + return kw def main(action, bk, kw): tmpl = TemplateManager().prepare("add_confirm.tmpl") tproc = TemplateProcessor() + tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Confirmation") tproc.set("confirm_delete", action == 'delete') tproc.set("confirm_update", action == 'update') tproc.set("action", action) @@ -68,7 +71,7 @@ if (__name__ == "__main__"): form = cgi.FieldStorage() - db = my_db.connect() + db = my_db.connect(os.environ["REMOTE_USER"]) id = int(form['id'].value) action = form['action'].value if action == 'cancel' or (action == 'delete' and id == -1): @@ -80,5 +83,6 @@ else: bk = db.get_bookmarks([id])[0] (ids, kw) = apply(zip,db.get_keywords(id)) - main(action, bk, kw[1:]) + kw = kw[1:] + main(action, bk, kw)