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

Fixes https://bugs.launchpad.net/openlp/+bug/1015524

Browse Source 
Note: If a title is not present in the song, it is still added. I feel this is the right action, as it apears that that is how it was in Foil Presenter
This commit is contained in:
Philip Ridout 2012-07-14 21:35:19 +01:00
parent f0047bece0
commit 22c3c76a5a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,8 +483,9 @@ class FoilPresenter(object):
# Process verse order # Process verse order
verse_order = [] verse_order = []
verse_strophenr = [] verse_strophenr = []
for strophennummer in foilpresenterfolie.reihenfolge.strophennummer: if hasattr(foilpresenterfolie, u'reihenfolge.strophennummer'):
verse_strophenr.append(strophennummer) for strophennummer in foilpresenterfolie.reihenfolge.strophennummer:
verse_strophenr.append(strophennummer)
# Currently we do not support different "parts"! # Currently we do not support different "parts"!
if u'0' in temp_verse_order: if u'0' in temp_verse_order:
for vers in temp_verse_order_backup: for vers in temp_verse_order_backup:
@ -538,12 +539,13 @@ class FoilPresenter(object):
``song`` ``song``
The song object. The song object.
""" """
for title_string in foilpresenterfolie.titel.titelstring: if hasattr(foilpresenterfolie, u'titel.titelstring'):
if not song.title: for title_string in foilpresenterfolie.titel.titelstring:
song.title = self._child(title_string) if not song.title:
song.alternate_title = u'' song.title = self._child(title_string)
else: song.alternate_title = u''
song.alternate_title = self._child(title_string) else:
song.alternate_title = self._child(title_string)
def _process_topics(self, foilpresenterfolie, song): def _process_topics(self, foilpresenterfolie, song):
""" """