Merge lp:~trb143/openlp/bugfixes into lp:openlp

[Tim Bentley]

[Tim Bentley (trb143)]

Add error handling to song xml to see if I can discover the windows linux xml error I am having
Clean up slide titles where a slide is split by the renderer.

[Martin Thompson (mjthompson)]

review: Approve

[lp:~trb143/openlp/bugfixes]

561. By Tim Bentley on 2009-09-20

rendering fixes

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2009-09-20 07:17:20 +0000
+++ openlp/core/lib/serviceitem.py	2009-09-20 18:47:18 +0000
@@ -100,7 +100,8 @@
                     lines = u''
                     for line in format:
                         lines += line + u'\n'
-                    self.frames.append({u'title': slide[u'title'],u'text':lines,
+                    title = lines.split(u'\n')[0]
+                    self.frames.append({u'title': title ,u'text':lines,
                         u'image': frame})
         elif self.service_item_type == ServiceType.Command:
             self.frames = self.service_frames
 
=== modified file 'openlp/core/lib/songxmlhandler.py'
--- openlp/core/lib/songxmlhandler.py	2009-09-08 19:58:05 +0000
+++ openlp/core/lib/songxmlhandler.py	2009-09-20 18:47:18 +0000
@@ -131,7 +131,7 @@
         try:
             self.song_xml = ElementTree(element=XML(xml))
         except:
-            log.debug(u'Invalid xml %s', xml)
+            log.exception(u'Invalid xml %s', xml)
 
     def get_verses(self):
         """