From eda3e9ebe00d3aec754d719734e0f6f40d31bace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Armin=20K=C3=B6hler?= <orangeshirt@web.de>
Date: Thu, 2 Jun 2011 13:52:06 +0200
Subject: [PATCH] change log usage

---
 openlp/plugins/bibles/forms/bibleupgradeform.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py
index 3d25d6092..ecfb676f6 100644
--- a/openlp/plugins/bibles/forms/bibleupgradeform.py
+++ b/openlp/plugins/bibles/forms/bibleupgradeform.py
@@ -606,7 +606,7 @@ class BibleUpgradeForm(OpenLPWizard):
                     handler = BSExtract(proxy_server)
                 books = handler.get_books_from_http(meta_data[u'download name'])
                 if not books:
-                    log.exception(u'Upgrading books from %s - download '\
+                    log.error(u'Upgrading books from %s - download '\
                         u'name: "%s" failed' % (
                         meta_data[u'download source'], 
                         meta_data[u'download name']))
@@ -637,7 +637,7 @@ class BibleUpgradeForm(OpenLPWizard):
                 else:
                     language_id = self.newbibles[number].get_language(name)
                 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, 
                         clean_filename(self.newbibles[number].get_name()))
                     del self.newbibles[number]
@@ -661,7 +661,7 @@ class BibleUpgradeForm(OpenLPWizard):
                     book_ref_id = self.newbibles[number].\
                         get_book_ref_id_by_name(book, len(books), language_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' % (
                             meta_data[u'download source'], 
                             meta_data[u'download name']))
@@ -678,7 +678,7 @@ class BibleUpgradeForm(OpenLPWizard):
                     if oldbook:
                         verses = oldbible.get_verses(oldbook[u'id'])
                         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)
                             continue
                         for verse in verses:
@@ -696,7 +696,7 @@ class BibleUpgradeForm(OpenLPWizard):
                 if not language_id:
                     language_id = self.newbibles[number].get_language(name)
                 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, 
                         clean_filename(self.newbibles[number].get_name()))
                     del self.newbibles[number]
@@ -722,7 +722,7 @@ class BibleUpgradeForm(OpenLPWizard):
                         get_book_ref_id_by_name(book[u'name'], len(books), 
                         language_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)
                         delete_database(self.path, 
                             clean_filename(self.newbibles[number].get_name()))
@@ -734,7 +734,7 @@ class BibleUpgradeForm(OpenLPWizard):
                         book_ref_id, book_details[u'testament_id'])
                     verses = oldbible.get_verses(book[u'id'])
                     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'])
                         self.newbibles[number].delete_book(db_book)
                         continue