Merge lp:~raoul-snyman/openlp/bug-863845 into lp:openlp

[Raoul Snyman]

Fix importing of newer songs databases.

[lp:~raoul-snyman/openlp/bug-863845]

1810. By rimach on 2011-12-02

Rewrite of the multimedia stuff.

[Tim Bentley (trb143)]

review: Approve

[lp:~raoul-snyman/openlp/bug-863845]

1811. By Raoul Snyman on 2011-12-02

Fix importing of newer songs databases.

=== modified file 'openlp/plugins/songs/lib/olpimport.py'
--- openlp/plugins/songs/lib/olpimport.py	2011-09-05 12:51:16 +0000
+++ openlp/plugins/songs/lib/olpimport.py	2011-12-01 19:24:25 +0000
@@ -124,7 +124,7 @@
         if has_media_files:
             source_media_files_table = source_meta.tables[u'media_files']
             source_media_files_songs_table = \
-                source_meta.tables[u'media_files_songs']
+                source_meta.tables.get(u'media_files_songs')
             try:
                 class_mapper(OldMediaFile)
             except UnmappedClassError:
@@ -137,8 +137,13 @@
             secondary=source_songs_topics_table)
         }
         if has_media_files:
-            song_props['media_files'] = relation(OldMediaFile, backref='songs',
-                secondary=source_media_files_songs_table)
+            if source_media_files_songs_table:
+                song_props['media_files'] = relation(OldMediaFile,
+                    backref='songs',
+                    secondary=source_media_files_songs_table)
+            else:
+                song_props['media_files'] = relation(OldMediaFile,
+                    backref='songs')
         try:
             class_mapper(OldAuthor)
         except UnmappedClassError: