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

Update Bibles and add NIV

Browse Source 
Fix load to delete bibles if already loaded and 2nd load requested

bzr-revno: 32
This commit is contained in:
Tim Bentley 2008-10-23 16:29:17 +00:00
parent 3b493aab23
commit fc913785b9
8 changed files with 103 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openlp/database/BibleImpl.py
View File

@ -50,21 +50,23 @@ class BibleImpl:
def __init__(self, biblename): def __init__(self, biblename):
# Connect to database # Connect to database
path = ConfigHelper.getBiblePath() path = ConfigHelper.getBiblePath()
print path #print path
biblefile = os.path.join(path, biblename+".bible") self.biblefile = os.path.join(path, biblename+".bible")
print biblefile #print self.biblefile
self.db = create_engine("sqlite:///"+biblefile) self.db = create_engine("sqlite:///"+self.biblefile)
self.db.echo = False self.db.echo = False
metadata.bind = self.db metadata.bind = self.db
metadata.bind.echo = False metadata.bind.echo = False
def create_tables(self): def createTables(self):
if os.path.exists(self.biblefile): # delete bible file and set it up again
os.remove(self.biblefile)
meta.create() meta.create()
testament.create() testament.create()
books.create() books.create()
verses.create() verses.create()
def Load_Data(self, booksfile, versesfile): def loadData(self, booksfile, versesfile):
metai =meta.insert() metai =meta.insert()
metai.execute(key="dbversion", value="1") metai.execute(key="dbversion", value="1")

8
openlp/database/BibleManager.py
View File

@ -17,14 +17,15 @@ class BibleManager:
""" """
#if bible != "niv" and bible !="message": #if bible != "niv" and bible !="message":
# raise Exception('Unsupported bible requested ' + bible) # raise Exception('Unsupported bible requested ' + bible)
self.biblelist = {} self.biblelist = {}
self.biblePath = ConfigHelper.getBiblePath() self.biblePath = ConfigHelper.getBiblePath()
print self.biblePath #print self.biblePath
files = os.listdir(self.biblePath) files = os.listdir(self.biblePath)
for f in files: for f in files:
b = f.split('.')[0] b = f.split('.')[0]
self.biblelist[b] = BibleImpl(b) self.biblelist[b] = BibleImpl(b)
print self.biblelist #print self.biblelist
@ -61,6 +62,3 @@ class BibleManager:
print "adjusted end verse" print "adjusted end verse"
everse = sverse everse = sverse
return ["In the Beginning was the Word","God made the world as saw it was good"] return ["In the Beginning was the Word","God made the world as saw it was good"]
bm = BibleManager()

17
openlp/database/test/biblebooks_msg_short.csv
View File

@ -1,9 +1,8 @@
1,1,"Genesis","GEN" 1,1,"Genesis","GEN"
2,1,"Exodus","EXOD" 2,1,"Exodus","EXOD"
3,1,"Leviticus","LEV" 3,1,"Leviticus","LEV"
4,1,"Numbers","NUM" 4,1,"Numbers","NUM"
5,1,"Deuteronomy","DEUT" 47,2,"Matthew","MATT"
47,2,"Matthew","MATT" 48,2,"Mark","MARK"
48,2,"Mark","MARK" 49,2,"Luke","LUKE"
49,2,"Luke","LUKE" 50,2,"John","JOHN"
50,2,"John","JOHN"

1 1 1 Genesis GEN
2 2 1 Exodus EXOD
3 3 1 Leviticus LEV
4 4 1 Numbers NUM
5 5 47 1 2 Deuteronomy Matthew DEUT MATT
6 47 48 2 Matthew Mark MATT MARK
7 48 49 2 Mark Luke MARK LUKE
8 49 50 2 Luke John LUKE JOHN
50 2 John JOHN

9
openlp/database/test/biblebooks_niv_short.csv Normal file
View File

@ -0,0 +1,9 @@
1,1,"Genesis","GEN"
2,1,"Exodus","EXOD"
3,1,"Leviticus","LEV"
4,1,"Numbers","NUM"
46,1,"Malachi","MAL"
47,2,"Matthew","MATT"
48,2,"Mark","MARK"
49,2,"Luke","LUKE"
50,2,"John","JOHN"
1 1 1 Genesis GEN
2 2 1 Exodus EXOD
3 3 1 Leviticus LEV
4 4 1 Numbers NUM
5 46 1 Malachi MAL
6 47 2 Matthew MATT
7 48 2 Mark MARK
8 49 2 Luke LUKE
9 50 2 John JOHN

75
openlp/database/test/bibleverses_msg_short.csv
View File

