From 8b5e1740495c41303a90ea6980577360802d46a1 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Mon, 18 Jun 2012 20:26:44 +0100 Subject: [PATCH] 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. --- openlp/plugins/songs/lib/opensongimport.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py index f78ba474b..2b2269e3b 100644 --- a/openlp/plugins/songs/lib/opensongimport.py +++ b/openlp/plugins/songs/lib/opensongimport.py @@ -187,8 +187,9 @@ class OpenSongImport(SongImport): content = this_line[1:right_bracket].lower() # have we got any digits? # If so, verse number is everything from the digits - # to the end (even if there are some alpha chars on the end) - match = re.match(u'(\D*)(\d+.*)', content) + # to the end (openlp does not have concept of part verses, so + # just ignore any non integers on the end (including floats)) + match = re.match(u'(\D*)(\d+)', content) if match is not None: verse_tag = match.group(1) verse_num = match.group(2)