raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

change log usage

Browse Source
This commit is contained in:
Armin Köhler 2011-06-02 13:52:06 +02:00
parent 877ea4e13d
commit eda3e9ebe0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openlp/plugins/bibles/forms/bibleupgradeform.py
View File

@ -606,7 +606,7 @@ class BibleUpgradeForm(OpenLPWizard):
handler = BSExtract(proxy_server) handler = BSExtract(proxy_server)
books = handler.get_books_from_http(meta_data[u'download name']) books = handler.get_books_from_http(meta_data[u'download name'])
if not books: if not books:
log.exception(u'Upgrading books from %s - download '\ log.error(u'Upgrading books from %s - download '\
u'name: "%s" failed' % ( u'name: "%s" failed' % (
meta_data[u'download source'], meta_data[u'download source'],
meta_data[u'download name'])) meta_data[u'download name']))
@ -637,7 +637,7 @@ class BibleUpgradeForm(OpenLPWizard):
else: else:
language_id = self.newbibles[number].get_language(name) language_id = self.newbibles[number].get_language(name)
if not language_id: if not language_id:
log.exception(u'Upgrading from "%s" failed' % filename[0]) log.error(u'Upgrading from "%s" failed' % filename[0])
delete_database(self.path, delete_database(self.path,
clean_filename(self.newbibles[number].get_name())) clean_filename(self.newbibles[number].get_name()))
del self.newbibles[number] del self.newbibles[number]
@ -661,7 +661,7 @@ class BibleUpgradeForm(OpenLPWizard):
book_ref_id = self.newbibles[number].\ book_ref_id = self.newbibles[number].\
get_book_ref_id_by_name(book, len(books), language_id) get_book_ref_id_by_name(book, len(books), language_id)
if not book_ref_id: if not book_ref_id:
log.exception(u'Upgrading books from %s - download '\ log.error(u'Upgrading books from %s - download '\
u'name: "%s" aborted by user' % ( u'name: "%s" aborted by user' % (
meta_data[u'download source'], meta_data[u'download source'],
meta_data[u'download name'])) meta_data[u'download name']))
@ -678,7 +678,7 @@ class BibleUpgradeForm(OpenLPWizard):
if oldbook: if oldbook:
verses = oldbible.get_verses(oldbook[u'id']) verses = oldbible.get_verses(oldbook[u'id'])
if not verses: if not verses:
log.exception(u'No verses found to import for book ' log.warn(u'No verses found to import for book '
u'"%s"', book) u'"%s"', book)
continue continue
for verse in verses: for verse in verses:
@ -696,7 +696,7 @@ class BibleUpgradeForm(OpenLPWizard):
if not language_id: if not language_id:
language_id = self.newbibles[number].get_language(name) language_id = self.newbibles[number].get_language(name)
if not language_id: if not language_id:
log.exception(u'Upgrading books from "%s" failed' % name) log.error(u'Upgrading books from "%s" failed' % name)
delete_database(self.path, delete_database(self.path,
clean_filename(self.newbibles[number].get_name())) clean_filename(self.newbibles[number].get_name()))
del self.newbibles[number] del self.newbibles[number]
@ -722,7 +722,7 @@ class BibleUpgradeForm(OpenLPWizard):
get_book_ref_id_by_name(book[u'name'], len(books), get_book_ref_id_by_name(book[u'name'], len(books),
language_id) language_id)
if not book_ref_id: if not book_ref_id:
log.exception(u'Upgrading books from %s " '\ log.error(u'Upgrading books from %s " '\
'failed - aborted by user' % name) 'failed - aborted by user' % name)
delete_database(self.path, delete_database(self.path,
clean_filename(self.newbibles[number].get_name())) clean_filename(self.newbibles[number].get_name()))
@ -734,7 +734,7 @@ class BibleUpgradeForm(OpenLPWizard):
book_ref_id, book_details[u'testament_id']) book_ref_id, book_details[u'testament_id'])
verses = oldbible.get_verses(book[u'id']) verses = oldbible.get_verses(book[u'id'])
if not verses: if not verses:
log.exception(u'No verses found to import for book ' log.error(u'No verses found to import for book '
u'"%s"', book[u'name']) u'"%s"', book[u'name'])
self.newbibles[number].delete_book(db_book) self.newbibles[number].delete_book(db_book)
continue continue