--- 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 "<body>"
+ #print "<ol>"
for child in bms.folders:
if isinstance(child, bookmark.Bookmark):
import_bookmark(db, child)
else:
import_folder(db, child)
+ #print "</ol>"
def import_folder(db, folder, keywords = []):
global _keywords
kw = folder.title.strip().encode('utf-8')
+ #print "<li>" + 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 "<ol>"
for child in folder.children:
if isinstance(child, bookmark.Bookmark):
import_bookmark(db, child, keywords+[id])
else:
import_folder(db, child, keywords+[id])
+ #print "</ol></li>"
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 "<li>add bookmark '" + bk.name + "' [%d]" % (id,)
+ #print " with keywords '" + ','.join(map(str,keywords)) + "'</li>"
+ db.update_keywords(id, keywords)