equal
deleted
inserted
replaced
121 SET keyword = %d |
121 SET keyword = %d |
122 WHERE keyword = %d; |
122 WHERE keyword = %d; |
123 """ % (into_id, merge_id)) |
123 """ % (into_id, merge_id)) |
124 self.remove_keyword(merge_id) |
124 self.remove_keyword(merge_id) |
125 def get_all_keywords(self): |
125 def get_all_keywords(self): |
126 """Return a list of pair-elements [id, keyword].""" |
126 """Return a list of triplets [id, keyword, count].""" |
127 self.crs.execute("SELECT id, name FROM keywords ORDER BY id;") |
127 self.crs.execute("""SELECT k.id, k.name, COUNT(bk.keyword) |
|
128 FROM keywords k, bookmarks_keywords bk |
|
129 WHERE k.id = bk.keyword |
|
130 GROUP BY k.id, k.name |
|
131 ORDER BY k.id;""") |
128 return self.crs.fetchall() |
132 return self.crs.fetchall() |
129 def select_bookmarks(self, has_kw = [0], except_kw = []): |
133 def select_bookmarks(self, has_kw = [0], except_kw = []): |
130 """ |
134 """ |
131 Return a list of id bookmarks who has /has_kw/ set but not /except_kw/. |
135 Return a list of id bookmarks who has /has_kw/ set but not /except_kw/. |
132 """ |
136 """ |