forked from openlp/openlp
More bible changes
This commit is contained in:
parent
0273fd508f
commit
1bca1cf4cf
|
@ -28,7 +28,7 @@ from datetime import datetime
|
||||||
from registry import Registry
|
from registry import Registry
|
||||||
from confighelper import ConfigHelper
|
from confighelper import ConfigHelper
|
||||||
|
|
||||||
log = logging.getLogger()
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
__all__ = ['Registry', 'ConfigHelper']
|
__all__ = ['Registry', 'ConfigHelper']
|
||||||
|
|
||||||
|
|
|
@ -290,7 +290,13 @@ class BibleManager(object):
|
||||||
log.debug(u'get_book_verse_count %s,%s,%s', bible, book, chapter)
|
log.debug(u'get_book_verse_count %s,%s,%s', bible, book, chapter)
|
||||||
web, bible = self.is_bible_web(bible)
|
web, bible = self.is_bible_web(bible)
|
||||||
if web:
|
if web:
|
||||||
return int(99)
|
count = self.bible_db_cache[bible].get_max_bible_book_verses(
|
||||||
|
book, chapter)
|
||||||
|
if count == 0:
|
||||||
|
text = self.get_verse_text(bible, book, chapter, chapter, 1, 1)
|
||||||
|
count = self.bible_db_cache[bible].get_max_bible_book_verses(
|
||||||
|
book, chapter)
|
||||||
|
return count
|
||||||
else:
|
else:
|
||||||
return self.bible_db_cache[bible].get_max_bible_book_verses(
|
return self.bible_db_cache[bible].get_max_bible_book_verses(
|
||||||
book, chapter)
|
book, chapter)
|
||||||
|
@ -301,6 +307,7 @@ class BibleManager(object):
|
||||||
book and chapterMaxBibleBookVerses
|
book and chapterMaxBibleBookVerses
|
||||||
"""
|
"""
|
||||||
log.debug(u'get_verses_from_text %s,%s', bible, versetext)
|
log.debug(u'get_verses_from_text %s,%s', bible, versetext)
|
||||||
|
web, bible = self.is_bible_web(bible)
|
||||||
return self.bible_db_cache[bible].get_verses_from_text(versetext)
|
return self.bible_db_cache[bible].get_verses_from_text(versetext)
|
||||||
|
|
||||||
def save_meta_data(self, bible, version, copyright, permissions):
|
def save_meta_data(self, bible, version, copyright, permissions):
|
||||||
|
@ -318,6 +325,7 @@ class BibleManager(object):
|
||||||
Returns the meta data for a given key
|
Returns the meta data for a given key
|
||||||
"""
|
"""
|
||||||
log.debug(u'get_meta %s,%s', bible, key)
|
log.debug(u'get_meta %s,%s', bible, key)
|
||||||
|
web, bible = self.is_bible_web(bible)
|
||||||
return self.bible_db_cache[bible].get_meta(key)
|
return self.bible_db_cache[bible].get_meta(key)
|
||||||
|
|
||||||
def get_verse_text(self, bible, bookname, schapter, echapter, sverse,
|
def get_verse_text(self, bible, bookname, schapter, echapter, sverse,
|
||||||
|
@ -338,6 +346,7 @@ class BibleManager(object):
|
||||||
bible, bookname, schapter, echapter, sverse, everse)
|
bible, bookname, schapter, echapter, sverse, everse)
|
||||||
# check to see if book/chapter exists fow HTTP bibles and load cache
|
# check to see if book/chapter exists fow HTTP bibles and load cache
|
||||||
# if necessary
|
# if necessary
|
||||||
|
web, bible = self.is_bible_web(bible)
|
||||||
if self.bible_http_cache[bible] is not None:
|
if self.bible_http_cache[bible] is not None:
|
||||||
book = self.bible_db_cache[bible].get_bible_book(bookname)
|
book = self.bible_db_cache[bible].get_bible_book(bookname)
|
||||||
if book is None:
|
if book is None:
|
||||||
|
|
|
@ -298,14 +298,14 @@ class BibleMediaItem(MediaManagerItem):
|
||||||
self.adjustComboBox(frm, self.verses, self.AdvancedToVerse)
|
self.adjustComboBox(frm, self.verses, self.AdvancedToVerse)
|
||||||
|
|
||||||
def onAdvancedToChapter(self):
|
def onAdvancedToChapter(self):
|
||||||
text1 = self.AdvancedFromChapter.currentText()
|
text1 = unicode(self.AdvancedFromChapter.currentText())
|
||||||
text2 = self.AdvancedToChapter.currentText()
|
text2 = unicode(self.AdvancedToChapter.currentText())
|
||||||
if text1 != text2:
|
if text1 != text2:
|
||||||
bible = unicode(self.AdvancedVersionComboBox.currentText())
|
bible = unicode(self.AdvancedVersionComboBox.currentText())
|
||||||
book = unicode(self.AdvancedBookComboBox.currentText())
|
book = unicode(self.AdvancedBookComboBox.currentText())
|
||||||
# get the verse count for new chapter
|
# get the verse count for new chapter
|
||||||
verses = self.parent.biblemanager.get_book_verse_count(
|
verses = self.parent.biblemanager.get_book_verse_count(
|
||||||
bible, book, int(text2))[0]
|
bible, book, int(text2))
|
||||||
self.adjustComboBox(1, verses, self.AdvancedToVerse)
|
self.adjustComboBox(1, verses, self.AdvancedToVerse)
|
||||||
|
|
||||||
def onAdvancedSearchButton(self):
|
def onAdvancedSearchButton(self):
|
||||||
|
@ -325,11 +325,10 @@ class BibleMediaItem(MediaManagerItem):
|
||||||
def onAdvancedFromChapter(self):
|
def onAdvancedFromChapter(self):
|
||||||
bible = unicode(self.AdvancedVersionComboBox.currentText())
|
bible = unicode(self.AdvancedVersionComboBox.currentText())
|
||||||
book = unicode(self.AdvancedBookComboBox.currentText())
|
book = unicode(self.AdvancedBookComboBox.currentText())
|
||||||
cf = self.AdvancedFromChapter.currentText()
|
cf = int(self.AdvancedFromChapter.currentText())
|
||||||
self.adjustComboBox(cf, self.chapters_from, self.AdvancedToChapter)
|
self.adjustComboBox(cf, self.chapters_from, self.AdvancedToChapter)
|
||||||
# get the verse count for new chapter
|
# get the verse count for new chapter
|
||||||
vse = self.parent.biblemanager.get_book_verse_count(bible, book,
|
vse = self.parent.biblemanager.get_book_verse_count(bible, book, cf)
|
||||||
int(cf))[0]
|
|
||||||
self.adjustComboBox(1, vse, self.AdvancedFromVerse)
|
self.adjustComboBox(1, vse, self.AdvancedFromVerse)
|
||||||
self.adjustComboBox(1, vse, self.AdvancedToVerse)
|
self.adjustComboBox(1, vse, self.AdvancedToVerse)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue