forked from openlp/openlp
re.compile code from reindex tool
This commit is contained in:
parent
62794614f9
commit
b52d0aafd5
|
@ -351,8 +351,7 @@ class SongMediaItem(MediaManagerItem):
|
||||||
service_item.theme = song.theme_name
|
service_item.theme = song.theme_name
|
||||||
service_item.edit_id = item_id
|
service_item.edit_id = item_id
|
||||||
if song.lyrics.startswith(u'<?xml version='):
|
if song.lyrics.startswith(u'<?xml version='):
|
||||||
songXML = SongXML()
|
verseList = SongXML().get_verses(song.lyrics)
|
||||||
verseList = songXML.get_verses(song.lyrics)
|
|
||||||
# no verse list or only 1 space (in error)
|
# no verse list or only 1 space (in error)
|
||||||
if not song.verse_order or not song.verse_order.strip():
|
if not song.verse_order or not song.verse_order.strip():
|
||||||
for verse in verseList:
|
for verse in verseList:
|
||||||
|
@ -405,8 +404,8 @@ class SongMediaItem(MediaManagerItem):
|
||||||
log.debug(u'serviceLoad')
|
log.debug(u'serviceLoad')
|
||||||
if item.data_string:
|
if item.data_string:
|
||||||
search_results = self.parent.manager.get_all_objects(Song,
|
search_results = self.parent.manager.get_all_objects(Song,
|
||||||
Song.search_title ==
|
Song.search_title == re.compile(r'\W+', re.UNICODE).sub(u' ',
|
||||||
item.data_string[u'title'].split(u'@')[0].lower(),
|
item.data_string[u'title'].split(u'@')[0].lower()).strip(),
|
||||||
Song.search_title.asc())
|
Song.search_title.asc())
|
||||||
author_list = item.data_string[u'authors'].split(u', ')
|
author_list = item.data_string[u'authors'].split(u', ')
|
||||||
# The service item always has an author (at least it has u'' as
|
# The service item always has an author (at least it has u'' as
|
||||||
|
|
|
@ -213,9 +213,10 @@ class OpenLyrics(object):
|
||||||
u'<song version="0.7" createdIn="OpenLP 2.0"/>')
|
u'<song version="0.7" createdIn="OpenLP 2.0"/>')
|
||||||
properties = etree.SubElement(song_xml, u'properties')
|
properties = etree.SubElement(song_xml, u'properties')
|
||||||
titles = etree.SubElement(properties, u'titles')
|
titles = etree.SubElement(properties, u'titles')
|
||||||
self._add_text_to_element(u'title', titles, song.title)
|
self._add_text_to_element(u'title', titles, song.title.strip())
|
||||||
if song.alternate_title:
|
if song.alternate_title:
|
||||||
self._add_text_to_element(u'title', titles, song.alternate_title)
|
self._add_text_to_element(
|
||||||
|
u'title', titles, song.alternate_title.strip())
|
||||||
if song.comments:
|
if song.comments:
|
||||||
comments = etree.SubElement(properties, u'comments')
|
comments = etree.SubElement(properties, u'comments')
|
||||||
self._add_text_to_element(u'comment', comments, song.comments)
|
self._add_text_to_element(u'comment', comments, song.comments)
|
||||||
|
|
Loading…
Reference in New Issue