--- a/lib/my_db.py	Wed Sep 24 16:44:09 2003 -0400
+++ b/lib/my_db.py	Wed Sep 24 17:19:52 2003 -0400
@@ -123,8 +123,12 @@
 			""" % (into_id, merge_id))
 		self.remove_keyword(merge_id)
 	def get_all_keywords(self):
-		"""Return a list of pair-elements [id, keyword]."""
-		self.crs.execute("SELECT id, name FROM keywords ORDER BY id;")
+		"""Return a list of triplets [id, keyword, count]."""
+		self.crs.execute("""SELECT k.id, k.name, COUNT(bk.keyword)
+			FROM keywords k, bookmarks_keywords bk
+			WHERE k.id = bk.keyword
+			GROUP BY k.id, k.name
+			ORDER BY k.id;""")
 		return self.crs.fetchall()
 	def select_bookmarks(self, has_kw = [0], except_kw = []):
 	        """