From b52d0aafd5da669a9ee5436663e18e0558a0bbd5 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sun, 9 Jan 2011 20:18:08 +0100
Subject: [PATCH] re.compile code from reindex tool

---
 openlp/plugins/songs/lib/mediaitem.py | 7 +++----
 openlp/plugins/songs/lib/xml.py       | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 3f3755d14..73c8eaa10 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -351,8 +351,7 @@ class SongMediaItem(MediaManagerItem):
         service_item.theme = song.theme_name
         service_item.edit_id = item_id
         if song.lyrics.startswith(u'<?xml version='):
-            songXML = SongXML()
-            verseList = songXML.get_verses(song.lyrics)
+            verseList = SongXML().get_verses(song.lyrics)
             # no verse list or only 1 space (in error)
             if not song.verse_order or not song.verse_order.strip():
                 for verse in verseList:
@@ -405,8 +404,8 @@ class SongMediaItem(MediaManagerItem):
         log.debug(u'serviceLoad')
         if item.data_string:
             search_results = self.parent.manager.get_all_objects(Song,
-                Song.search_title ==
-                item.data_string[u'title'].split(u'@')[0].lower(),
+                Song.search_title == re.compile(r'\W+', re.UNICODE).sub(u' ',
+                item.data_string[u'title'].split(u'@')[0].lower()).strip(),
                 Song.search_title.asc())
             author_list = item.data_string[u'authors'].split(u', ')
             # The service item always has an author (at least it has u'' as
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index 753383af3..588ff923c 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -213,9 +213,10 @@ class OpenLyrics(object):
             u'<song version="0.7" createdIn="OpenLP 2.0"/>')
         properties = etree.SubElement(song_xml, u'properties')
         titles = etree.SubElement(properties, u'titles')
-        self._add_text_to_element(u'title', titles, song.title)
+        self._add_text_to_element(u'title', titles, song.title.strip())
         if song.alternate_title:
-            self._add_text_to_element(u'title', titles, song.alternate_title)
+            self._add_text_to_element(
+                u'title', titles, song.alternate_title.strip())
         if song.comments:
             comments = etree.SubElement(properties, u'comments')
             self._add_text_to_element(u'comment', comments, song.comments)