diff --git a/openlp/database/BibleDBImpl.py b/openlp/database/BibleDBImpl.py index f241c7918..62d6b5231 100644 --- a/openlp/database/BibleDBImpl.py +++ b/openlp/database/BibleDBImpl.py @@ -179,6 +179,11 @@ class BibleDBImpl: s = text (""" select text FROM verse,book where verse.book_id == book.id AND verse.chapter == :c and verse.verse == :v and book.name == :b """) return self.db.execute(s, c=chapter, v=verse , b=bookname).fetchone() + def getBibleText(self, bookname, chapter, sverse, everse): + metadata.bind.echo = True + s = text (""" select text FROM verse,book where verse.book_id == book.id AND verse.chapter == :c AND (verse.verse between :v1 and :v2) and book.name == :b """) + return self.db.execute(s, c=chapter, v1=sverse , v2=everse, b=bookname).fetchall() + def _cleanText(self, text): text = text.replace('\n', '') text = text.replace('\r', '') diff --git a/openlp/database/BibleManager.py b/openlp/database/BibleManager.py index b08fbca71..198f10249 100644 --- a/openlp/database/BibleManager.py +++ b/openlp/database/BibleManager.py @@ -98,7 +98,8 @@ class BibleManager: then only one verse is returned """ if everse < sverse: - everse = sverse # make sure end after we start. Also optional - text = self.biblelist[bible].getBibleText(book, chapter, sverse) + text = self.biblelist[bible].getBibleText(book, chapter, sverse) + else: + text = self.biblelist[bible].getBibleText(book, chapter, sverse, everse) print text return text diff --git a/openlp/database/test/testBibleManager.py b/openlp/database/test/testBibleManager.py index 970c8fcfe..7c6aca3dc 100644 --- a/openlp/database/test/testBibleManager.py +++ b/openlp/database/test/testBibleManager.py @@ -62,9 +62,9 @@ class TestBibleManager(unittest.TestCase): def testGetVerseText(self): print "testGetVerseText" - c = self.bm.getVerseText("TheMessage",'"Genesis"',1,2,1) + c = self.bm.getVerseText("TheMessage",'Genesis',1,1,1) print c - c = self.bm.getVerseText("NIV",'"Genesis"',1,2,1) + c = self.bm.getVerseText("NIV",'Genesis',1,1,3) print c if __name__ == '__main__':