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

Fixed a bug with Strongs in CrossWalk.

Browse Source 
bzr-revno: 771
This commit is contained in:
Raoul Snyman 2010-03-26 23:16:07 +02:00
commit 48d6127b7c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import logging
import urllib2 import urllib2
import os import os
import sqlite3 import sqlite3
import re
from BeautifulSoup import BeautifulSoup, Tag, NavigableString from BeautifulSoup import BeautifulSoup, Tag, NavigableString
@ -293,18 +294,22 @@ class CWExtract(BibleCommon):
soup = BeautifulSoup(page) soup = BeautifulSoup(page)
htmlverses = soup.findAll(u'span', u'versetext') htmlverses = soup.findAll(u'span', u'versetext')
verses = {} verses = {}
reduce_spaces = re.compile(r'[ ]{2,}')
for verse in htmlverses: for verse in htmlverses:
Receiver.send_message(u'process_events') Receiver.send_message(u'process_events')
versenumber = int(verse.contents[0].contents[0]) versenumber = int(verse.contents[0].contents[0])
versetext = u'' versetext = u''
for part in verse.contents: for part in verse.contents:
if str(part)[0] != u'<': if isinstance(part, NavigableString):
versetext = versetext + part versetext = versetext + part
elif part and part.attrMap and part.attrMap[u'class'] == u'WordsOfChrist': elif part and part.attrMap and \
(part.attrMap[u'class'] == u'WordsOfChrist' or \
part.attrMap[u'class'] == u'strongs'):
for subpart in part.contents: for subpart in part.contents:
if str(subpart)[0] != '<': if isinstance(subpart, NavigableString):
versetext = versetext + subpart versetext = versetext + subpart
versetext = versetext.strip(u'\n\r\t ') versetext = versetext.strip(u'\n\r\t ')
versetext = reduce_spaces.sub(u' ', versetext)
verses[versenumber] = versetext verses[versenumber] = versetext
return SearchResults(bookname, chapter, verses) return SearchResults(bookname, chapter, verses)