# HG changeset patch # User fabien # Date 1064647050 14400 # Node ID 17b0cd2745301c40234ebb14ced20067cd1a4f3f # Parent 777bcb36f7be6273995953a014a3118bab548ecc [svn r1560] Add import functionality and correct a bug in the merge_kw. diff -r 777bcb36f7be -r 17b0cd274530 TODO --- a/TODO Sat Sep 27 01:44:43 2003 -0400 +++ b/TODO Sat Sep 27 03:17:30 2003 -0400 @@ -4,8 +4,10 @@ * Add Search capabilities. * Add better navigation. * Add default (dynamic?) tree expansion. -* Add XBel Import/Export. +* Add XBel Export. * Add support for icons. * Add modified time. * Add access/check time. * Add user session support. +* Better unicode handling. +* "add keyword to selection" function. diff -r 777bcb36f7be -r 17b0cd274530 do_edit_kw.py --- a/do_edit_kw.py Sat Sep 27 01:44:43 2003 -0400 +++ b/do_edit_kw.py Sat Sep 27 03:17:30 2003 -0400 @@ -17,7 +17,7 @@ from bkmark import Bookmark import os -def main(action, id, kwname, merge, mergename): +def main(action, id, kwname, name, merge, mergename): tmpl = TemplateManager().prepare("kw_confirm.tmpl") tproc = TemplateProcessor() tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Confirmation") diff -r 777bcb36f7be -r 17b0cd274530 do_import.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/do_import.py Sat Sep 27 03:17:30 2003 -0400 @@ -0,0 +1,28 @@ +#!/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 htmltmpl import TemplateManager, TemplateProcessor +import time +from utils import unique +import my_db +from index 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"]) + file = form["xbelfile"].file + bms = parse_xbel(file) + import_bookmarks(db, bms) + load_index(db) diff -r 777bcb36f7be -r 17b0cd274530 import.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/import.py Sat Sep 27 03:17:30 2003 -0400 @@ -0,0 +1,24 @@ +#!/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 htmltmpl import TemplateManager, TemplateProcessor +import os + +def main(): + tmpl = TemplateManager().prepare("import.tmpl") + tproc = TemplateProcessor() + tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Import File") + print tproc.process(tmpl) + +if (__name__ == "__main__"): + main() diff -r 777bcb36f7be -r 17b0cd274530 import.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/import.tmpl Sat Sep 27 03:17:30 2003 -0400 @@ -0,0 +1,31 @@ + + + + +

+ XBEL file to import: + + +

Retour à la page principale

+ + + diff -r 777bcb36f7be -r 17b0cd274530 import.tmplc Binary file import.tmplc has changed diff -r 777bcb36f7be -r 17b0cd274530 index.tmpl --- a/index.tmpl Sat Sep 27 01:44:43 2003 -0400 +++ b/index.tmpl Sat Sep 27 03:17:30 2003 -0400 @@ -28,7 +28,8 @@

Add new bookmark.

Add new bookmark.
+ Import a XBEL file.

Here the Quick Mark Link. Put it on your bookmarks (using <Right-Mouse diff -r 777bcb36f7be -r 17b0cd274530 lib/create_db.sql --- a/lib/create_db.sql Sat Sep 27 01:44:43 2003 -0400 +++ b/lib/create_db.sql Sat Sep 27 03:17:30 2003 -0400 @@ -14,9 +14,9 @@ CREATE TABLE bookmarks ( id int NOT NULL, userid int NOT NULL, - url varchar(255) DEFAULT '' NOT NULL, - name varchar(255) DEFAULT '' NOT NULL, - ldesc varchar(255) DEFAULT '' NOT NULL, + url varchar(1023) DEFAULT '' NOT NULL, + name varchar(1023) DEFAULT '' NOT NULL, + ldesc varchar(1023) DEFAULT '' NOT NULL, added date DEFAULT '1998-01-01' NOT NULL, PRIMARY KEY (id, userid) ); @@ -29,7 +29,7 @@ CREATE TABLE keywords ( id int DEFAULT '0' NOT NULL, userid int DEFAULT '0' NOT NULL, - name varchar(30) DEFAULT '' NOT NULL, + name varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (id, userid) ); diff -r 777bcb36f7be -r 17b0cd274530 lib/my_db.py --- a/lib/my_db.py Sat Sep 27 01:44:43 2003 -0400 +++ b/lib/my_db.py Sat Sep 27 03:17:30 2003 -0400 @@ -167,10 +167,10 @@ AND userid = %d AND bookmark NOT IN (SELECT bookmark FROM bookmarks_keywords - WHERE userid = %d AND keyword = %d )) + WHERE userid = %d AND keyword = %d ) ; """ % (into_id, merge_id, self.userid, - self.userid, merge_id)) + self.userid, into_id)) self.remove_keyword(merge_id) def get_all_keywords(self): """Return a list of doublets [id, keyword, count].""" diff -r 777bcb36f7be -r 17b0cd274530 lib/xbelimp.py --- a/lib/xbelimp.py Sat Sep 27 01:44:43 2003 -0400 +++ b/lib/xbelimp.py Sat Sep 27 03:17:30 2003 -0400 @@ -4,7 +4,7 @@ from xml.sax import saxexts import bkmark -def import_xbel(xbelfile): +def parse_xbel(xbelfile): xbel_handler = XBELHandler() p=saxexts.XMLParserFactory.make_parser("xml.sax.drivers.drv_xmlproc") p.setDocumentHandler( xbel_handler ) @@ -18,27 +18,34 @@ _keywords = {} for elem in db.get_all_keywords(): _keywords[elem[1]] = elem[0] + #print "" + #print "

" for child in bms.folders: if isinstance(child, bookmark.Bookmark): import_bookmark(db, child) else: import_folder(db, child) + #print "

" def import_folder(db, folder, keywords = []): global _keywords kw = folder.title.strip().encode('utf-8') + #print "" + kw if _keywords.has_key(kw): id = _keywords[kw] + #print " [%d]" % (id,) else: - #id = db.add_keyword(kw) - print "add keyword '" + kw + "'" - id = len(_keywords)+100 + id = db.add_keyword(kw) + id = len(_keywords) + #print " [%d] (added)" % (id,) _keywords[kw] = id + #print "" for child in folder.children: if isinstance(child, bookmark.Bookmark): import_bookmark(db, child, keywords+[id]) else: import_folder(db, child, keywords+[id]) + #print "" def import_bookmark(db, bookmark, keywords = []): bk = bkmark.Bookmark() @@ -46,8 +53,8 @@ bk.url = bookmark.href.encode('utf-8') if hasattr(bookmark, 'desc'): bk.desc = bookmark.desc.encode('utf-8') - print "add bookmark '" + bk.name + "'", - # id = db.add_bookmark(bk) - print " with keywords '" + ','.join(map(str,keywords)) + "'" - # db.update_keywords(id, keywords) + id = db.add_bookmark(bk) + #print "add bookmark '" + bk.name + "' [%d]" % (id,) + #print " with keywords '" + ','.join(map(str,keywords)) + "'" + db.update_keywords(id, keywords)