From a8bd5f19964455a4fcfc685cf4393ca05e99f004 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Fri, 7 Nov 2014 13:06:58 +0100 Subject: [PATCH] Fix for importing old bible DBs, like KJV --- openlp/plugins/bibles/bibleplugin.py | 2 +- openlp/plugins/bibles/lib/db.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index e7f1fdd56..76dc75d35 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -159,7 +159,7 @@ class BiblePlugin(Plugin): self.upgrade_wizard = BibleUpgradeForm(self.main_window, self.manager, self) # If the import was not cancelled then reload. if self.upgrade_wizard.exec_(): - self.media_item.reloadBibles() + self.media_item.reload_bibles() def on_bible_import_click(self): if self.media_item: diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py index b0d8d0e7d..8470c2765 100644 --- a/openlp/plugins/bibles/lib/db.py +++ b/openlp/plugins/bibles/lib/db.py @@ -170,6 +170,9 @@ class BibleDB(QtCore.QObject, Manager, RegistryProperties): Returns the version name of the Bible. """ version_name = self.get_object(BibleMeta, 'name') + # Fallback to old way of naming + if not version_name: + version_name = self.get_object(BibleMeta, 'Version') self.name = version_name.value if version_name else None return self.name @@ -969,11 +972,15 @@ class OldBibleDB(QtCore.QObject, Manager): """ Returns the version name of the Bible. """ + self.name = None version_name = self.run_sql('SELECT value FROM metadata WHERE key = "name"') if version_name: self.name = version_name[0][0] else: - self.name = None + # Fallback to old way of naming + version_name = self.run_sql('SELECT value FROM metadata WHERE key = "Version"') + if version_name: + self.name = version_name[0][0] return self.name def get_metadata(self):