equal
deleted
inserted
replaced
11 |
11 |
12 # import cgitb; cgitb.enable() |
12 # import cgitb; cgitb.enable() |
13 import cgi |
13 import cgi |
14 import my_db |
14 import my_db |
15 from os import environ |
15 from os import environ |
16 from webutils import load_index, get_keywords |
16 from webutils import load_index |
|
17 from keywords import get_keywords |
17 |
18 |
18 def do_merge(form, db): |
19 def do_merge(form, db): |
19 fromids = get_keywords(form, 'id') |
20 fromids = get_keywords(form, 'id') |
20 toid = int(form['kw'].value) |
21 toid = int(form['kw'].value) |
21 tokw = db.get_keyword(toid) |
22 tokw = db.get_keyword(toid) |
40 db.remove_keyword(id) |
41 db.remove_keyword(id) |
41 |
42 |
42 if (__name__ == "__main__"): |
43 if (__name__ == "__main__"): |
43 form = cgi.FieldStorage() |
44 form = cgi.FieldStorage() |
44 db = my_db.connect(environ["REMOTE_USER"]) |
45 db = my_db.connect(environ["REMOTE_USER"]) |
|
46 prefs = db.get_preferences() |
45 action = form['action'].value |
47 action = form['action'].value |
46 if action == 'merge': |
48 if action == 'merge': |
47 do_merge(form, db) |
49 do_merge(form, db) |
48 elif action == 'rename': |
50 elif action == 'rename': |
49 do_rename(form, db) |
51 do_rename(form, db) |
50 elif action == 'delete': |
52 elif action == 'delete': |
51 do_delete(form, db) |
53 do_delete(form, db) |
52 load_index(db) |
54 load_index(db, prefs) |