equal
deleted
inserted
replaced
9 print "Content-type: text/html; charset=iso-8859-1;" |
9 print "Content-type: text/html; charset=iso-8859-1;" |
10 print |
10 print |
11 |
11 |
12 # import cgitb; cgitb.enable() |
12 # import cgitb; cgitb.enable() |
13 import cgi |
13 import cgi |
14 from htmltmpl import TemplateManager, TemplateProcessor |
|
15 import my_db |
14 import my_db |
16 from os import environ |
15 from os import environ |
17 from urlparse import urljoin |
|
18 from index import load_index |
16 from index import load_index |
19 |
17 |
20 def do_merge(form, db): |
18 def do_merge(form, db): |
21 fromid = int(form['id'].value) |
19 fromid = int(form['id'].value) |
22 toid = int(form['merge'].value) |
20 toid = int(form['merge'].value) |
31 id = int(form['id'].value) |
29 id = int(form['id'].value) |
32 db.remove_keyword(id) |
30 db.remove_keyword(id) |
33 |
31 |
34 if (__name__ == "__main__"): |
32 if (__name__ == "__main__"): |
35 form = cgi.FieldStorage() |
33 form = cgi.FieldStorage() |
36 db = my_db.connect() |
34 db = my_db.connect(environ["REMOTE_USER"]) |
37 action = form['action'].value |
35 action = form['action'].value |
38 if action == 'merge': |
36 if action == 'merge': |
39 do_merge(form, db) |
37 do_merge(form, db) |
40 elif action == 'update': |
38 elif action == 'update': |
41 do_update(form, db) |
39 do_update(form, db) |