@ -1,40 +1,35 @@
"Genesis",1,1,"First this: God created the Heavens and Earth - all you see, all you don't see." "Genesis",1,1,"First this: God created the Heavens and Earth - all you see, all you don't see."
"Genesis",1,2,"Earth was a soup of nothingness, a bottomless emptiness, an inky blackness. God's Spirit brooded like a bird above the watery abyss." "Genesis",1,2,"Earth was a soup of nothingness, a bottomless emptiness, an inky blackness. God's Spirit brooded like a bird above the watery abyss."
"Exodus",1,1,"These are the names of the Israelites who went to Egypt with Jacob, each bringing his family members:" "Exodus",1,1,"These are the names of the Israelites who went to Egypt with Jacob, each bringing his family members:"
"Exodus",1,2,"Reuben, Simeon, Levi, and Judah," "Exodus",1,2,"Reuben, Simeon, Levi, and Judah,"
"Exodus",2,1,"A man from the family of Levi married a Levite woman." "Exodus",2,1,"A man from the family of Levi married a Levite woman."
"Exodus",2,2,"The woman became pregnant and had a son. She saw there was something special about him and hid him. She hid him for three months." "Exodus",2,2,"The woman became pregnant and had a son. She saw there was something special about him and hid him. She hid him for three months."
"Leviticus",1,1,"God called Moses and spoke to him from the Tent of Meeting:" "Leviticus",1,1,"God called Moses and spoke to him from the Tent of Meeting:"
"Leviticus",1,2,"""Speak to the People of Israel. Tell them, When anyone presents an offering to God, present an animal from either the herd or the flock." "Leviticus",1,2,"""Speak to the People of Israel. Tell them, When anyone presents an offering to God, present an animal from either the herd or the flock."
"Leviticus",1,3,"""If the offering is a Whole-Burnt-Offering from the herd, present a male without a defect at the entrance to the Tent of Meeting that it may be accepted by God." "Leviticus",1,3,"""If the offering is a Whole-Burnt-Offering from the herd, present a male without a defect at the entrance to the Tent of Meeting that it may be accepted by God."
"Numbers",1,1,"God spoke to Moses in the Wilderness of Sinai at the Tent of Meeting on the first day of the second month in the second year after they had left Egypt. He said," "Numbers",1,1,"God spoke to Moses in the Wilderness of Sinai at the Tent of Meeting on the first day of the second month in the second year after they had left Egypt. He said,"
"Numbers",1,2,"""Number the congregation of the People of Israel by clans and families, writing down the names of every male." "Numbers",1,2,"""Number the congregation of the People of Israel by clans and families, writing down the names of every male."
"Numbers",3,1,"This is the family tree of Aaron and Moses at the time God spoke with Moses on Mount Sinai." "Matthew",1,1,"The family tree of Jesus Christ, David's son, Abraham's son:"
"Numbers",3,2,"The names of the sons of Aaron: Nadab the firstborn, Abihu, Eleazar, and Ithamar -" "Matthew",1,2,"Abraham had Isaac, Isaac had Jacob, Jacob had Judah and his brothers,"
"Numbers",3,3,"anointed priests ordained to serve as priests." "Matthew",1,3,"Judah had Perez and Zerah (the mother was Tamar), Perez had Hezron, Hezron had Aram,"
"Matthew",1,1,"The family tree of Jesus Christ, David's son, Abraham's son:" "Matthew",1,4,"Aram had Amminadab, Amminadab had Nahshon, Nahshon had Salmon,"
"Matthew",1,2,"Abraham had Isaac, Isaac had Jacob, Jacob had Judah and his brothers," "Matthew",1,5,"Salmon had Boaz (his mother was Rahab), Boaz had Obed (Ruth was the mother), Obed had Jesse,"
"Matthew",1,3,"Judah had Perez and Zerah (the mother was Tamar), Perez had Hezron, Hezron had Aram," "Matthew",1,6,"Jesse had David, and David became king. David had Solomon (Uriah's wife was the mother),"
"Matthew",1,4,"Aram had Amminadab, Amminadab had Nahshon, Nahshon had Salmon," "Matthew",1,7,"Solomon had Rehoboam, Rehoboam had Abijah, Abijah had Asa,"
"Matthew",1,5,"Salmon had Boaz (his mother was Rahab), Boaz had Obed (Ruth was the mother), Obed had Jesse," "Matthew",1,8,"Asa had Jehoshaphat, Jehoshaphat had Joram, Joram had Uzziah,"
"Matthew",1,6,"Jesse had David, and David became king. David had Solomon (Uriah's wife was the mother)," "Matthew",2,1,"After Jesus was born in Bethlehem village, Judah territory - this was during Herod's kingship - a band of scholars arrived in Jerusalem from the East."
"Matthew",1,7,"Solomon had Rehoboam, Rehoboam had Abijah, Abijah had Asa," "Matthew",2,2,"They asked around, ""Where can we find and pay homage to the newborn King of the Jews? We observed a star in the eastern sky that "Matthew",3,1,"While Jesus was living in the Galilean hills, John, called ""the Baptizer,"" was preaching in the desert country of Judea."
"Matthew",1,8,"Asa had Jehoshaphat, Jehoshaphat had Joram, Joram had Uzziah," "Matthew",3,2,"His message was simple and austere, like his desert surroundings: ""Change your life. God's kingdom is here."""
"Matthew",2,1,"After Jesus was born in Bethlehem village, Judah territory - this was during Herod's kingship - a band of scholars arrived in Jerusalem from the East." "Matthew",3,3,"John and his message were authorized by Isaiah's prophecy: Thunder in the desert! Prepare for God's arrival! Make the road smooth and straight!"
"Matthew",2,2,"They asked around, ""Where can we find and pay homage to the newborn King of the Jews? We observed a star in the eastern sky that "Matthew",3,1,"While Jesus was living in the Galilean hills, John, called ""the Baptizer,"" was preaching in the desert country of Judea." "Mark",1,1,"The good news of Jesus Christ - the Message! - begins here,"
"Matthew",3,2,"His message was simple and austere, like his desert surroundings: ""Change your life. God's kingdom is here.""" "Mark",1,2,"following to the letter the scroll of the prophet Isaiah. Watch closely: I'm sending my preacher ahead of you; He'll make the road smooth for you."
"Matthew",3,3,"John and his message were authorized by Isaiah's prophecy: Thunder in the desert! Prepare for God's arrival! Make the road smooth and straight!" "Mark",1,3,"Thunder in the desert! Prepare for God's arrival! Make the road smooth and straight!"
"Mark",1,1,"The good news of Jesus Christ - the Message! - begins here," "Luke",1,1,"So many others have tried their hand at putting together a story of the wonderful harvest of Scripture and history that took place among us,"
"Mark",1,2,"following to the letter the scroll of the prophet Isaiah. Watch closely: I'm sending my preacher ahead of you; He'll make the road smooth for you." "Luke",1,2,"using reports handed down by the original eyewitnesses who served this Word with their very lives."
"Mark",1,3,"Thunder in the desert! Prepare for God's arrival! Make the road smooth and straight!" "Luke",1,3,"Since I have investigated all the reports in close detail, starting from the story's beginning, I decided to write it all out for you, most honorable Theophilus,"
"Mark",5,1,"They arrived on the other side of the sea in the country of the Gerasenes." "John",1,1,"The Word was first, the Word present to God, God present to the Word. The Word was God,"
"Mark",5,2,"As Jesus got out of the boat, a madman from the cemetery came up to him." "John",1,2,"in readiness for God from day one."
"Luke",1,1,"So many others have tried their hand at putting together a story of the wonderful harvest of Scripture and history that took place among us," "John",1,3,"Everything was created through him; nothing - not one thing! - came into being without him."
"Luke",1,2,"using reports handed down by the original eyewitnesses who served this Word with their very lives." "John",2,1,"Three days later there was a wedding in the village of Cana in Galilee. Jesus' mother was there."
"Luke",1,3,"Since I have investigated all the reports in close detail, starting from the story's beginning, I decided to write it all out for you, most honorable Theophilus," "John",2,2,"Jesus and his disciples were guests also."
"John",1,1,"The Word was first, the Word present to God, God present to the Word. The Word was God," "John",2,3,"When they started running low on wine at the wedding banquet, Jesus' mother told him, ""They're just about out of wine."""
"John",1,2,"in readiness for God from day one."
"John",1,3,"Everything was created through him; nothing - not one thing! - came into being without him."
"John",2,1,"Three days later there was a wedding in the village of Cana in Galilee. Jesus' mother was there."
"John",2,2,"Jesus and his disciples were guests also."
"John",2,3,"When they started running low on wine at the wedding banquet, Jesus' mother told him, ""They're just about out of wine."""

