15 import time |
15 import time |
16 from utils import unique |
16 from utils import unique |
17 import my_db |
17 import my_db |
18 from add_confirm import get_bk_from_form, get_new_kw_from_form |
18 from add_confirm import get_bk_from_form, get_new_kw_from_form |
19 from index import load_index |
19 from index import load_index |
|
20 import os |
20 |
21 |
21 def add_new_keywords(db, newkw): |
22 def add_new_keywords(db, newkw): |
22 kw = [0] # Default keyword, so that every bookmarks appears in |
23 kw = [0] # Default keyword, so that every bookmarks appears in |
23 # the bookmarks_keywords db. |
24 # the bookmarks_keywords db. |
24 (ids, kws, cnt) = map(list,apply(zip, db.get_all_keywords())) |
25 (ids, kws) = map(list,apply(zip, db.get_all_keywords())) |
25 for elem in unique(newkw): |
26 for elem in unique(newkw): |
26 if elem in kws: |
27 if elem in kws: |
27 kw.append(ids[kws.index(elem)]) |
28 kw.append(ids[kws.index(elem)]) |
28 else: |
29 else: |
29 id = db.add_keyword(elem) |
30 id = db.add_keyword(elem) |
31 return kw |
32 return kw |
32 |
33 |
33 def main(bk, kw): |
34 def main(bk, kw): |
34 tmpl = TemplateManager().prepare("add_result.tmpl") |
35 tmpl = TemplateManager().prepare("add_result.tmpl") |
35 tproc = TemplateProcessor() |
36 tproc = TemplateProcessor() |
|
37 tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Result") |
36 tproc.set("url", bk.url) |
38 tproc.set("url", bk.url) |
37 tproc.set("name", bk.name) |
39 tproc.set("name", bk.name) |
38 tproc.set("added", bk.added) |
40 tproc.set("added", bk.added) |
39 tproc.set("desc", bk.desc) |
41 tproc.set("desc", bk.desc) |
40 tproc.set("Keywords", kw) |
42 tproc.set("Keywords", kw) |
41 print tproc.process(tmpl) |
43 print tproc.process(tmpl) |
42 |
44 |
43 if (__name__ == "__main__"): |
45 if (__name__ == "__main__"): |
44 form = cgi.FieldStorage() |
46 form = cgi.FieldStorage() |
45 db = my_db.connect() |
47 db = my_db.connect(os.environ["REMOTE_USER"]) |
46 action = form['action'].value |
48 action = form['action'].value |
47 if action == 'cancel': |
49 if action == 'cancel': |
48 load_index(db) |
50 load_index(db) |
49 elif action == 'delete': |
51 elif action == 'delete': |
50 db.remove_bookmark(int(form['id'].value)) |
52 db.remove_bookmark(int(form['id'].value)) |