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

change skip_song to save_song

Browse Source
This commit is contained in:
Philip Ridout 2013-07-24 19:43:56 +01:00
parent 47ffa7c9e3
commit f880816434
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/plugins/songs/lib/foilpresenterimport.py
View File

@ -224,7 +224,7 @@ class FoilPresenter(object):
song.search_lyrics = u'' song.search_lyrics = u''
song.verse_order = u'' song.verse_order = u''
song.search_title = u'' song.search_title = u''
self.skip_song = False self.save_song = False
# Because "text" seems to be an reserved word, we have to recompile it. # Because "text" seems to be an reserved word, we have to recompile it.
xml = re.compile(u'<text>').sub(u'<text_>', xml) xml = re.compile(u'<text>').sub(u'<text_>', xml)
xml = re.compile(u'</text>').sub(u'</text_>', xml) xml = re.compile(u'</text>').sub(u'</text_>', xml)
@ -238,7 +238,7 @@ class FoilPresenter(object):
self._process_authors(song_xml, song) self._process_authors(song_xml, song)
self._process_songbooks(song_xml, song) self._process_songbooks(song_xml, song)
self._process_topics(song_xml, song) self._process_topics(song_xml, song)
if not self.skip_song: if not self.save_song:
clean_song(self.manager, song) clean_song(self.manager, song)
self.manager.save_object(song) self.manager.save_object(song)
@ -427,7 +427,7 @@ class FoilPresenter(object):
self.importer.logError(self._child(foilpresenterfolie.titel), self.importer.logError(self._child(foilpresenterfolie.titel),
unicode(translate('SongsPlugin.FoilPresenterSongImport', unicode(translate('SongsPlugin.FoilPresenterSongImport',
'Invalid Foilpresenter song file. No verses found.'))) 'Invalid Foilpresenter song file. No verses found.')))
self.skip_song = True self.save_song = True
return return
for strophe in foilpresenterfolie.strophen.strophe: for strophe in foilpresenterfolie.strophen.strophe:
text = self._child(strophe.text_) if hasattr(strophe, u'text_') else u'' text = self._child(strophe.text_) if hasattr(strophe, u'text_') else u''