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

Revert resources location patch

Browse Source 
bzr-revno: 846
This commit is contained in:
Jon Tibble 2010-06-14 19:07:47 +01:00
commit 58f3dc1acb
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,8 +322,8 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
Load the list of Crosswalk and BibleGateway bibles.
"""
#Load and store Crosswalk Bibles
filepath = os.path.join(AppLocation.get_section_data_path(
self.bibleplugin.settingsSection), u'resources')
filepath = AppLocation.get_directory(AppLocation.PluginsDir)
filepath = os.path.join(filepath, u'bibles', u'resources')
try:
self.web_bible_list[WebDownload.Crosswalk] = {}
books_file = open(

4
openlp/plugins/bibles/lib/http.py
View File

@ -56,8 +56,8 @@ class HTTPBooks(object):
"""
if HTTPBooks.cursor is None:
filepath = os.path.join(
AppLocation.get_section_data_path(u'bibles'), u'resources',
u'httpbooks.sqlite')
AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
u'resources', u'httpbooks.sqlite')
conn = sqlite3.connect(filepath)
HTTPBooks.cursor = conn.cursor()
return HTTPBooks.cursor

5
openlp/plugins/bibles/lib/osis.py
View File

@ -68,8 +68,9 @@ class OSISBible(BibleDB):
self.trans_regex = re.compile(r'<transChange(.*?)>(.*?)</transChange>')
self.spaces_regex = re.compile(r'([ ]{2,})')
self.books = {}
filepath = os.path.join(AppLocation.get_section_data_path(
self.bible_plugin.settingsSection), u'resources', u'osisbooks.csv')
filepath = os.path.join(
AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
u'resources', u'osisbooks.csv')
fbibles = None
try:
fbibles = open(filepath, u'r')