From b04c93e9a7bf304dddd9e49a2d60546d001730d5 Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Wed, 7 Jul 2010 21:17:58 +0100
Subject: [PATCH] test theme, alttheme -> our theme

---
 openlp/plugins/songs/lib/lyrics_xml.py |  4 ++--
 openlp/plugins/songs/lib/songimport.py | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/openlp/plugins/songs/lib/lyrics_xml.py b/openlp/plugins/songs/lib/lyrics_xml.py
index 359c28eda..38985ca1b 100644
--- a/openlp/plugins/songs/lib/lyrics_xml.py
+++ b/openlp/plugins/songs/lib/lyrics_xml.py
@@ -76,8 +76,8 @@ class SongXMLBuilder(object):
         ``content``
             The actual text of the verse to be stored.
         """
-        #log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content))
-        verse = etree.Element(u'verse', type=type, label=number)
+        # log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content))
+        verse = etree.Element(u'verse', type=unicode(type), label=unicode(number))
         verse.text = etree.CDATA(content)
         self.lyrics.append(verse)
 
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 5fbcce540..3b507140b 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -51,8 +51,8 @@ class SongImport(object):
         self.alternate_title = u''
         self.copyright = u''
         self.comment = u''
-        self.theme_name = u''
-        self.ccli_number = u''
+        self.theme = u''
+        self.song_cclino = u''
         self.authors = []
         self.topics = []
         self.song_book_name = u''
@@ -303,8 +303,8 @@ class SongImport(object):
         song.verse_order = u' '.join(self.verse_order_list)
         song.copyright = self.copyright
         song.comment = self.comment
-        song.theme_name = self.theme_name
-        song.ccli_number = self.ccli_number
+        song.theme = self.theme
+        song.song_cclino = self.song_cclino
         for authortext in self.authors:
             author = self.manager.get_object_filtered(Author,
                 Author.display_name == authortext)
@@ -358,7 +358,7 @@ class SongImport(object):
             print u'TOPIC: ' + topictext
         if self.comment:
             print u'COMMENT: ' + self.comment
-        if self.theme_name:
-            print u'THEME: ' + self.theme_name
-        if self.ccli_number:
-            print u'CCLI: ' + self.ccli_number
+        if self.theme:
+            print u'THEME: ' + self.theme
+        if self.song_cclino:
+            print u'CCLI: ' + self.song_cclino