Fix doc text location

This commit is contained in:
Jon Tibble 2010-07-30 13:04:15 +01:00
parent 26bae2e35b
commit 9df8cb11f9
1 changed files with 14 additions and 17 deletions

View File

@ -32,23 +32,6 @@ import re
log = logging.getLogger(__name__)
###############################################################################
# BIBLE_REFERENCE regular expression produces the following match groups:
#
# 0 This is a special group consisting of the whole string that matched.
# 1 [\w ]+ The book the reference is from.
# 2 [0-9]+ The first (possibly only) chapter in the reference.
# 3 None|[0-9]+ None or the only verse or the first verse in a
# verse range or the start verse in a chapter range.
# 4 None|[0-9]+|end None or the end verse of the first verse range or
# the end chapter of a chapter range.
# 5 None|[0-9]+ None or the second chapter in multiple (non-ranged)
# chapters.
# 6 None|[0-9]+|end None, the start of the second verse range or the
# end of a chapter range.
# 7 None|[0-9]+|end None or the end of the second verse range.
###############################################################################
BIBLE_REFERENCE = re.compile(
r'^([\w ]+?) *([0-9]+)' # Initial book and chapter
r'(?: *[:|v|V] *([0-9]+))?' # Verse for first chapter
@ -77,6 +60,20 @@ def parse_reference(reference):
and converts it to a reference list, a list of references to be queried
from the Bible database files.
BIBLE_REFERENCE regular expression produces the following match groups:
0 This is a special group consisting of the whole string that matched.
1 [\w ]+ The book the reference is from.
2 [0-9]+ The first (or only) chapter in the reference.
3 None|[0-9]+ None or the only verse or the first verse in a
verse range or the start verse in a chapter range.
4 None|[0-9]+|end None or the end verse of the first verse range or
the end chapter of a chapter range.
5 None|[0-9]+ None or the second chapter in multiple
(non-ranged) chapters.
6 None|[0-9]+|end None, the start of the second verse range or the
end of a chapter range.
7 None|[0-9]+|end None or the end of the second verse range.
The reference list is a list of tuples, with each tuple structured like
this::
(book, chapter, start_verse, end_verse)