diff -r 7015d65beb3d -r fe0d02f344cb lib/folders.py --- a/lib/folders.py Sun Oct 26 22:26:03 2003 -0500 +++ b/lib/folders.py Sun Oct 26 22:56:49 2003 -0500 @@ -49,14 +49,19 @@ map(lambda e: e[0], bookmarks), selection) keywords = [] + subfolders = [] folders_keywords = selection +exclusion for keyword in selected_keywords: if keyword['id'] not in folders_keywords: keywords.append(keyword) - for child in children: - child['count'] = len(db.select_bookmarks(selection + [child['keyword']])) + for child in children: + if child['keyword'] == keyword['id']: + child['count'] = keyword['count'] + subfolders.append(child) + children.remove(child) + break bookmarks = db.select_bookmarks(selection, exclusion) if len(bookmarks) <> 0: bookmarks = db.get_bookmarks(map(lambda bk: bk[0], bookmarks)) bookmarks = map(lambda bk: bk.dict(), bookmarks) - output(prefs, folder, parents, children, bookmarks, keywords) + output(prefs, folder, parents, subfolders, bookmarks, keywords)