raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Songs of Fellowship import and support book 5

Browse Source 
bzr-revno: 1828
This commit is contained in:
Jonathan Corwin 2011-12-09 19:13:30 +00:00
commit 6bf2354d1a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/plugins/songs/lib/sofimport.py
View File

@ -127,7 +127,7 @@ class SofImport(OooImport):
self.processParagraphText(text) self.processParagraphText(text)
self.newSong() self.newSong()
text = u'' text = u''
text += self.process_textportion(textportion) text += self.processTextPortion(textportion)
if textportion.BreakType in (PAGE_AFTER, PAGE_BOTH): if textportion.BreakType in (PAGE_AFTER, PAGE_BOTH):
self.processParagraphText(text) self.processParagraphText(text)
self.newSong() self.newSong()
@ -202,8 +202,8 @@ class SofImport(OooImport):
if boldtext.isdigit() and self.songNumber == '': if boldtext.isdigit() and self.songNumber == '':
self.addSongNumber(boldtext) self.addSongNumber(boldtext)
return u'' return u''
text = self.uncapText(text)
if self.title == u'': if self.title == u'':
text = self.uncap_text(text)
self.addTitle(text) self.addTitle(text)
return text return text
if text.strip().startswith(u'('): if text.strip().startswith(u'('):
@ -242,8 +242,12 @@ class SofImport(OooImport):
self.songBook = u'Songs of Fellowship 2' self.songBook = u'Songs of Fellowship 2'
elif int(song_no) <= 1690: elif int(song_no) <= 1690:
self.songBook = u'Songs of Fellowship 3' self.songBook = u'Songs of Fellowship 3'
else: elif int(song_no) <= 2200:
self.songBook = u'Songs of Fellowship 4' 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): def addTitle(self, text):
""" """