From 6a17d5548430f3e313121de48094ab9b38b00e48 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Fri, 9 Dec 2011 00:08:59 +0000 Subject: [PATCH] Songs of Fellowship 5 import --- openlp/plugins/songs/lib/sofimport.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py index 5f310dba0..4bb91f58a 100644 --- a/openlp/plugins/songs/lib/sofimport.py +++ b/openlp/plugins/songs/lib/sofimport.py @@ -127,7 +127,7 @@ class SofImport(OooImport): self.processParagraphText(text) self.newSong() text = u'' - text += self.process_textportion(textportion) + text += self.processTextPortion(textportion) if textportion.BreakType in (PAGE_AFTER, PAGE_BOTH): self.processParagraphText(text) self.newSong() @@ -202,8 +202,8 @@ class SofImport(OooImport): if boldtext.isdigit() and self.songNumber == '': self.addSongNumber(boldtext) return u'' + text = self.uncapText(text) if self.title == u'': - text = self.uncap_text(text) self.addTitle(text) return text if text.strip().startswith(u'('): @@ -242,8 +242,12 @@ class SofImport(OooImport): self.songBook = u'Songs of Fellowship 2' elif int(song_no) <= 1690: self.songBook = u'Songs of Fellowship 3' - else: + elif int(song_no) <= 2200: self.songBook = u'Songs of Fellowship 4' + elif int(song_no) <= 2710: + self.songBook = u'Songs of Fellowship 5' + else: + self.songBook = u'Songs of Fellowship Other' def addTitle(self, text): """