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

Fixed bug #735357. 

Done it as I thought best, please suggest a more appropiate way if there is.
This commit is contained in:
Philip Ridout 2011-03-15 19:31:22 +00:00
parent cc239c8d11
commit a8c45c619e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/plugins/songs/lib/songshowplusimport.py
View File

@ -154,9 +154,10 @@ class SongShowPlusImport(SongImport):
elif blockKey == COMMENTS:
self.comments = unicode(data, u'cp1252')
elif blockKey == VERSE_ORDER:
verseTag = self.toOpenLPVerseTag(data)
self.sspVerseOrderList.append(unicode(verseTag,
u'cp1252'))
verseTag = self.toOpenLPVerseTag(data, 1)
if verseTag:
self.sspVerseOrderList.append(unicode(verseTag,
u'cp1252'))
elif blockKey == SONG_BOOK:
self.song_book_name = unicode(data, u'cp1252')
elif blockKey == SONG_NUMBER:
@ -174,7 +175,7 @@ class SongShowPlusImport(SongImport):
WizardStrings.ImportingType % file_name)
return True
def toOpenLPVerseTag(self, verseName):
def toOpenLPVerseTag(self, verseName, ignoreUnique = False):
if verseName.find(" ") != -1:
verseParts = verseName.split(" ")
verseType = verseParts[0]
@ -195,6 +196,8 @@ class SongShowPlusImport(SongImport):
verseTag = "B"
else:
if not self.otherList.has_key(verseName):
if ignoreUnique:
return False
self.otherCount = self.otherCount + 1
self.otherList[verseName] = str(self.otherCount)
verseTag = "O"