From 1f5d896fc1cf617f7978a5c086784e6846a7fcf7 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Sat, 19 Feb 2011 19:49:08 +0000 Subject: [PATCH 1/2] Fix CCLI author import --- openlp/plugins/songs/lib/cclifileimport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py index ccd1dff9c..60652ef14 100644 --- a/openlp/plugins/songs/lib/cclifileimport.py +++ b/openlp/plugins/songs/lib/cclifileimport.py @@ -200,7 +200,7 @@ class CCLIFileImport(SongImport): author_list = song_author.split(u'|') for author in author_list: seperated = author.split(u',') - self.add_author(seperated[1].strip() + u' ' + seperated[0].strip()) + self.add_author(u' '.join(seperated)) self.title = song_name self.copyright = song_copyright self.ccli_number = song_ccli From bb39617b3b2000995d9d180c1c1ab341cbf2c65c Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Sat, 19 Feb 2011 20:31:21 +0000 Subject: [PATCH 2/2] Try again --- openlp/plugins/songs/lib/cclifileimport.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py index 60652ef14..3d08584d0 100644 --- a/openlp/plugins/songs/lib/cclifileimport.py +++ b/openlp/plugins/songs/lib/cclifileimport.py @@ -199,8 +199,11 @@ class CCLIFileImport(SongImport): if len(author_list) < 2: author_list = song_author.split(u'|') for author in author_list: - seperated = author.split(u',') - self.add_author(u' '.join(seperated)) + separated = author.split(u',') + if len(separated) > 1: + self.add_author(u' '.join(reversed(separated))) + else: + self.add_author(author) self.title = song_name self.copyright = song_copyright self.ccli_number = song_ccli