From 8c4397d380356e88d253913e914900b8d1ab004f Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 3 Dec 2011 17:01:57 +0000
Subject: [PATCH] Head

---
 openlp/core/lib/db.py                 | 6 ++++--
 openlp/plugins/songs/lib/mediaitem.py | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index 8c39750b5..9a328c552 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -201,7 +201,9 @@ class Manager(object):
         settings.endGroup()
         if upgrade_mod:
             db_ver, up_ver = upgrade_db(self.db_url, upgrade_mod)
+            print db_ver, up_ver, db_ver > up_ver
             if db_ver > up_ver:
+                print "hello"
                 critical_error_message_box(
                     translate('OpenLP.Manager', 'Database Error'),
                     unicode(translate('OpenLP.Manager', 'The database being '
@@ -361,10 +363,10 @@ class Manager(object):
 
         ``object_class``
             The type of object to delete
-            
+
         ``filter_clause``
             The filter governing selection of objects to return. Defaults to
-            None.            
+            None.
         """
         try:
             query = self.session.query(object_class)
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 0af1a56a7..6ded39f83 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -272,7 +272,7 @@ class SongMediaItem(MediaManagerItem):
         for song in searchresults:
             # Do not display temporary songs
             if song.temporary == u'Y':
-                break
+                continue
             author_list = [author.display_name for author in song.authors]
             song_title = unicode(song.title)
             song_detail = u'%s (%s)' % (song_title, u', '.join(author_list))
@@ -291,7 +291,7 @@ class SongMediaItem(MediaManagerItem):
             for song in author.songs:
                 # Do not display temporary songs
                 if song.temporary == u'Y':
-                    break
+                    continue
                 song_detail = u'%s (%s)' % (author.display_name, song.title)
                 song_name = QtGui.QListWidgetItem(song_detail)
                 song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
@@ -568,7 +568,7 @@ class SongMediaItem(MediaManagerItem):
         else:
             # Make sure we temporary import formatting tags.
             song = self.openLyrics.xml_to_song(item.xml_version, True)
-            #editId = song.id
+            editId = song.id
         # Update service with correct song id.
         if editId:
             Receiver.send_message(u'service_item_update',