# HG changeset patch # User fabien # Date 1064432927 14400 # Node ID 896b7c6de6272f8676ab139613a3c8c8a2105a8f # Parent c763c420cbfcf5956615452985392082e2de81c2 [svn r1543] Ajout des fonctions d'�ditions. diff -r c763c420cbfc -r 896b7c6de627 add.py --- a/add.py Wed Sep 24 14:29:18 2003 -0400 +++ b/add.py Wed Sep 24 15:48:47 2003 -0400 @@ -21,7 +21,9 @@ tproc = TemplateProcessor() tproc.set('ctitle', title) tproc.set('curl', url) - tproc.set('Keywords', keywords); + tproc.set('desc', '') + tproc.set('bkid', -1) + tproc.set('Keywords', keywords) print tproc.process(tmpl) if (__name__ == "__main__"): @@ -34,5 +36,8 @@ db = my_db.connect() kw = db.get_all_keywords()[1:] kw.sort(lambda l,r: cmp(l[1],r[1])) - kw = map(lambda elem: { 'id' : elem[0], 'keyword' : elem[1] }, kw) + kw = map(lambda elem: { + 'id' : elem[0], + 'keyword' : elem[1], + 'checked' : 0 }, kw) main(kw, name, url) diff -r c763c420cbfc -r 896b7c6de627 add.tmpl --- a/add.tmpl Wed Sep 24 14:29:18 2003 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ - - - - - Bookmarker 3 - - -

Bookmarker 3

-

Welcome to bookmarker 3!

-
- - - diff -r c763c420cbfc -r 896b7c6de627 add_bk.tmpl --- a/add_bk.tmpl Wed Sep 24 14:29:18 2003 -0400 +++ b/add_bk.tmpl Wed Sep 24 15:48:47 2003 -0400 @@ -6,19 +6,22 @@

Add a bookmark

+
+ value=""/>

+ value=""/>

- +
Mots clés: diff -r c763c420cbfc -r 896b7c6de627 add_result.py --- a/add_result.py Wed Sep 24 14:29:18 2003 -0400 +++ b/add_result.py Wed Sep 24 15:48:47 2003 -0400 @@ -18,6 +18,7 @@ def get_bk_from_form(form): bk = Bookmark() + bk.id = int(form['id'].value) bk.url = form['url'].value bk.name = form['name'].value bk.desc = form['desc'].value @@ -56,13 +57,18 @@ bk = get_bk_from_form(form) kw = get_kw_from_form(form) newkw = get_new_kw_from_form(form) + (ids, kws) = map(list,apply(zip, db.get_all_keywords())) for elem in newkw: -# try: - id = db.add_keyword(elem) - kw.append(id) -# except: -# print '

Error inserting keyword "'+elem+'".

' - id = db.add_bookmark(bk) + if elem in kws: + kw.append(ids[kws.index(elem)]) + else: + id = db.add_keyword(elem) + kw.append(id) + if bk.id == -1: + id = db.add_bookmark(bk) + else: + db.update_bookmark(bk) + id = bk.id db.update_keywords(id, kw) kw = map(lambda e: { 'keyword': e[1] }, db.get_keywords(id)[1:]) main(bk, kw) diff -r c763c420cbfc -r 896b7c6de627 add_result.tmpl --- a/add_result.tmpl Wed Sep 24 14:29:18 2003 -0400 +++ b/add_result.tmpl Wed Sep 24 15:48:47 2003 -0400 @@ -2,16 +2,17 @@ - Bookmarker 3 + Fabien's XBelWeb -

Bookmarker 3

-

Welcome to bookmarker 3!

+

Fabien's XBelWeb

Bookmark successfully added:

Keywords:

+
+

Retour à la page principale