From 8067f669b161733af128ee8cac000511b087b473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Armin=20K=C3=B6hler?= <orangeshirt@web.de>
Date: Thu, 2 Jun 2011 07:45:02 +0200
Subject: [PATCH] Fix Bug 788762 - error "No matching book" is now only shown
 once If a Second Bible is choosen Text Search Results contains now only
 Passages which are in both bibles.

---
 openlp/plugins/bibles/lib/db.py        | 14 ++++++++------
 openlp/plugins/bibles/lib/mediaitem.py | 26 ++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py
index 776521aa6..e44dd0a25 100644
--- a/openlp/plugins/bibles/lib/db.py
+++ b/openlp/plugins/bibles/lib/db.py
@@ -381,6 +381,7 @@ class BibleDB(QtCore.QObject, Manager):
         """
         log.debug(u'BibleDB.get_verses("%s")', reference_list)
         verse_list = []
+        book_error = False
         for book_id, chapter, start_verse, end_verse in reference_list:
             db_book = self.get_book_by_book_ref_id(book_id)
             if db_book:
@@ -398,12 +399,13 @@ class BibleDB(QtCore.QObject, Manager):
                 verse_list.extend(verses)
             else:
                 log.debug(u'OpenLP failed to find book with id "%s"', book_id)
-                if show_error:
-                    critical_error_message_box(
-                        translate('BiblesPlugin', 'No Book Found'),
-                        translate('BiblesPlugin', 'No matching book '
-                        'could be found in this Bible. Check that you '
-                        'have spelled the name of the book correctly.'))
+                book_error = True
+        if book_error and show_error:
+            critical_error_message_box(
+                translate('BiblesPlugin', 'No Book Found'),
+                translate('BiblesPlugin', 'No matching book '
+                'could be found in this Bible. Check that you '
+                'have spelled the name of the book correctly.'))
         return verse_list
 
     def verse_search(self, text):
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 8158465c7..9d90a9f12 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -675,9 +675,31 @@ class BibleMediaItem(MediaManagerItem):
                 second_bible, text)
             if second_bible and self.search_results:
                 text = []
+                new_search_results = []
+                count = 0
+                passage_not_found = False
                 for verse in self.search_results:
-                    text.append((verse.book.name, verse.chapter, verse.verse,
-                        verse.verse))
+                    db_book = bibles[second_bible].get_book_by_book_ref_id(
+                        verse.book.book_reference_id)
+                    if not db_book:
+                        log.debug(u'Passage "%s %d:%d" not found in Second '
+                            u'Bible' % (verse.book.name, verse.chapter, 
+                            verse.verse))
+                        passage_not_found = True
+                        count += 1
+                        continue
+                    new_search_results.append(verse)
+                    text.append((verse.book.book_reference_id, verse.chapter, 
+                        verse.verse, verse.verse))
+                if passage_not_found:
+                    QtGui.QMessageBox.information(self, 
+                        translate('BiblePlugin.MediaItem', 'Information'), 
+                        unicode(translate('BiblePlugin.MediaItem',
+                        'The Second Bible not contains as much books as the '
+                        'First Bible. Only search results which are found in '
+                        'both Bibles are shown.\n%d results dropped.')) % count,
+                        QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+                self.search_results = new_search_results
                 self.second_search_results = \
                     bibles[second_bible].get_verses(text)
         if not self.quickLockButton.isChecked():