From 547074d29a7b1c0cf739bc082e85b9de9d48c4b3 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 4 Dec 2009 18:52:44 +0000
Subject: [PATCH] Verse tagging verses must be in format of vX

---
 openlp/plugins/songs/forms/editsongform.py | 24 +++++++++++++++-------
 openlp/plugins/songs/lib/mediaitem.py      |  4 ++--
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index dcda4ae52..c664e4060 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -401,14 +401,24 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         if self.AuthorsListView.count() == 0:
             self.SongTabWidget.setCurrentIndex(2)
             self.AuthorsListView.setFocus()
-        for verse in unicode(self.VerseOrderEdit.text()):
-            if verse.isdigit() or u' BCITPEO'.find(verse.upper()) > -1:
-                pass
+        for verse in unicode(self.VerseOrderEdit.text()).split(u' '):
+            if len(verse) == 2:
+                if verse[0:1] == u'v' and verse[1:].isdigit():
+                    pass
+                else:
+                    self.SongTabWidget.setCurrentIndex(0)
+                    self.VerseOrderEdit.setFocus()
+                    return False, \
+                        self.trUtf8('Invalid verse entry - vX')
             else:
-                self.SongTabWidget.setCurrentIndex(0)
-                self.VerseOrderEdit.setFocus()
-                return False, \
-                    self.trUtf8('Invalid verse entry - values must be Numeric, I,B,C,T,P,E,O')
+                if u' BCITPEO'.find(verse.upper()) > -1:
+                    pass
+                else:
+                    self.SongTabWidget.setCurrentIndex(0)
+                    self.VerseOrderEdit.setFocus()
+                    return False, \
+                        self.trUtf8(\
+                        'Invalid verse entry - values must be Numeric, I,B,C,T,P,E,O')
         return True, u''
 
     def onTitleEditItemLostFocus(self):
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index a6b909329..25db6bcda 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -297,11 +297,11 @@ class SongMediaItem(MediaManagerItem):
                 for verse in verseList:
                     service_item.add_from_text(verse[1][:30], unicode(verse[1]))
             else:
-                for order in service_item.verse_order:
+                for order in service_item.verse_order.split(u' '):
                     for verse in verseList:
                         if verse[1]:
                             if verse[0][u'type'] == "Verse" and \
-                                        verse[0][u'label'][0] == order[0]:
+                                        verse[0][u'label'][0] == order[1:]:
                                     verseTag = u'%s:%s' % \
                                         (verse[0][u'type'], verse[0][u'label'])
                                     service_item.add_from_text\