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

Fix bugs and add logging to test classes. 

Sort out varable names to be meaningful.

bzr-revno: 82
This commit is contained in:
Tim Bentley 2008-11-06 18:49:36 +00:00
parent 5b4210c137
commit 3752f4279d
4 changed files with 191 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
openlp/plugins/biblemanager/BibleDBImpl.py
View File

@ -30,7 +30,12 @@ sys.path.insert(0,(os.path.join(mypath, '..', '..', '..')))
from openlp.utils import ConfigHelper from openlp.utils import ConfigHelper
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s') import logging
logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
datefmt='%m-%d %H:%M',
filename='plugins.log',
filemode='w')
class BibleDBException(Exception): class BibleDBException(Exception):
pass pass
class BibleInvalidDatabaseError(Exception): class BibleInvalidDatabaseError(Exception):
@ -107,14 +112,17 @@ mapper(Book, book_table)
mapper(Verse, verse_table) mapper(Verse, verse_table)
class BibleDBImpl: class BibleDBImpl:
global log
log=logging.getLogger("BibleDBMgr")
log.info("BibleDB manager loaded")
def __init__(self, biblename, btype = 'sqlite'): def __init__(self, biblename, btype = 'sqlite'):
# Connect to database # Connect to database
path = ConfigHelper.getBiblePath() path = ConfigHelper.getBiblePath()
#print path #log.debug( path
#print biblename #log.debug( biblename
self.biblefile = os.path.join(path, biblename+".bible") self.biblefile = os.path.join(path, biblename+".bible")
#print self.biblefile #log.debug( self.biblefile
#print btype #log.debug( btype
if btype == 'sqlite': if btype == 'sqlite':
self.db = create_engine("sqlite:///"+self.biblefile) self.db = create_engine("sqlite:///"+self.biblefile)
elif btype == 'mysql': elif btype == 'mysql':
@ -137,24 +145,24 @@ class BibleDBImpl:
verse_table.create() verse_table.create()
self.loadMeta("dbversion", "0.1") self.loadMeta("dbversion", "0.1")
def createChapter(self, bk, chap, textlist): def createChapter(self, bookname, chap, textlist):
print "createChapter ", bk, chap, textlist log.debug( "createChapter %s,%s,%s", bookname, chap, textlist)
metadata.bind.echo = False metadata.bind.echo = False
session = self.Session() session = self.Session()
s = text (""" select id FROM book where book.name == :b """) s = text (""" select id FROM book where book.name == :b """)
data = self.db.execute(s, b=bk).fetchone() data = self.db.execute(s, b=bookname).fetchone()
id = data[0] # id is first record in list. id = data[0] # id is first record in list.
#print "id = " , id #log.debug( "id = " , id
for v , t in textlist.iteritems(): for v , t in textlist.iteritems():
versemeta = Verse(book_id=id, chapter=int(chap), verse=int(v), text=(t)) versemeta = Verse(book_id=id, chapter=int(chap), verse=int(v), text=(t))
session.add(versemeta) session.add(versemeta)
session.commit() session.commit()
def createBook(self, bk): def createBook(self, bookid, bookname, bookabbrev):
print "createBook ", bk log.debug( "createBook %s,%s,%s", bookid, bookname, bookabbrev)
metadata.bind.echo = False metadata.bind.echo = False
session = self.Session() session = self.Session()
bookmeta = Book(int(5), bk, bk) bookmeta = Book(int(5), bookname, bookabbrev)
session.add(bookmeta) session.add(bookmeta)
session.commit() session.commit()
@ -169,6 +177,11 @@ class BibleDBImpl:
s = text (""" select value FROM meta where key == :k """) s = text (""" select value FROM meta where key == :k """)
return self.db.execute(s, k=key).fetchone() return self.db.execute(s, k=key).fetchone()
def deleteMeta(self, key):
metadata.bind.echo = False
s = text (""" delete FROM meta where key == :k """)
self.db.execute(s, k=key)
def _loadTestaments(self): def _loadTestaments(self):
metadata.bind.echo = False metadata.bind.echo = False
session = self.Session() session = self.Session()
@ -192,7 +205,7 @@ class BibleDBImpl:
fverse=open(versesfile, 'r') fverse=open(versesfile, 'r')
for line in fbooks: for line in fbooks:
#print line #log.debug( line)
p = line.split(",") p = line.split(",")
p[2] = self._cleanText(p[2]) p[2] = self._cleanText(p[2])
p[3] = self._cleanText(p[3]) p[3] = self._cleanText(p[3])
@ -202,47 +215,47 @@ class BibleDBImpl:
book_ptr = "" book_ptr = ""
for line in fverse: for line in fverse:
#print line #log.debug( line)
p = line.split(",", 3) # split into 3 units and leave the rest as a single field p = line.split(",", 3) # split into 3 units and leave the rest as a single field
p[0] = self._cleanText(p[0]) p[0] = self._cleanText(p[0])
p[3] = self._cleanText(p[3]) p[3] = self._cleanText(p[3])
if book_ptr is not p[0]: if book_ptr is not p[0]:
query = session.query(Book).filter(Book.name==p[0]) query = session.query(Book).filter(Book.name==p[0])
#print query #log.debug( query)
#print query.first() #log.debug( query.first())
#print query.first().id #log.debug( query.first().id)
book_ptr = p[0] book_ptr = p[0]
#print text #log.debug( text)
versemeta = Verse(book_id=query.first().id, chapter=int(p[1]), verse=int(p[2]), text=(p[3])) versemeta = Verse(book_id=query.first().id, chapter=int(p[1]), verse=int(p[2]), text=(p[3]))
session.add(versemeta) session.add(versemeta)
session.commit() session.commit()
def getBibleBook(self, bookname): def getBibleBook(self, bookname):
print "getBibleBook ", bookname log.debug( "getBibleBook %s", bookname)
metadata.bind.echo = False metadata.bind.echo = False
s = text (""" select name FROM book where book.name == :b """) s = text (""" select name FROM book where book.name == :b """)
return self.db.execute(s, b=bookname).fetchone() return self.db.execute(s, b=bookname).fetchone()
def getBibleChapter(self, bookname, chapter): def getBibleChapter(self, bookname, chapter):
print "getBibleChapter ", bookname, chapter log.debug( "getBibleChapter %s,%s", bookname, chapter )
metadata.bind.echo = False metadata.bind.echo = False
s = text (""" select book.name FROM verse,book where verse.book_id == book.id AND verse.chapter == :c and book.name == :b """) s = text (""" select book.name FROM verse,book where verse.book_id == book.id AND verse.chapter == :c and book.name == :b """)
return self.db.execute(s, c=chapter, b=bookname).fetchone() return self.db.execute(s, c=chapter, b=bookname).fetchone()
def getBibleText(self, bookname, chapter, sverse, everse): def getBibleText(self, bookname, chapter, sverse, everse):
print "getBibleText ", bookname, chapter, sverse, everse log.debug( "getBibleText %s,%s,%s,%s", bookname, chapter, sverse, everse)
metadata.bind.echo = False metadata.bind.echo = False
s = text (""" select verse.verse, verse.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 """) s = text (""" select verse.verse, verse.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() return self.db.execute(s, c=chapter, v1=sverse , v2=everse, b=bookname).fetchall()
def dumpBible(self): def dumpBible(self):
print ".........Dumping Bible Database" log.debug( ".........Dumping Bible Database")
print "...............................Books " log.debug( "...............................Books ")
s = text (""" select * FROM book """) s = text (""" select * FROM book """)
print self.db.execute(s).fetchall() log.debug( self.db.execute(s).fetchall())
print "...............................Verses " log.debug( "...............................Verses ")
s = text (""" select * FROM verse """) s = text (""" select * FROM verse """)
print self.db.execute(s).fetchall() log.debug( self.db.execute(s).fetchall())
def _cleanText(self, text): def _cleanText(self, text):
text = text.replace('\n', '') text = text.replace('\n', '')

30
openlp/plugins/biblemanager/BibleHTTPImpl.py
View File

@ -20,7 +20,17 @@ import os, os.path
import sys import sys
import urllib2 import urllib2
import logging
logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
datefmt='%m-%d %H:%M',
filename='plugins.log',
filemode='w')
class BibleHTTPImpl: class BibleHTTPImpl:
global log
log=logging.getLogger("BibleHTTPMgr")
log.info("BibleHTTP manager loaded")
def __init__(self): def __init__(self):
""" """
Finds all the bibles defined for the system Finds all the bibles defined for the system
@ -35,9 +45,9 @@ class BibleHTTPImpl:
def setBibleSource(self,biblesource): def setBibleSource(self,biblesource):
self.biblesource = biblesource self.biblesource = biblesource
def getBibleChapter(self, version, book, chapter): def getBibleChapter(self, version, bookid,bookname, chapter):
urlstring = "http://bible.crosswalk.com/OnlineStudyBible/bible.cgi?word="+book+"+"+str(chapter)+"&version="+version urlstring = "http://bible.crosswalk.com/OnlineStudyBible/bible.cgi?word="+bookname+"+"+str(chapter)+"&version="+version
print urlstring log.debug( urlstring)
xml_string = "" xml_string = ""
req = urllib2.Request(urlstring) req = urllib2.Request(urlstring)
req.add_header('User-Agent', 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)') req.add_header('User-Agent', 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)')
@ -46,8 +56,8 @@ class BibleHTTPImpl:
xml_string = handle.read() xml_string = handle.read()
except IOError, e: except IOError, e:
if hasattr(e, 'reason'): if hasattr(e, 'reason'):
print 'Reason : ' log.error( 'Reason : ')
print e.reason log.error( e.reason)
i= xml_string.find("NavCurrentChapter") i= xml_string.find("NavCurrentChapter")
xml_string = xml_string[i:len(xml_string)] xml_string = xml_string[i:len(xml_string)]
@ -58,16 +68,16 @@ class BibleHTTPImpl:
i= xml_string.find("<B>") # Remove the heading for the book i= xml_string.find("<B>") # Remove the heading for the book
xml_string = xml_string[i + 3 :len(xml_string)] #remove the <B> at the front xml_string = xml_string[i + 3 :len(xml_string)] #remove the <B> at the front
versePos = xml_string.find("<BLOCKQUOTE>") versePos = xml_string.find("<BLOCKQUOTE>")
#print versePos #log.debug( versePos)
bible = {} bible = {}
cleanbible = {} cleanbible = {}
while versePos > 0: while versePos > 0:
versePos = xml_string.find("<B><I>", versePos) + 6 versePos = xml_string.find("<B><I>", versePos) + 6
i = xml_string.find("</I></B>", versePos) i = xml_string.find("</I></B>", versePos)
#print versePos, i #log.debug( versePos, i)
verse= xml_string[versePos:i] # Got the Chapter verse= xml_string[versePos:i] # Got the Chapter
#verse = int(temp) #verse = int(temp)
#print "Chapter = " + str(temp) #log.debug( "Chapter = " + str(temp))
versePos = i + 8 # move the starting position to negining of the text versePos = i + 8 # move the starting position to negining of the text
i = xml_string.find("<B><I>", versePos) # fine the start of the next verse i = xml_string.find("<B><I>", versePos) # fine the start of the next verse
if i == -1: if i == -1:
@ -75,12 +85,12 @@ class BibleHTTPImpl:
verseText = xml_string[versePos: i] verseText = xml_string[versePos: i]
versePos = 0 versePos = 0
else: else:
#print i, versePos #log.debug( i, versePos)
verseText = xml_string[versePos: i] verseText = xml_string[versePos: i]
versePos = i versePos = i
bible[verse] = self._cleanVerse(verseText) bible[verse] = self._cleanVerse(verseText)
#print bible #log.debug( bible)
return bible return bible
def _cleanVerse(self, text): def _cleanVerse(self, text):

153
openlp/plugins/biblemanager/BibleManager.py
View File

@ -26,7 +26,17 @@ from openlp.plugins.biblemanager.BibleDBImpl import BibleDBImpl
from openlp.plugins.biblemanager.BibleHTTPImpl import BibleHTTPImpl from openlp.plugins.biblemanager.BibleHTTPImpl import BibleHTTPImpl
from openlp.plugins.plugin import Plugin from openlp.plugins.plugin import Plugin
import logging
logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
datefmt='%m-%d %H:%M',
filename='plugins.log',
filemode='w')
class BibleManager(Plugin): class BibleManager(Plugin):
global log
log=logging.getLogger("BibleMgr")
log.info("Bible manager loaded")
def __init__(self): def __init__(self):
""" """
Finds all the bibles defined for the system Finds all the bibles defined for the system
@ -35,6 +45,7 @@ class BibleManager(Plugin):
Init confirms the bible exists and stores the database path. Init confirms the bible exists and stores the database path.
""" """
log.debug( "Bible Initialising")
self.bibleDBCache = {} self.bibleDBCache = {}
self.bibleHTTPCache = {} self.bibleHTTPCache = {}
self.booksOfBible = {} self.booksOfBible = {}
@ -44,7 +55,7 @@ class BibleManager(Plugin):
self.verses = {} self.verses = {}
self.verseData = {} self.verseData = {}
self.biblePath = ConfigHelper.getBiblePath() self.biblePath = ConfigHelper.getBiblePath()
#print self.biblePath #log.debug( self.biblePath )
files = os.listdir(self.biblePath) files = os.listdir(self.biblePath)
fbibles=open("../resources/bibles_en.txt", 'r') fbibles=open("../resources/bibles_en.txt", 'r')
fbibledata=open("../resources/bible_books.txt", 'r') fbibledata=open("../resources/bible_books.txt", 'r')
@ -57,68 +68,69 @@ class BibleManager(Plugin):
nhttp.setBibleSource(biblesource) nhttp.setBibleSource(biblesource)
self.bibleHTTPCache[b] = nhttp self.bibleHTTPCache[b] = nhttp
# #
for line in fbibles: #Load in memory objects
p = line.split(",") for line in fbibles:
self.booksOfBible[p[0]] = p[1].replace('\n', '') p = line.split(",")
self.listOfBooks.insert(int(p[1].replace('\n', '')), p[0]) self.booksOfBible[p[0]] = p[1].replace('\n', '')
for line in fbibledata: self.listOfBooks.insert(int(p[1].replace('\n', '')), p[0])
p = line.split(",") for line in fbibledata:
self.booksChapters[p[0]]=p[1] p = line.split(",")
self.CWids[p[0]]=p[2].replace('\n', '') self.booksChapters[p[0]]=p[1]
v = p[3].replace('\n', '') self.CWids[p[0]]=p[2].replace('\n', '')
self.verseData[p[0]] = v v = p[3].replace('\n', '')
#print "\n", self.booksOfBible self.verseData[p[0]] = v
#print "\n", self.booksChapters #log.debug( "\nbooks of the Bible", self.booksOfBible)
#print "\n", self.CWids #log.debug( "\n", self.booksChapters)
#print "\n", self.verseData #log.debug( "\n", self.CWids)
#log.debug( "\n", self.verseData)
#print self.bibleDBCache #log.debug( self.bibleDBCache)
#print self.bibleHTTPCache #log.debug( self.bibleHTTPCache )
log.debug( "Bible Initialised")
def registerHTTPBible(self, name, biblesource, proxy, proxyport, proxyid, proxypass): def registerHTTPBible(self, biblename, biblesource, proxy, proxyport, proxyid, proxypass):
""" """
Return a list of bibles from a given URL. Return a list of bibles from a given URL.
The selected Bible can then be registered and LazyLoaded into a database The selected Bible can then be registered and LazyLoaded into a database
""" """
if self._isNewBible(name): if self._isNewBible(biblename):
nbible = BibleDBImpl(name) # Create new Bible nbible = BibleDBImpl(biblename) # Create new Bible
nbible.createTables() # Create Database nbible.createTables() # Create Database
self.bibleDBCache[name] = nbible self.bibleDBCache[biblename] = nbible
nhttp = BibleHTTPImpl() nhttp = BibleHTTPImpl()
nhttp.setBibleSource(biblesource) nhttp.setBibleSource(biblesource)
self.bibleHTTPCache[name] = nhttp self.bibleHTTPCache[biblename] = nhttp
nbible.loadMeta("WEB", biblesource) # register a lazy loading interest nbible.loadMeta("WEB", biblesource) # register a lazy loading interest
def registerBible(self, name, booksfile, versefile): def registerFileBible(self, biblename, booksfile, versefile):
""" """
Method to load a bible from a set of files into a database. Method to load a bible from a set of files into a database.
If the database exists it is deleted and the database is reloaded If the database exists it is deleted and the database is reloaded
from scratch. from scratch.
""" """
if self._isNewBible(name): if self._isNewBible(biblename):
nbible = BibleDBImpl(name) # Create new Bible nbible = BibleDBImpl(biblename) # Create new Bible
nbible.createTables() # Create Database nbible.createTables() # Create Database
nbible.loadData(booksfile, versefile) nbible.loadData(booksfile, versefile)
self.bibleDBCache[name] = nbible self.bibleDBCache[biblename] = nbible
def loadBible(self,bible): def loadBible(self,biblename):
print "loadBible ", bible log.debug( "loadBible %s", biblename)
""" """
Downloads all the books of the bible Downloads all the books of the bible
and loads it into the database and loads it into the database
""" """
for bk in self.listOfBooks: for bookname in self.listOfBooks:
cptrs = self.booksChapters[ self.booksOfBible[bk]] cptrs = self.booksChapters[ self.booksOfBible[bookname]]
print bk , self.booksChapters[ self.booksOfBible[bk]] log.debug( "book and chapter %s %s", bookname , self.booksChapters[ self.booksOfBible[bookname]] )
for chptr in range(1 , int(cptrs)): # loop through all the chapters in book for chptr in range(1 , int(cptrs)): # loop through all the chapters in book
c = self.bibleDBCache[bible].getBibleChapter(bk, chptr) # check to see if book/chapter exists c = self.bibleDBCache[biblename].getBibleChapter(bookname, chptr) # check to see if book/chapter exists
print c log.debug( "got chapter %s", c)
if not c: if not c:
print "missing ", bk, chptr log.debug( "missing %s,%s", bookname, chptr)
self._loadBook(bible,bk) self._loadBook(biblename,bookname)
self._loadChapter(bible, bk, chptr) self._loadChapter(biblename, bookname, chptr)
def getBibles(self): def getBibles(self):
""" """
@ -136,64 +148,75 @@ class BibleManager(Plugin):
return self.listOfBooks return self.listOfBooks
def getBookChapterCount(self, book): def getBookChapterCount(self, book):
print "getBookChapterCount ", book log.debug( "getBookChapterCount %s", book)
""" """
Returns all the number of Chapters for a given Returns all the number of Chapters for a given
book book
""" """
i = self.booksOfBible[book] bookid = self.booksOfBible[book]
return self.booksChapters[i] return self.booksChapters[bookid]
def getBookVerseCount(self, book, chapter): def getBookVerseCount(self, book, chapter):
print "getBookVerseCount ", book, chapter log.debug( "getBookVerseCount %s,%s", book, chapter)
""" """
Returns all the number of verses for a given Returns all the number of verses for a given
book and chapter book and chapter
""" """
i = self.booksOfBible[book] bookid = self.booksOfBible[book]
v = self.verseData[i].split(":") v = self.verseData[bookid].split(":")
print v log.debug( v)
return v[chapter-1] # sup 1 for zero indexing return v[chapter-1] # sub 1 for zero indexing
def getVerseText(self, bible, book, chapter, sverse, everse = 0 ): def getVerseText(self, bible, bookname, chapter, sverse, everse = 0 ):
""" """
Returns a list of verses for a given Book, Chapter and ranges of verses. Returns a list of verses for a given Book, Chapter and ranges of verses.
If the end verse(everse) is less then the start verse(sverse) If the end verse(everse) is less then the start verse(sverse)
then only one verse is returned then only one verse is returned
Bible - Which bible
Book - full text description so needs to be converted.
Rest can be guessed at !
""" """
#print self.bibleDBCache #log.debug( self.bibleDBCache)
#print self.bibleHTTPCache #log.debug( self.bibleHTTPCache)
print "getchapter ", bible, book, chapter, sverse, everse log.debug( "getchapter %s,%s,%s,%s,%s", bible, bookname, chapter, sverse, everse)
c = self.bibleDBCache[bible].getBibleChapter(book, chapter) # check to see if book/chapter exists bookid = self.booksOfBible[bookname] # convert to id ie Genesis --> 1 Revelation --> 73
print c # SORT OUT BOOKNAME BOOK ID.
# NAME COMES IN TO ID AND BACK TO NAME ?
c = self.bibleDBCache[bible].getBibleChapter(bookname, chapter) # check to see if book/chapter exists
bookabbrev = ""
log.debug( "Bible Chapter %s", c )
if not c: if not c:
self._loadBook(bible,book) self._loadBook(bible,bookid, bookname, bookabbrev)
self._loadChapter(bible, book, chapter) self._loadChapter(bible, bookid,bookname, chapter)
if everse < sverse: if everse < sverse:
everse = sverse everse = sverse
text = self.bibleDBCache[bible].getBibleText(book, chapter, sverse, everse) text = self.bibleDBCache[bible].getBibleText(bookname, chapter, sverse, everse)
#print text #log.debug( text)
#self.bibleDBCache[bible].dumpBible() #self.bibleDBCache[bible].dumpBible()
return text return text
def _loadBook(self, bible, book): def _loadBook(self, bible, bookid, bookname, bookabbrev):
print "loadbook ", bible, book log.debug( "loadbook %s,%s,%s,%s", bible, bookid, bookname, bookabbrev)
cl = self.bibleDBCache[bible].getBibleBook(book) cl = self.bibleDBCache[bible].getBibleBook(bookname)
#print cl log.debug( "get bible book %s" , cl)
if not cl : if not cl :
self.bibleDBCache[bible].createBook(book) self.bibleDBCache[bible].createBook(bookid, bookname, bookabbrev)
def _loadChapter(self, bible, book, chapter): def _loadChapter(self, bible, bookid,bookname, chapter):
print "loadChapter ", bible, book, chapter log.debug( "loadChapter %s,%s,%s,%s", bible, bookid,bookname, chapter)
chaptlist = self.bibleHTTPCache[bible].getBibleChapter(bible, book, chapter) try :
self.bibleDBCache[bible].createChapter(book, chapter, chaptlist) print self.bibleHTTPCache[bible]
chaptlist = self.bibleHTTPCache[bible].getBibleChapter(bible, bookid,bookname, chapter)
self.bibleDBCache[bible].createChapter(bookname, chapter, chaptlist)
except:
log.error("Bible %s not found in Http cache", bible)
def _isNewBible(self, name): def _isNewBible(self, name):
""" """
Check cache to see if new bible Check cache to see if new bible
""" """
for b , o in self.bibleDBCache.iteritems(): for b , o in self.bibleDBCache.iteritems():
print b log.debug( b )
if b == name : if b == name :
return False return False
return True return True

71
openlp/plugins/biblemanager/test/test_bibleManager.py
View File

@ -27,70 +27,87 @@ sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
from openlp.plugins.biblemanager.BibleManager import BibleManager from openlp.plugins.biblemanager.BibleManager import BibleManager
from openlp.utils import ConfigHelper from openlp.utils import ConfigHelper
import logging
logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
datefmt='%m-%d %H:%M',
filename='plugins.log',
filemode='w')
console=logging.StreamHandler()
# set a format which is simpler for console use
formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
# tell the handler to use this format
console.setFormatter(formatter)
logging.getLogger('').addHandler(console)
log=logging.getLogger('')
logging.info("\nLogging started")
class TestBibleManager: class TestBibleManager:
log=logging.getLogger("testBibleMgr")
def setup_class(self): def setup_class(self):
print "\nRegister BM" log.debug("\n.......Register BM")
self.bm = BibleManager() self.bm = BibleManager()
def testRegisterBibleFiles(self): def testRegisterBibleFiles(self):
# Register a bible from files # Register a bible from files
print "\ntestRegisterBibleFiles" log.debug("\n.......testRegisterBibleFiles")
self.bm.registerBible("TheMessage",'biblebooks_msg_short.csv','bibleverses_msg_short.csv') self.bm.registerFileBible("TheMessage",'biblebooks_msg_short.csv','bibleverses_msg_short.csv')
self.bm.registerBible("NIV",'biblebooks_niv_short.csv','bibleverses_niv_short.csv') self.bm.registerFileBible("NIV",'biblebooks_niv_short.csv','bibleverses_niv_short.csv')
b = self.bm.getBibles() b = self.bm.getBibles()
for b1 in b: for b1 in b:
print b1 log.debug( b1)
assert(b1 in b) assert(b1 in b)
def testRegisterBibleHTTP(self): def testRegisterBibleHTTP(self):
# Register a bible from files # Register a bible from files
print "\ntestRegisterBibleHTTP" log.debug( "\n.......testRegisterBibleHTTP")
self.bm.registerHTTPBible("asv","Crosswalk", "", "", "", "") self.bm.registerHTTPBible("asv","Crosswalk", "", "", "", "")
#self.bm.registerBible("NIV", "ge", 1) #self.bm.registerBible("NIV", "ge", 1)
b = self.bm.getBibles() b = self.bm.getBibles()
for b1 in b: for b1 in b:
print b1 log.debug( b1)
assert(b1 in b) assert(b1 in b)
def testGetBibles(self): def testGetBibles(self):
print "\ntestGetBibles" log.debug( "\n.......testGetBibles")
# make sure the shuffled sequence does not lose any elements # make sure the shuffled sequence does not lose any elements
b = self.bm.getBibles() b = self.bm.getBibles()
for b1 in b: for b1 in b:
print b1 log.debug( b1)
assert(b1 in b) assert(b1 in b)
def testGetBooks(self): def testGetBibleBooks(self):
print "\ntestGetBooks" log.debug( "\n.......testGetBibleBooks")
c = self.bm.getBibleBooks("NIV") c = self.bm.getBibleBooks("NIV")
for c1 in c: for c1 in c:
print c1 log.debug( c1)
assert(c1 in c) assert(c1 in c)
def testGetChapterCount(self): def testGetBookChapterCount(self):
print "\ntestGetChapterCount" log.debug( "\n.......testGetBookChapterCount")
assert(self.bm.getBookChapterCount("Matthew") == '28') assert(self.bm.getBookChapterCount("Matthew") == '28')
def testGetVerseCount(self): def testGetBookVerseCount(self):
print "\ntestGetVerseCount\n" log.debug( "\n.......testGetBookVerseCount")
assert(self.bm.getBookVerseCount("Genesis", 1) == '31') assert(self.bm.getBookVerseCount("Genesis", 1) == '31')
assert(self.bm.getBookVerseCount("Genesis", 2) == '25') assert(self.bm.getBookVerseCount("Genesis", 2) == '25')
assert(self.bm.getBookVerseCount("Matthew", 1) == '25') assert(self.bm.getBookVerseCount("Matthew", 1) == '25')
assert(self.bm.getBookVerseCount("Revelation", 1) == '20') assert(self.bm.getBookVerseCount("Revelation", 1) == '20')
def testGetVerseText(self): def testGetVerseText(self):
print "\ntestGetVerseText" log.debug( "\n.......testGetVerseText")
c = self.bm.getVerseText("TheMessage",'Genesis',1,2, 1) c = self.bm.getVerseText("TheMessage",'Genesis',1,2,1)
print c log.debug( c )
c = self.bm.getVerseText('NIV','Genesis',1,1,2) c = self.bm.getVerseText('NIV','Genesis',1,1,2)
print c log.debug( c )
c = self.bm.getVerseText('asv','re',1,1,2) c = self.bm.getVerseText('asv','Revelation',1,1,2)
print c log.debug( c )
c = self.bm.getVerseText('asv','re',1,5,9) c = self.bm.getVerseText('asv','Revelation',1,5,9)
print c log.debug( c )
def testLoadBible(self): def testLoadBible(self):
print "\ntestLoadBible" log.debug( "\n.......testLoadBible")
self.bm.loadBible('asv') #self.bm.loadBible('asv')