made getCategories more like getBooks (need id as well)

This commit is contained in:
John Ladan 2012-03-26 22:03:13 -04:00
parent c44c6fce02
commit e170717cdd
2 changed files with 6 additions and 16 deletions

View File

@ -183,10 +183,7 @@ class categoryBrowser(browserWindow):
def refreshCategories(self):
self.entries = []
cats = db.getCategories()
for c in cats:
self.entries.append({'category':c})
self.entries = db.getCategories()
self.sortByColumn('category')
self.selected = map(lambda x:False, self.entries)

View File

@ -182,17 +182,10 @@ def deleteBook(bookid):
#########################################
# Category related functions
########################################
def categorizeBook(bookid, category):
def categorizeBook(bookid, cat_id):
conn = sqlite3.connect(dbFile)
c = conn.cursor()
if isinstance(category,str):
query = "INSERT OR IGNORE INTO "+categoryTable+" (category) VALUES ("+stringify(cat)+");"
conn.commit()
c.execute(query)
query = "SELECT cat_id FROM "+categoryTable+" WHERE category = "+stringify(category)+";"
c.execute(query)
category = c.fetchone()
query = "INSERT OR IGNORE INTO "+bookCategoryTable+" (id,cat_id) VALUES ("+str(bookid)+", "+str(category)+");"
query = "INSERT OR IGNORE INTO "+bookCategoryTable+" (id,cat_id) VALUES ("+str(bookid)+", "+str(cat_id)+");"
conn.commit()
c.close()
@ -200,11 +193,11 @@ def categorizeBook(bookid, category):
def getCategories():
conn = sqlite3.connect(dbFile)
c = conn.cursor()
query = "SELECT category FROM "+categoryTable+";"
query = "SELECT cat_id, category FROM "+categoryTable+";"
c.execute(query)
cats = []
for category in c:
cats.append(category[0])
for cat_id,cat in c:
cats.append({'id':cat_id, 'category':cat})
c.close()
return cats