A fix for a number of historic issues on the tracker

http://support.openlp.org/issues/475
http://support.openlp.org/issues/492
http://support.openlp.org/issues/661

being the most recent.
This commit is contained in:
Philip Ridout 2012-06-18 20:26:44 +01:00
parent f542ebf94d
commit 8b5e174049

View File

@ -187,8 +187,9 @@ class OpenSongImport(SongImport):
content = this_line[1:right_bracket].lower() content = this_line[1:right_bracket].lower()
# have we got any digits? # have we got any digits?
# If so, verse number is everything from the digits # If so, verse number is everything from the digits
# to the end (even if there are some alpha chars on the end) # to the end (openlp does not have concept of part verses, so
match = re.match(u'(\D*)(\d+.*)', content) # just ignore any non integers on the end (including floats))
match = re.match(u'(\D*)(\d+)', content)
if match is not None: if match is not None:
verse_tag = match.group(1) verse_tag = match.group(1)
verse_num = match.group(2) verse_num = match.group(2)