equal
deleted
inserted
replaced
16 import time |
16 import time |
17 from bkmark import Bookmark |
17 from bkmark import Bookmark |
18 |
18 |
19 def get_bk_from_form(form): |
19 def get_bk_from_form(form): |
20 bk = Bookmark() |
20 bk = Bookmark() |
|
21 bk.id = int(form['id'].value) |
21 bk.url = form['url'].value |
22 bk.url = form['url'].value |
22 bk.name = form['name'].value |
23 bk.name = form['name'].value |
23 bk.desc = form['desc'].value |
24 bk.desc = form['desc'].value |
24 return bk |
25 return bk |
25 |
26 |
54 form = cgi.FieldStorage() |
55 form = cgi.FieldStorage() |
55 db = my_db.connect() |
56 db = my_db.connect() |
56 bk = get_bk_from_form(form) |
57 bk = get_bk_from_form(form) |
57 kw = get_kw_from_form(form) |
58 kw = get_kw_from_form(form) |
58 newkw = get_new_kw_from_form(form) |
59 newkw = get_new_kw_from_form(form) |
|
60 (ids, kws) = map(list,apply(zip, db.get_all_keywords())) |
59 for elem in newkw: |
61 for elem in newkw: |
60 # try: |
62 if elem in kws: |
61 id = db.add_keyword(elem) |
63 kw.append(ids[kws.index(elem)]) |
62 kw.append(id) |
64 else: |
63 # except: |
65 id = db.add_keyword(elem) |
64 # print '<p class="error">Error inserting keyword "'+elem+'".</p>' |
66 kw.append(id) |
65 id = db.add_bookmark(bk) |
67 if bk.id == -1: |
|
68 id = db.add_bookmark(bk) |
|
69 else: |
|
70 db.update_bookmark(bk) |
|
71 id = bk.id |
66 db.update_keywords(id, kw) |
72 db.update_keywords(id, kw) |
67 kw = map(lambda e: { 'keyword': e[1] }, db.get_keywords(id)[1:]) |
73 kw = map(lambda e: { 'keyword': e[1] }, db.get_keywords(id)[1:]) |
68 main(bk, kw) |
74 main(bk, kw) |