# HG changeset patch # User fabien@tzone.org # Date 1230427419 18000 # Node ID 31271426f879f127bd20c4f3c65edb1fb0710985 # Parent 6b31934e5b2e1cc02c2fb0233e621438245f6c09 First change to use a common entry point. diff -r 6b31934e5b2e -r 31271426f879 .htaccess --- a/.htaccess Mon Aug 23 23:31:38 2004 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -AddHandler cgi-script py -Options +ExecCGI -DirectoryIndex index.py -AuthType Basic -AuthName Fabien@TZoNE -AuthUserFile /home/fabien/public_html/xbelweb/.htpasswd - - require valid-user - diff -r 6b31934e5b2e -r 31271426f879 add.py --- a/add.py Mon Aug 23 23:31:38 2004 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -#!/usr/bin/python - -import sys -import traceback -sys.path.insert(0, "/home/fabien/lib/python") -sys.path.insert(0, "./lib") -sys.stderr = sys.stdout - -print "Content-type: text/html; charset=iso-8859-1;" -print - -# import cgitb; cgitb.enable() -import cgi -from templates import Template -import my_db -import time -from bkmark import Bookmark -import os - -def main(keywords, title, url, prefs): - tmpl = Template("add_bk.tmpl", prefs) - tmpl.set('ctitle', title) - tmpl.set('curl', url) - tmpl.set('desc', '') - tmpl.set('bkid', -1) - tmpl.set('Keywords', keywords) - print tmpl.process() - -if (__name__ == "__main__"): - form = cgi.FieldStorage() - name = url = "" - if form.has_key("ctitle"): - name = form["ctitle"].value - if form.has_key("curl"): - url = form["curl"].value - 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: { - 'id' : elem[0], - 'keyword' : elem[1], - 'checked' : 0 }, kw) - main(kw, name, url, db.get_preferences()) diff -r 6b31934e5b2e -r 31271426f879 add_bk.tmpl --- a/add_bk.tmpl Mon Aug 23 23:31:38 2004 -0400 +++ b/add_bk.tmpl Sat Dec 27 20:23:39 2008 -0500 @@ -2,7 +2,8 @@

's Edit Bookmark

-
+ +
- - - + + +
diff -r 6b31934e5b2e -r 31271426f879 add_confirm.py --- a/add_confirm.py Mon Aug 23 23:31:38 2004 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -#!/usr/bin/python - -import sys -import traceback - -if __name__ == "__main__": - sys.path.insert(0, "/home/fabien/lib/python") - sys.path.insert(0, "./lib") - sys.stderr = sys.stdout - - print "Content-type: text/html; charset=iso-8859-1;" - print - -# import cgitb; cgitb.enable() -import cgi -import my_db -import time -from bkmark import Bookmark -from webutils import load_index -from templates import Template -from utils import unique -import os - -def get_bk_from_form(form): - bk = Bookmark() - bk.id = int(form['id'].value) - bk.url = form['url'].value - if form.has_key('name'): - bk.name = form['name'].value - if form.has_key('desc'): - bk.desc = form['desc'].value - return bk - -def get_kw_from_form(form): - kw = form.getvalue("kw") - if not isinstance(kw, type([])): - if kw: - kw = [kw] - else: - kw = [] - kw = map(int, kw) - return kw - -def get_new_kw_from_form(form, sep =','): - if form.has_key('newkw'): - kw= map(lambda e: e.strip(), - form['newkw'].value.split(',')) - return filter(lambda x: x != '', kw) - else: - return [] - -def get_unique_keywords(form, db): - kw = get_kw_from_form(form) - kw = map(db.get_keyword, kw) - kw = kw + get_new_kw_from_form(form) - kw = unique(kw) - return kw - -def main(action, bk, kw, prefs): - tmpl = Template("add_confirm.tmpl", prefs) - tmpl.set("confirm_delete", action == 'delete') - tmpl.set("confirm_update", action == 'update') - tmpl.set("action", action) - tmpl.set("id", bk.id) - tmpl.set("name", bk.name) - tmpl.set("url", bk.url) - tmpl.set("Keywords", map(lambda x: {'keyword': x }, kw)) - print tmpl.process() - -if (__name__ == "__main__"): - form = cgi.FieldStorage() - db = my_db.connect(os.environ["REMOTE_USER"]) - prefs = db.get_preferences() - id = int(form['id'].value) - action = form['action'].value - if action == 'cancel' or (action == 'delete' and id == -1): - load_index(db, prefs) - else: - if action == 'update': - bk = get_bk_from_form(form) - kw = get_unique_keywords(form, db) - else: - bk = db.get_bookmarks([id])[0] - (ids, kw) = apply(zip,db.get_keywords([id])) - kw = kw[1:] - main(action, bk, kw, prefs) - diff -r 6b31934e5b2e -r 31271426f879 add_confirm.tmpl --- a/add_confirm.tmpl Mon Aug 23 23:31:38 2004 -0400 +++ b/add_confirm.tmpl Sat Dec 27 20:23:39 2008 -0500 @@ -3,12 +3,14 @@

