equal
deleted
inserted
replaced
31 else: |
31 else: |
32 kw = [] |
32 kw = [] |
33 kw = map(int, kw) |
33 kw = map(int, kw) |
34 return kw |
34 return kw |
35 |
35 |
|
36 def get_new_kw_from_form(form): |
|
37 if form.has_key('newkw'): |
|
38 return map(lambda e: e.strip(), |
|
39 form['newkw'].value.split(',')) |
|
40 else: |
|
41 return [] |
|
42 |
36 def main(bk, kw): |
43 def main(bk, kw): |
37 tmpl = TemplateManager().prepare("add_result.tmpl") |
44 tmpl = TemplateManager().prepare("add_result.tmpl") |
38 tproc = TemplateProcessor() |
45 tproc = TemplateProcessor() |
39 tproc.set("url", bk.url) |
46 tproc.set("url", bk.url) |
40 tproc.set("name", bk.name) |
47 tproc.set("name", bk.name) |
46 if (__name__ == "__main__"): |
53 if (__name__ == "__main__"): |
47 form = cgi.FieldStorage() |
54 form = cgi.FieldStorage() |
48 db = my_db.connect() |
55 db = my_db.connect() |
49 bk = get_bk_from_form(form) |
56 bk = get_bk_from_form(form) |
50 kw = get_kw_from_form(form) |
57 kw = get_kw_from_form(form) |
|
58 newkw = get_new_kw_from_form(form) |
|
59 for elem in newkw: |
|
60 # try: |
|
61 id = db.add_keyword(elem) |
|
62 kw.append(id) |
|
63 # except: |
|
64 # print '<p class="error">Error inserting keyword "'+elem+'".</p>' |
51 id = db.add_bookmark(bk) |
65 id = db.add_bookmark(bk) |
52 db.update_keywords(id, kw) |
66 db.update_keywords(id, kw) |
53 kw = map(lambda e: { 'keyword': e[1] }, db.get_keywords(id)[1:]) |
67 kw = map(lambda e: { 'keyword': e[1] }, db.get_keywords(id)[1:]) |
54 main(bk, kw) |
68 main(bk, kw) |