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 |
14 from htmltmpl import TemplateManager |
|
15 from webutils import get_template_processor |
15 import time |
16 import time |
16 from utils import unique |
17 from utils import unique |
17 import my_db |
18 import my_db |
18 from add_confirm import get_bk_from_form, get_new_kw_from_form |
19 from add_confirm import get_bk_from_form, get_new_kw_from_form |
19 from index import load_index |
20 from index import load_index |
29 else: |
30 else: |
30 id = db.add_keyword(elem) |
31 id = db.add_keyword(elem) |
31 kw.append(id) |
32 kw.append(id) |
32 return kw |
33 return kw |
33 |
34 |
34 def main(bk, kw): |
35 def main(bk, kw, prefs): |
35 tmpl = TemplateManager().prepare("add_result.tmpl") |
36 tmpl = TemplateManager().prepare("add_result.tmpl") |
36 tproc = TemplateProcessor() |
37 tproc = get_template_processor(prefs) |
37 tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Result") |
|
38 tproc.set("url", bk.url) |
38 tproc.set("url", bk.url) |
39 tproc.set("name", bk.name) |
39 tproc.set("name", bk.name) |
40 tproc.set("added", bk.added) |
40 tproc.set("added", bk.added) |
41 tproc.set("desc", bk.desc) |
41 tproc.set("desc", bk.desc) |
42 tproc.set("Keywords", kw) |
42 tproc.set("Keywords", kw) |
60 else: |
60 else: |
61 db.update_bookmark(bk) |
61 db.update_bookmark(bk) |
62 id = bk.id |
62 id = bk.id |
63 db.update_keywords(id, kw) |
63 db.update_keywords(id, kw) |
64 kw = map(lambda e: { 'keyword': e[1] }, db.get_keywords([id])[1:]) |
64 kw = map(lambda e: { 'keyword': e[1] }, db.get_keywords([id])[1:]) |
65 main(bk, kw) |
65 main(bk, kw, db.get_preferences()) |