From 39361112bca87d19917c735283cbe50f0f080499 Mon Sep 17 00:00:00 2001 From: gombos Date: Thu, 1 Nov 2012 12:12:28 +0000 Subject: [PATCH] some small bugfixes --- cli/util.py | 5 ++++- cli/worblehat.py | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cli/util.py b/cli/util.py index ebe4089..79ae965 100644 --- a/cli/util.py +++ b/cli/util.py @@ -18,7 +18,10 @@ def execute_query(cursor, query, bindings): cursor.execute(query, bindings) def fetchone(cursor): - return map(value_from_db, cursor.fetchone()) + a = cursor.fetchone() + if a != None: + return map(value_from_db, a) + return None def fetchall(cursor): return map(lambda row: map(value_from_db, row), diff --git a/cli/worblehat.py b/cli/worblehat.py index 1285a14..a9afb5b 100755 --- a/cli/worblehat.py +++ b/cli/worblehat.py @@ -235,7 +235,7 @@ def list_books(connection): #print fetchall_dict(c) for i in xrange(c.rowcount): book = fetchone_dict(c) - write('%-13s %-10s %-60s %s' % + write('%-13s %-10s %-60s %s\n' % (book['isbn'], str_or_empty(book['id']), cut_str(book['title'], 60), book['persons'])) @@ -244,7 +244,7 @@ def list_persons(connection): c.execute(q_list_persons) for i in xrange(c.rowcount): person = fetchone_dict(c) - write('%-5s %-30s %d books' % (person['id'], + write('%-5s %-30s %d books\n' % (person['id'], person['firstname']+' '+person['lastname'], person['num_books'])) @@ -253,7 +253,7 @@ def list_categories(connection): c.execute(q_list_categories) for i in xrange(c.rowcount): cat = fetchone_dict(c) - write('%-15s %-30s %d books' % (cat['id'], cat['name'], cat['num_books'])) + write('%-15s %-30s %d books\n' % (cat['id'], cat['name'], cat['num_books'])) def list_cmd(connection, what): funs = { 'book': list_books,