Fix bug #598805

openlp/plugins/songs/forms/editsongform.py

@@ -627,7 +627,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         self.song.alternate_title = unicode(self.AlternativeEdit.text())
         self.song.copyright = unicode(self.CopyrightEditItem.text())
         self.song.search_title = self.song.title + u'@' + \
-            unicode(self.AlternativeEdit.text())
+            self.song.alternate_title
         self.song.comments = unicode(self.CommentsEdit.toPlainText())
         self.song.verse_order = unicode(self.VerseOrderEdit.text())
         self.song.ccli_number = unicode(self.CCLNumberEdit.text())
@@ -667,7 +667,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 if (bits[1] > u'1') and (bits[0][0] not in multiple):
                     multiple.append(bits[0][0])
             self.song.search_lyrics = text
-            self.song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
+            self.song.lyrics = unicode(sxml.extract_xml(), u'utf-8').lower()
             for verse in multiple:
                 self.song.verse_order = re.sub(u'([' + verse.upper() +
                     verse.lower() + u'])(\W|$)', r'\g<1>1\2',
@@ -679,4 +679,4 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
     def processTitle(self):
         log.debug(u'processTitle')
         self.song.search_title = re.sub(r'[\'"`,;:(){}?]+', u'',
-            unicode(self.song.search_title))
+            unicode(self.song.search_title)).lower()

openlp/plugins/songs/lib/mediaitem.py

@@ -166,13 +166,13 @@ class SongMediaItem(MediaManagerItem):
         if search_type == 0:
             log.debug(u'Titles Search')
             search_results = self.parent.manager.get_all_objects(Song,
-                Song.search_title.like(u'%' + search_keywords + u'%'),
+                Song.search_title.like(u'%' + search_keywords.lower() + u'%'),
                 Song.search_title.asc())
             self.displayResultsSong(search_results)
         elif search_type == 1:
             log.debug(u'Lyrics Search')
             search_results = self.parent.manager.get_all_objects(Song,
-                Song.search_lyrics.like(u'%' + search_keywords + u'%'),
+                Song.search_lyrics.like(u'%' + search_keywords.lower() + u'%'),
                 Song.search_lyrics.asc())
             self.displayResultsSong(search_results)
         elif search_type == 2:

openlp/plugins/songs/lib/songimport.py

@@ -76,7 +76,7 @@ class SongImport(QtCore.QObject):
             'SongsPlugin.SongImport', 'copyright'))
         self.copyright_symbol = unicode(translate(
             'SongsPlugin.SongImport', '\xa9'))
- 
+
     def stop_import(self):
         """
         Sets the flag for importers to stop their import
@@ -249,7 +249,7 @@ class SongImport(QtCore.QObject):
         song = Song()
         song.title = self.title
         song.search_title = self.remove_punctuation(self.title) \
-            + '@' + self.alternate_title
+            + '@' + self.remove_punctuation(self.alternate_title)
         song.song_number = self.song_number
         song.search_lyrics = u''
         sxml = SongXMLBuilder()
@@ -270,7 +270,7 @@ class SongImport(QtCore.QObject):
                 versetype = VerseType.to_string(VerseType.Other)
             sxml.add_verse_to_lyrics(versetype, versetag[1:], versetext)
             song.search_lyrics += u' ' + self.remove_punctuation(versetext)
-        song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
+        song.lyrics = unicode(sxml.extract_xml(), u'utf-8').lower()
         song.verse_order = u' '.join(self.verse_order_list)
         song.copyright = self.copyright
         song.comments = self.comments