forked from openlp/openlp
fixed traceback when doing a text search without bible
This commit is contained in:
parent
3b15fd913e
commit
a2db0a1b5d
@ -401,7 +401,7 @@ class BibleDB(QtCore.QObject, Manager):
|
||||
"""
|
||||
log.debug(u'BibleDB.get_chapter_count("%s")', book)
|
||||
count = self.session.query(Verse.chapter).join(Book)\
|
||||
.filter(Book.name==book)\
|
||||
.filter(Book.name == book)\
|
||||
.distinct().count()
|
||||
if not count:
|
||||
return 0
|
||||
@ -420,8 +420,8 @@ class BibleDB(QtCore.QObject, Manager):
|
||||
"""
|
||||
log.debug(u'BibleDB.get_verse_count("%s", %s)', book, chapter)
|
||||
count = self.session.query(Verse).join(Book)\
|
||||
.filter(Book.name==book)\
|
||||
.filter(Verse.chapter==chapter)\
|
||||
.filter(Book.name == book)\
|
||||
.filter(Verse.chapter == chapter)\
|
||||
.count()
|
||||
if not count:
|
||||
return 0
|
||||
|
@ -294,6 +294,15 @@ class BibleManager(object):
|
||||
The text to search for (unicode).
|
||||
"""
|
||||
log.debug(u'BibleManager.verse_search("%s", "%s")', bible, text)
|
||||
if not bible:
|
||||
Receiver.send_message(u'openlp_information_message', {
|
||||
u'title': translate('BiblesPlugin.BibleManager',
|
||||
'No Bibles Available'),
|
||||
u'message': translate('BiblesPlugin.BibleManager',
|
||||
'There are no Bibles currently installed. Please use the '
|
||||
'Import Wizard to install one or more Bibles.')
|
||||
})
|
||||
return None
|
||||
# Check if the bible or second_bible is a web bible.
|
||||
webbible = self.db_cache[bible].get_object(BibleMeta,
|
||||
u'download source')
|
||||
|
Loading…
Reference in New Issue
Block a user