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

Fix load bugs on 1st time for bible chapter. 

bzr-revno: 344
This commit is contained in:
Tim Bentley 2009-02-23 20:56:54 +00:00
parent 814c9ad79a
commit db2dd4cd87
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/plugins/bibles/bibleplugin.py
View File

@ -497,6 +497,7 @@ class BiblePlugin(Plugin, PluginUtils):
start_verse=""
end_verse=""
search.replace(" ", " ")
search = search.strip()
original = search
message = None
# Remove book

4
openlp/plugins/bibles/forms/bibleimportform.py
View File

@ -146,7 +146,7 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog, PluginUtils):
if not self.bible_type == None and len(self.BibleNameEdit.displayText()) > 0:
self.MessageLabel.setText("Import Started")
self.ProgressBar.setMinimum(0)
self.setMax(65)
self.set_max(65)
self.ProgressBar.setValue(0)
self.biblemanager.process_dialog(self)
self._import_bible()
@ -171,7 +171,7 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog, PluginUtils):
elif self.bible_type == "CSV":
self.biblemanager.register_csv_file_bible(str(self.BibleNameEdit.displayText()), self.BooksLocationEdit.displayText(), self.VerseLocationEdit.displayText())
else:
self.setMax(1) # set a value as it will not be needed
self.set_max(1) # set a value as it will not be needed
bible = self.bible_versions[str(self.BibleComboBox.currentText())]
self.biblemanager.register_http_bible(str(self.BibleComboBox.currentText()), \
str(self.LocationComboBox.currentText()), \

6
openlp/plugins/bibles/lib/bibleDBimpl.py
View File

@ -74,10 +74,12 @@ class BibleDBImpl(BibleCommon):
session.commit()
def create_chapter(self, bookid, chap, textlist):
log.debug( "create_chapter %s,%s", bookid, chap)
log.debug( "create_chapter %s,%s", bookid, chap)
#log.debug("Text %s ", textlist)
metadata.bind.echo = False
session = self.session()
for v , t in textlist.iteritems():
#text list has book and chapter as first to elements of the array
for v , t in textlist[2].iteritems():
verse = Verse()
verse.book_id = bookid
verse.chapter = chap

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

@ -77,7 +77,10 @@ class BibleManager():
nhttp = BibleHTTPImpl()
nhttp.set_bible_source(biblesource.value) # tell The Server where to get the verses from.
self.bible_http_cache [bname] = nhttp
proxy = self.bible_db_cache[bname].get_meta("proxy").value # look to see if lazy load bible exists and get create getter.
meta = self.bible_db_cache[bname].get_meta("proxy") # look to see if lazy load bible exists and get create getter.
proxy = None
if meta != None:
proxy = meta.value
nhttp.set_proxy(proxy) # tell The Server where to get the verses from.
bibleid = self.bible_db_cache[bname].get_meta("bibleid").value # look to see if lazy load bible exists and get create getter.
nhttp.set_bibleid(bibleid) # tell The Server where to get the verses from.
@ -230,17 +233,22 @@ class BibleManager():
if book == None:
log.debug("get_verse_text : new book")
for chapter in range(schapter, echapter+1):
book_name, book_chapter, chaptlist = self.bible_http_cache [bible].get_bible_chapter(bible, 0, bookname, chapter)
if chaptlist != {}:
chaptlist = self.bible_http_cache [bible].get_bible_chapter(bible, 0, bookname, chapter)
## chaplist contains 3 elements
## 0 - Book name
## 1 - Chapter Name
## 2 - Chapter list
if chaptlist[2] != {}:
## We have found a book of the bible lets check to see if it was there.
## By reusing the returned book name we get a correct book.
## For example it is possible to request ac and get Acts back.
bookname = book_name
bookname = chaptlist[0]
book= self.bible_db_cache[bible].get_bible_book(bookname) # check to see if book/chapter exists
if book == None:
## Then create book, chapter and text
book = self.bible_db_cache[bible].create_book(bookname, self.book_abbreviations[bookname], self.book_testaments[bookname])
self.bible_db_cache[bible].create_chapter(book.id, book_chapter, chaptlist)
log.debug("New http book %s , %s, %s", book, book.id, book.name)
self.bible_db_cache[bible].create_chapter(book.id, chaptlist[1], chaptlist)
else:
## Book exists check chapter and texts only.
v = self.bible_db_cache[bible].get_bible_chapter(book.id, chapter)