Fix Bible error message if search from remote

This commit is contained in:
Jonathan Corwin 2011-06-08 21:03:32 +01:00
parent 2e81149118
commit 56783d8a41

View File

@ -683,17 +683,17 @@ class BibleMediaItem(MediaManagerItem):
verse.book.book_reference_id) verse.book.book_reference_id)
if not db_book: if not db_book:
log.debug(u'Passage "%s %d:%d" not found in Second ' log.debug(u'Passage "%s %d:%d" not found in Second '
u'Bible' % (verse.book.name, verse.chapter, u'Bible' % (verse.book.name, verse.chapter,
verse.verse)) verse.verse))
passage_not_found = True passage_not_found = True
count += 1 count += 1
continue continue
new_search_results.append(verse) new_search_results.append(verse)
text.append((verse.book.book_reference_id, verse.chapter, text.append((verse.book.book_reference_id, verse.chapter,
verse.verse, verse.verse)) verse.verse, verse.verse))
if passage_not_found: if passage_not_found:
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate('BiblePlugin.MediaItem', 'Information'), translate('BiblePlugin.MediaItem', 'Information'),
unicode(translate('BiblePlugin.MediaItem', unicode(translate('BiblePlugin.MediaItem',
'The second Bibles does not contain all the verses ' 'The second Bibles does not contain all the verses '
'that are in the main Bible. Only verses found in both ' 'that are in the main Bible. Only verses found in both '
@ -983,7 +983,7 @@ class BibleMediaItem(MediaManagerItem):
Search for some Bible verses (by reference). Search for some Bible verses (by reference).
""" """
bible = unicode(self.quickVersionComboBox.currentText()) bible = unicode(self.quickVersionComboBox.currentText())
search_results = self.plugin.manager.get_verses(bible, string, False) search_results = self.plugin.manager.get_verses(bible, string, False, False)
results = [] results = []
if search_results: if search_results:
versetext = u' '.join([verse.text for verse in search_results]) versetext = u' '.join([verse.text for verse in search_results])