's Confirmation

-
+
Bookmark + + @@ -18,15 +20,8 @@ ;

- - - - - - - + + diff -r 6b31934e5b2e -r 31271426f879 do_import.py --- a/do_import.py Mon Aug 23 23:31:38 2004 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -#!/usr/bin/python - -import sys -import traceback -sys.path.insert(0, "/home/fabien/lib/python") -sys.path.insert(0, "./lib") -sys.stderr = sys.stdout - -print "Content-type: text/html; charset=iso-8859-1;" -print - -# import cgitb; cgitb.enable() -import cgi -import time -from utils import unique -import my_db -from webutils import load_index -import os -from xbelimp import parse_xbel, import_bookmarks - -if (__name__ == "__main__"): - form = cgi.FieldStorage() - db = my_db.connect(os.environ["REMOTE_USER"]) - prefs = db.get_preferences() - file = form["xbelfile"].file - bms = parse_xbel(file) - import_bookmarks(db, bms) - load_index(db, prefs) diff -r 6b31934e5b2e -r 31271426f879 dynamic.tmpl --- a/dynamic.tmpl Mon Aug 23 23:31:38 2004 -0400 +++ b/dynamic.tmpl Sat Dec 27 20:23:39 2008 -0500 @@ -4,8 +4,7 @@

's XBelWeb

Total bookmarks:

-
- +
Keywords:

@@ -35,7 +34,7 @@

- Switch to folder view + Switch to folder view diff -r 6b31934e5b2e -r 31271426f879 edit.py --- a/edit.py Mon Aug 23 23:31:38 2004 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -#!/usr/bin/python - -import sys -import traceback -sys.path.insert(0, "/home/fabien/lib/python") -sys.path.insert(0, "./lib") -sys.stderr = sys.stdout - -print "Content-type: text/html; charset=iso-8859-1;" -print - -# import cgitb; cgitb.enable() -import cgi -from templates import Template -import my_db -import time -from bkmark import Bookmark -import os - -def main(keywords, bk, prefs): - tmpl = Template("add_bk.tmpl", prefs) - tmpl.set('ctitle', bk.name) - tmpl.set('curl', bk.url) - tmpl.set('desc', bk.desc) - tmpl.set('bkid', bk.id) - tmpl.set('Keywords', keywords) - print tmpl.process() - -if (__name__ == "__main__"): - form = cgi.FieldStorage() - id = int(form["id"].value) - 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])) - (ids, kws) = apply(zip,db.get_keywords([id])) - kw = map(lambda elem: { - 'id' : elem[0], - 'keyword' : elem[1], - 'selected' : elem[0] in ids }, kw) - main(kw, bk, db.get_preferences()) diff -r 6b31934e5b2e -r 31271426f879 edit_bk.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/edit_bk.tmpl Sat Dec 27 20:23:39 2008 -0500 @@ -0,0 +1,38 @@ + + + +

's Edit Bookmark

+
+
+ + +
+
+
+ +
+
+ Keywords: +
+ + + +
+ + + diff -r 6b31934e5b2e -r 31271426f879 folders.tmpl --- a/folders.tmpl Mon Aug 23 23:31:38 2004 -0400 +++ b/folders.tmpl Sat Dec 27 20:23:39 2008 -0500 @@ -7,7 +7,7 @@

Parents: : - + Top ()

@@ -15,20 +15,20 @@

Main Folder (/)

-
+
-
+