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

Tweaked Topics handler

This commit is contained in:
Martin Thompson 2010-07-15 21:27:44 +01:00
parent 294a02af45
commit bb34a304a9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,8 +190,8 @@ class SongImport(object):
""" """
Add the author. OpenLP stores them individually so split by 'and', '&' Add the author. OpenLP stores them individually so split by 'and', '&'
and comma. and comma.
However need to check for "Mr and Mrs Smith" and turn it to However need to check for 'Mr and Mrs Smith' and turn it to
"Mr Smith" and "Mrs Smith". 'Mr Smith' and 'Mrs Smith'.
""" """
for author in text.split(u','): for author in text.split(u','):
authors = author.split(u'&') authors = author.split(u'&')
@ -325,12 +325,14 @@ class SongImport(object):
self.manager.save_object(song_book) self.manager.save_object(song_book)
song.song_book_id = song_book.id song.song_book_id = song_book.id
for topictext in self.topics: for topictext in self.topics:
topic = self.manager.get_object_filtered(Topic.name == topictext) if len(topictext) == 0:
continue
topic = self.manager.get_object_filtered(Topic, Topic.name == topictext)
if topic is None: if topic is None:
topic = Topic() topic = Topic()
topic.name = topictext topic.name = topictext
self.manager.save_object(topic) self.manager.save_object(topic)
song.topics.append(topictext) song.topics.append(topic)
self.manager.save_object(song) self.manager.save_object(song)
def print_song(self): def print_song(self):