From 48446a8312eb08a2317a91d47be00d09b0ac8747 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Wed, 26 May 2010 17:01:45 +0100
Subject: [PATCH] log.error checking

---
 openlp/core/lib/__init__.py    |  2 +-
 openlp/core/lib/serviceitem.py | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index e5f45b188..b243110dc 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -68,7 +68,7 @@ def get_text_file_string(text_file):
         file_handle = open(text_file, u'r')
         content_string = file_handle.read()
     except IOError:
-        log.error(u'Failed to open text file %s' % text_file)
+        log.exception(u'Failed to open text file %s' % text_file)
     finally:
         if file_handle:
             file_handle.close()
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index f246d9b90..9fe7ac060 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -125,8 +125,9 @@ class ServiceItem(object):
                         if title == u'':
                             title = line
                         lines += line + u'\n'
-                    self._display_frames.append({u'title': title, \
-                        u'text': lines.rstrip(), u'verseTag': slide[u'verseTag'] })
+                    self._display_frames.append({u'title': title,
+                        u'text': lines.rstrip(),
+                        u'verseTag': slide[u'verseTag'] })
                     self.cache.insert(len(self._display_frames), None)
                 log.log(15, u'Formatting took %4s' % (time.time() - before))
         elif self.service_item_type == ServiceItemType.Image:
@@ -239,7 +240,8 @@ class ServiceItem(object):
                 service_data.append(slide[u'title'])
         elif self.service_item_type == ServiceItemType.Command:
             for slide in self._raw_frames:
-                service_data.append({u'title':slide[u'title'], u'image':slide[u'image']})
+                service_data.append(
+                    {u'title':slide[u'title'], u'image':slide[u'image']})
         return {u'header': service_header, u'data': service_data}
 
     def set_from_service(self, serviceitem, path=None):
@@ -276,7 +278,8 @@ class ServiceItem(object):
         elif self.service_item_type == ServiceItemType.Command:
             for text_image in serviceitem[u'serviceitem'][u'data']:
                 filename = os.path.join(path, text_image[u'title'])
-                self.add_from_command(path, text_image[u'title'], text_image[u'image'] )
+                self.add_from_command(
+                    path, text_image[u'title'], text_image[u'image'] )
 
     def merge(self, other):
         """
@@ -343,3 +346,4 @@ class ServiceItem(object):
         Returns the title of the raw frame
         """
         return self._raw_frames[row][u'path']
+