From e0a2976fa91a03da49c4f608b5722d97d9fb40ba Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Tue, 11 Jan 2011 23:43:27 +0000
Subject: [PATCH] Fix BibleServer downloads (Bug #701651)

---
 openlp/core/utils/__init__.py     | 10 ++++++++--
 openlp/plugins/bibles/lib/http.py | 10 +++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 4e1b4807b..5274a6186 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -282,13 +282,16 @@ def split_filename(path):
     else:
         return os.path.split(path)
 
-def get_web_page(url, update_openlp=False):
+def get_web_page(url, header=None, update_openlp=False):
     """
     Attempts to download the webpage at url and returns that page or None.
 
     ``url``
         The URL to be downloaded.
 
+    ``header``
+        An optional HTTP header to pass in the request to the web server.
+
     ``update_openlp``
         Tells OpenLP to update itself if the page is successfully downloaded.
         Defaults to False.
@@ -298,10 +301,13 @@ def get_web_page(url, update_openlp=False):
     # http://docs.python.org/library/urllib2.html
     if not url:
         return None
+    req = urllib2.Request(url)
+    if header:
+        req.add_header(header[0], header[1])
     page = None
     log.debug(u'Downloading URL = %s' % url)
     try:
-        page = urllib2.urlopen(url)
+        page = urllib2.urlopen(req)
         log.debug(u'Downloaded URL = %s' % page.geturl())
     except urllib2.URLError:
         log.exception(u'The web page could not be downloaded')
diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py
index 54fb5237c..2476ae65d 100644
--- a/openlp/plugins/bibles/lib/http.py
+++ b/openlp/plugins/bibles/lib/http.py
@@ -264,7 +264,8 @@ class BSExtract(object):
         log.debug(u'get_bible_chapter %s,%s,%s', version, bookname, chapter)
         chapter_url = u'http://m.bibleserver.com/text/%s/%s%s' % \
             (version, bookname, chapter)
-        soup = get_soup_for_bible_ref(chapter_url)
+        header = (u'Accept-Language', u'en')
+        soup = get_soup_for_bible_ref(chapter_url, header)
         if not soup:
             return None
         Receiver.send_message(u'openlp_process_events')
@@ -496,19 +497,22 @@ class HTTPBible(BibleDB):
         """
         return HTTPBooks.get_verse_count(book, chapter)
 
-def get_soup_for_bible_ref(reference_url, cleaner=None):
+def get_soup_for_bible_ref(reference_url, header=None, cleaner=None):
     """
     Gets a webpage and returns a parsed and optionally cleaned soup or None.
 
     ``reference_url``
         The URL to obtain the soup from.
 
+    ``header``
+        An optional HTTP header to pass to the bible web server.
+
     ``cleaner``
         An optional regex to use during webpage parsing.
     """
     if not reference_url:
         return None
-    page = get_web_page(reference_url, True)
+    page = get_web_page(reference_url, header, True)
     if not page:
         send_error_message(u'download')
         return None