raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Bible search fixes (Bug #608409)

Browse Source
This commit is contained in:
Jon Tibble 2010-07-24 03:14:08 +01:00
parent ccda22a962
commit 323090e141
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/plugins/bibles/lib/db.py
View File

@ -305,6 +305,13 @@ class BibleDB(QtCore.QObject, Manager):
Book.abbreviation.like(book + u'%')) Book.abbreviation.like(book + u'%'))
return db_book return db_book
def get_books(self):
"""
A wrapper so both local and web bibles have a get_books() method that
manager can call. Used in the media manager advanced search tab.
"""
return self.get_all_objects(Book, order_by_ref=Book.id)
def get_verses(self, reference_list): def get_verses(self, reference_list):
""" """
This is probably the most used function. It retrieves the list of This is probably the most used function. It retrieves the list of

8
openlp/plugins/bibles/lib/http.py
View File

@ -135,10 +135,10 @@ class HTTPBooks(object):
u'verses FROM chapters WHERE book_id = ?', (book[u'id'],)) u'verses FROM chapters WHERE book_id = ?', (book[u'id'],))
if chapters: if chapters:
return { return {
u'id': chapters[chapter][0], u'id': chapters[chapter-1][0],
u'book_id': chapters[chapter][1], u'book_id': chapters[chapter-1][1],
u'chapter': chapters[chapter][2], u'chapter': chapters[chapter-1][2],
u'verses': chapters[chapter][3] u'verses': chapters[chapter-1][3]
} }
else: else:
return None return None

3
openlp/plugins/bibles/lib/manager.py
View File

@ -198,8 +198,7 @@ class BibleManager(object):
u'name': book.name, u'name': book.name,
u'chapters': self.db_cache[bible].get_chapter_count(book.name) u'chapters': self.db_cache[bible].get_chapter_count(book.name)
} }
for book in self.db_cache[bible].get_all_objects(Book, for book in self.db_cache[bible].get_books()
order_by_ref=Book.id)
] ]
def get_chapter_count(self, bible, book): def get_chapter_count(self, bible, book):