Can't render this file because it contains an unexpected character in line 21 and column 146.

35
openlp/database/test/bibleverses_niv_short.csv Normal file
View File

@ -0,0 +1,35 @@
"Genesis",1,1,"In the beginning God created the heavens and the earth."
"Genesis",1,2,"Now the earth was formless and empty, darkness was over the surface of the deep, and the Spirit of God was hovering over the waters."
"Exodus",1,1,"These are the names of the sons of Israel who went to Egypt with Jacob, each with his family:"
"Exodus",1,2,"Reuben, Simeon, Levi and Judah;"
"Exodus",2,1,"Now a man of the house of Levi married a Levite woman,"
"Exodus",2,2,"and she became pregnant and gave birth to a son. When she saw that he was a fine child, she hid him for three months."
"Leviticus",1,1,"The Lord called to Moses and spoke to him from the Tent of Meeting. He said,"
"Leviticus",1,2,"""Speak to the Israelites and say to them: 'When any of you brings an offering to the Lord, bring as your offering an animal from either the herd or the flock."
"Leviticus",1,3,"""'If the offering is a burnt offering from the herd, he is to offer a male without defect. He must present it at the entrance to the Tent of Meeting so that it will be acceptable to the Lord."
"Numbers",1,1,"The Lord spoke to Moses in the Tent of Meeting in the Desert of Sinai on the first day of the second month of the second year after the Israelites came out of Egypt. He said:"
"Numbers",1,2,"""Take a census of the whole Israelite community by their clans and families, listing every man by name, one by one."
"Matthew",1,1,"A record of the genealogy of Jesus Christ the son of David, the son of Abraham:"
"Matthew",1,2,"Abraham was the father of Isaac,"
"Matthew",1,3,"Judah the father of Perez and Zerah, whose mother was Tamar,"
"Matthew",1,4,"Ram the father of Amminadab,"
"Matthew",1,5,"Salmon the father of Boaz, whose mother was Rahab,"
"Matthew",1,6,"and Jesse the father of King David."
"Matthew",1,7,"Solomon the father of Rehoboam,"
"Matthew",1,8,"Asa the father of Jehoshaphat,"
"Matthew",2,1,"After Jesus was born in Bethlehem in Judea, during the time of King Herod, Magi from the east came to Jerusalem"
"Matthew",2,2,"and asked, ""Where is the one who has been born king of the Jews? We saw his star in the east and have come to worship "Matthew",3,1,"In those days John the Baptist came, preaching in the Desert of Judea"
"Matthew",3,2,"and saying, ""Repent, for the kingdom of heaven is near."""
"Matthew",3,3,"This is he who was spoken of through the prophet Isaiah: ""A voice of one calling in the desert, 'Prepare the way for the Lord, make straight paths for him.'"""
"Mark",1,1,"The beginning of the gospel about Jesus Christ, the Son of God."
"Mark",1,2,"It is written in Isaiah the prophet: ""I will send my messenger ahead of you, who will prepare your way""--"
"Mark",1,3,"""a voice of one calling in the desert, 'Prepare the way for the Lord, make straight paths for him.'"""
"Luke",1,1,"Many have undertaken to draw up an account of the things that have been fulfilled among us,"
"Luke",1,2,"just as they were handed down to us by those who from the first were eyewitnesses and servants of the word."
"Luke",1,3,"Therefore, since I myself have carefully investigated everything from the beginning, it seemed good also to me to write an orderly account for you, most excellent Theophilus,"
"John",1,1,"In the beginning was the Word, and the Word was with God, and the Word was God."
"John",1,2,"He was with God in the beginning."
"John",1,3,"Through him all things were made; without him nothing was made that has been made."
"John",2,1,"On the third day a wedding took place at Cana in Galilee. Jesus' mother was there,"
"John",2,2,"and Jesus and his disciples had also been invited to the wedding."
"John",2,3,"When the wine was gone, Jesus' mother said to him, ""They have no more wine."""
Can't render this file because it contains an unexpected character in line 21 and column 135.

