equal
deleted
inserted
replaced
165 SET keyword = %d |
165 SET keyword = %d |
166 WHERE keyword = %d |
166 WHERE keyword = %d |
167 AND userid = %d |
167 AND userid = %d |
168 AND bookmark NOT IN |
168 AND bookmark NOT IN |
169 (SELECT bookmark FROM bookmarks_keywords |
169 (SELECT bookmark FROM bookmarks_keywords |
170 WHERE userid = %d AND keyword = %d )) |
170 WHERE userid = %d AND keyword = %d ) |
171 ; |
171 ; |
172 """ % (into_id, merge_id, self.userid, |
172 """ % (into_id, merge_id, self.userid, |
173 self.userid, merge_id)) |
173 self.userid, into_id)) |
174 self.remove_keyword(merge_id) |
174 self.remove_keyword(merge_id) |
175 def get_all_keywords(self): |
175 def get_all_keywords(self): |
176 """Return a list of doublets [id, keyword, count].""" |
176 """Return a list of doublets [id, keyword, count].""" |
177 self.crs.execute("""SELECT k.id, k.name |
177 self.crs.execute("""SELECT k.id, k.name |
178 FROM keywords k |
178 FROM keywords k |