Merge branch 'ew7-support' into 'master'

Minor fix for EasyWorship import

See merge request openlp/openlp!585

openlp/plugins/songs/lib/importer.py

@@ -254,27 +254,27 @@ class SongFormat(object):
         },
         EasyWorshipDB: {
             'class': EasyWorshipSongImport,
-            'name': 'EasyWorship Song Database',
+            'name': 'EasyWorship 2007/2009 Song Database',
             'prefix': 'ew',
             'selectMode': SongFormatSelect.SingleFile,
             'filter': '{text} (*.DB)'.format(text=translate('SongsPlugin.ImportWizardForm',
-                                                            'EasyWorship Song Database'))
+                                                            'EasyWorship 2007/2009 Song Database'))
         },
         EasyWorshipSqliteDB: {
             'class': EasyWorshipSongImport,
-            'name': 'EasyWorship 6 Song Database',
+            'name': 'EasyWorship 6/7 Song Database',
             'prefix': 'ew',
             'selectMode': SongFormatSelect.SingleFolder,
             'filter': '{text} (*.db)'.format(text=translate('SongsPlugin.ImportWizardForm',
-                                                            'EasyWorship 6 Song Data Directory'))
+                                                            'EasyWorship 6/7 Song Data Directory'))
         },
         EasyWorshipService: {
             'class': EasyWorshipSongImport,
-            'name': 'EasyWorship Service',
+            'name': 'EasyWorship 2007/2009 Service File',
             'prefix': 'ew',
             'selectMode': SongFormatSelect.SingleFile,
             'filter': '{text} (*.ews)'.format(text=translate('SongsPlugin.ImportWizardForm',
-                                                             'EasyWorship Service File'))
+                                                             'EasyWorship 2007/2009 Service File'))
         },
         FoilPresenter: {
             'class': FoilPresenterImport,

openlp/plugins/songs/lib/importers/easyworship.py

@@ -392,8 +392,10 @@ class EasyWorshipSongImport(SongImport):
             self.author = song[2]
             self.copyright = song[3]
             self.ccli_number = song[4]
-            words = words_db.execute('SELECT words FROM word WHERE song_id = ?;', (song_id,))
+            song_words_result = words_db.execute('SELECT words FROM word WHERE song_id = ?;', (song_id,))
-            self.set_song_import_object(self.author, words.fetchone()[0].encode())
+            words = song_words_result.fetchone()
+            if words:
+                self.set_song_import_object(self.author, words[0].encode())
             if not self.finish():
                 self.log_error(self.import_source,
                                translate('SongsPlugin.EasyWorshipSongImport',