8
openlp/database/test/testBibleLoader.py
View File

@ -7,11 +7,11 @@ from openlp.database.BibleImpl import *
if __name__ == "__main__": if __name__ == "__main__":
bi = BibleImpl("TheMessage") bi = BibleImpl("TheMessage")
bi.create_tables() bi.createTables()
bi.Load_Data('biblebooks_msg_short.csv','bibleverses_msg_short.csv') bi.loadData('biblebooks_msg_short.csv','bibleverses_msg_short.csv')
bi.Run_Tests() bi.Run_Tests()
b2 = BibleImpl("NIV") b2 = BibleImpl("NIV")
b2.create_tables() b2.createTables()
b2.Load_Data('biblebooks_msg_short.csv','bibleverses_msg_short.csv') b2.loadData('biblebooks_niv_short.csv','bibleverses_niv_short.csv')
b2.Run_Tests() b2.Run_Tests()

1
openlp/database/test/testBibleManager.py
View File

@ -6,6 +6,7 @@ sys.path.insert(0,(os.path.join(mypath, '..', '..','..')))
from openlp.database.BibleManager import * from openlp.database.BibleManager import *
bm = BibleManager() bm = BibleManager()
print bm
print bm.getBibles() print bm.getBibles()
b = bm.getBibles() b = bm.getBibles()
for b1 in b: for b1 in b: