# HG changeset patch # User fabien # Date 1064614713 14400 # Node ID 345ee7421989cfb29e05b9f274e63f32e35946cf # Parent 8c201fa3bdc7448e98f7b89878f374f49675990b [svn r1555] Add multiuser support and more templating. diff -r 8c201fa3bdc7 -r 345ee7421989 TODO --- a/TODO Fri Sep 26 11:31:09 2003 -0400 +++ b/TODO Fri Sep 26 18:18:33 2003 -0400 @@ -4,8 +4,8 @@ * Add Search capabilities. * Add better navigation. * Add default (dynamic?) tree expansion. -* Add multiuser support. * Add XBel Import/Export. * Add support for icons. * Add modified time. * Add access/check time. +* Add user session support. diff -r 8c201fa3bdc7 -r 345ee7421989 add.py --- a/add.py Fri Sep 26 11:31:09 2003 -0400 +++ b/add.py Fri Sep 26 18:18:33 2003 -0400 @@ -15,10 +15,12 @@ import my_db import time from bkmark import Bookmark +import os def main(keywords, title, url): tmpl = TemplateManager().prepare("add_bk.tmpl") tproc = TemplateProcessor() + tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Edit Bookmark") tproc.set('ctitle', title) tproc.set('curl', url) tproc.set('desc', '') @@ -33,7 +35,7 @@ name = form["ctitle"].value if form.has_key("curl"): url = form["curl"].value - db = my_db.connect() + db = my_db.connect(os.environ["REMOTE_USER"]) kw = db.get_all_keywords()[1:] kw.sort(lambda l,r: cmp(l[1],r[1])) kw = map(lambda elem: { diff -r 8c201fa3bdc7 -r 345ee7421989 add_bk.tmpl --- a/add_bk.tmpl Fri Sep 26 11:31:09 2003 -0400 +++ b/add_bk.tmpl Fri Sep 26 18:18:33 2003 -0400 @@ -1,9 +1,7 @@ - - Edit a bookmark - + -

Edit a bookmark

+

@@ -18,7 +16,7 @@
- Mots clés: + Keywords:

- - - Fabien's XBelWeb - + -

Fabien's XBelWeb

-

Confirmation

+

Bookmark diff -r 8c201fa3bdc7 -r 345ee7421989 add_result.py --- a/add_result.py Fri Sep 26 11:31:09 2003 -0400 +++ b/add_result.py Fri Sep 26 18:18:33 2003 -0400 @@ -17,11 +17,12 @@ import my_db from add_confirm import get_bk_from_form, get_new_kw_from_form from index import load_index +import os def add_new_keywords(db, newkw): kw = [0] # Default keyword, so that every bookmarks appears in # the bookmarks_keywords db. - (ids, kws, cnt) = map(list,apply(zip, db.get_all_keywords())) + (ids, kws) = map(list,apply(zip, db.get_all_keywords())) for elem in unique(newkw): if elem in kws: kw.append(ids[kws.index(elem)]) @@ -33,6 +34,7 @@ def main(bk, kw): tmpl = TemplateManager().prepare("add_result.tmpl") tproc = TemplateProcessor() + tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Result") tproc.set("url", bk.url) tproc.set("name", bk.name) tproc.set("added", bk.added) @@ -42,7 +44,7 @@ if (__name__ == "__main__"): form = cgi.FieldStorage() - db = my_db.connect() + db = my_db.connect(os.environ["REMOTE_USER"]) action = form['action'].value if action == 'cancel': load_index(db) diff -r 8c201fa3bdc7 -r 345ee7421989 add_result.tmpl --- a/add_result.tmpl Fri Sep 26 11:31:09 2003 -0400 +++ b/add_result.tmpl Fri Sep 26 18:18:33 2003 -0400 @@ -1,11 +1,8 @@ - - - Fabien's XBelWeb - + -

Fabien's XBelWeb

+

Bookmark successfully added:

@@ -33,4 +30,5 @@ sgml-local-catalogs:nil sgml-local-ecat-files:nil End: +vi: syntax=html --> diff -r 8c201fa3bdc7 -r 345ee7421989 do_edit_kw.py --- a/do_edit_kw.py Fri Sep 26 11:31:09 2003 -0400 +++ b/do_edit_kw.py Fri Sep 26 18:18:33 2003 -0400 @@ -15,18 +15,12 @@ import my_db import time from bkmark import Bookmark +import os -if (__name__ == "__main__"): - form = cgi.FieldStorage() - db = my_db.connect() - id = int(form['id'].value) - action = form['action'].value - kwname = db.get_keyword(id) - name = form['name'].value - merge = int(form['keywords'].value) - mergename = db.get_keyword(merge) +def main(action, id, kwname, merge, mergename): tmpl = TemplateManager().prepare("kw_confirm.tmpl") tproc = TemplateProcessor() + tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Confirmation") tproc.set("confirm_delete", action == 'delete') tproc.set("confirm_merge", action == 'merge') tproc.set("confirm_update", action == 'update') @@ -38,3 +32,14 @@ tproc.set("mergename", mergename) print tproc.process(tmpl) +if (__name__ == "__main__"): + form = cgi.FieldStorage() + db = my_db.connect(os.environ["REMOTE_USER"]) + id = int(form['id'].value) + action = form['action'].value + kwname = db.get_keyword(id) + name = form['name'].value + merge = int(form['keywords'].value) + mergename = db.get_keyword(merge) + main(action, id, kwname, name, merge, mergename) + diff -r 8c201fa3bdc7 -r 345ee7421989 edit.py --- a/edit.py Fri Sep 26 11:31:09 2003 -0400 +++ b/edit.py Fri Sep 26 18:18:33 2003 -0400 @@ -15,10 +15,12 @@ import my_db import time from bkmark import Bookmark +import os def main(keywords, bk): tmpl = TemplateManager().prepare("add_bk.tmpl") tproc = TemplateProcessor() + tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Confirmation") tproc.set('ctitle', bk.name) tproc.set('curl', bk.url) tproc.set('desc', bk.desc) @@ -29,7 +31,7 @@ if (__name__ == "__main__"): form = cgi.FieldStorage() id = int(form["id"].value) - db = my_db.connect() + db = my_db.connect(os.environ["REMOTE_USER"]) bk = db.get_bookmarks([id])[0] kw = db.get_all_keywords()[1:] kw.sort(lambda l,r: cmp(l[1],r[1])) diff -r 8c201fa3bdc7 -r 345ee7421989 edit_kw.py --- a/edit_kw.py Fri Sep 26 11:31:09 2003 -0400 +++ b/edit_kw.py Fri Sep 26 18:18:33 2003 -0400 @@ -14,10 +14,12 @@ from htmltmpl import TemplateManager, TemplateProcessor import my_db import time +import os def main(keyword, id, keywords): tmpl = TemplateManager().prepare("edit_kw.tmpl") tproc = TemplateProcessor() + tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Edit Keyword") tproc.set('keyword', keyword) tproc.set('id', id) tproc.set('Keywords', keywords) @@ -26,7 +28,7 @@ if (__name__ == "__main__"): form = cgi.FieldStorage() id = int(form["id"].value) - db = my_db.connect() + db = my_db.connect(os.environ["REMOTE_USER"]) name = db.get_keyword(id) kw = db.get_all_keywords()[1:] kw.sort(lambda l,r: cmp(l[1],r[1])) diff -r 8c201fa3bdc7 -r 345ee7421989 edit_kw.tmpl --- a/edit_kw.tmpl Fri Sep 26 11:31:09 2003 -0400 +++ b/edit_kw.tmpl Fri Sep 26 18:18:33 2003 -0400 @@ -1,9 +1,7 @@ - - Edit a keyword - + -

Edit a keyword

+