Update web/core/scripture_normalizer.py
This commit is contained in:
parent
3375e625aa
commit
93b772324a
@ -1,222 +1,248 @@
|
|||||||
# core/scripture_normalizer.py
|
# core/scripture_normalizer.py
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
import re
|
import re
|
||||||
from typing import Dict, List, Tuple
|
from typing import Dict, List, Tuple, Optional
|
||||||
|
|
||||||
# --- Book map (common full names + abbreviations -> canonical abbr) ---
|
# =========================
|
||||||
BOOK_CANON = {
|
# Canonical book abbreviations
|
||||||
# OT
|
# =========================
|
||||||
"genesis": "Gen.", "gen": "Gen.", "genesisesis": "Gen.", "genesis sis": "Gen.", "ge": "Gen.",
|
# House style (edit as you like). Keys are normalized to lower-case without periods.
|
||||||
"exodus": "Ex.", "ex": "Ex.", "exo": "Ex.", "exod": "Ex.", "exodus.": "Ex.",
|
BOOK_CANON: Dict[str, str] = {
|
||||||
|
# ----- OT -----
|
||||||
|
"genesis": "Gen.", "gen": "Gen.", "ge": "Gen.", "gn": "Gen.", "genesisesis": "Gen.",
|
||||||
|
"exodus": "Ex.", "ex": "Ex.", "exo": "Ex.",
|
||||||
"leviticus": "Lev.", "lev": "Lev.", "le": "Lev.",
|
"leviticus": "Lev.", "lev": "Lev.", "le": "Lev.",
|
||||||
"numbers": "Num.", "num": "Num.", "nums": "Num.", "nu": "Num.",
|
"numbers": "Num.", "num": "Num.", "nu": "Num.", "nums": "Num.",
|
||||||
"deuteronomy": "Deut.", "deut": "Deut.", "deu": "Deut.", "de": "Deut.", "deutronomy": "Deut.", "deut.": "Deut.",
|
"deuteronomy": "Deut.", "deut": "Deut.", "deu": "Deut.", "dt": "Deut.", "deutronomy": "Deut.",
|
||||||
"joshua": "Josh.", "josh": "Josh.", "jos": "Josh.",
|
"joshua": "Josh.", "josh": "Josh.", "jos": "Josh.",
|
||||||
"judges": "Judg.", "judg": "Judg.", "judg.": "Judg.", "judg": "Judg.",
|
"judges": "Judg.", "judg": "Judg.", "jdg": "Judg.",
|
||||||
"ruth": "Ruth",
|
"ruth": "Ruth", "ru": "Ruth",
|
||||||
"1 samuel": "1 Sam.", "i samuel": "1 Sam.", "1 sam": "1 Sam.", "1sa": "1 Sam.",
|
"1 samuel": "1 Sam.", "i samuel": "1 Sam.", "1 sam": "1 Sam.", "1sam": "1 Sam.", "1sa": "1 Sam.",
|
||||||
"2 samuel": "2 Sam.", "ii samuel": "2 Sam.", "2 sam": "2 Sam.", "2sa": "2 Sam.",
|
"2 samuel": "2 Sam.", "ii samuel": "2 Sam.", "2 sam": "2 Sam.", "2sam": "2 Sam.", "2sa": "2 Sam.",
|
||||||
"1 kings": "1 Ki.", "i kings": "1 Ki.", "1 ki": "1 Ki.", "1kgs": "1 Ki.", "1 kgs": "1 Ki.", "1ki": "1 Ki.",
|
"1 kings": "1 Ki.", "i kings": "1 Ki.", "1 ki": "1 Ki.", "1kgs": "1 Ki.", "1 kgs": "1 Ki.", "1kings": "1 Ki.", "1ki": "1 Ki.",
|
||||||
"2 kings": "2 Ki.", "ii kings": "2 Ki.", "2 ki": "2 Ki.", "2kgs": "2 Ki.", "2 kgs": "2 Ki.", "2ki": "2 Ki.",
|
"2 kings": "2 Ki.", "ii kings": "2 Ki.", "2 ki": "2 Ki.", "2kgs": "2 Ki.", "2 kgs": "2 Ki.", "2kings": "2 Ki.", "2ki": "2 Ki.",
|
||||||
"1 chronicles": "1 Chron.", "i chronicles": "1 Chron.", "1 chron": "1 Chron.", "1 ch": "1 Chron.", "1ch": "1 Chron.",
|
"1 chronicles": "1 Chron.", "i chronicles": "1 Chron.", "1 chron": "1 Chron.", "1ch": "1 Chron.", "1chron": "1 Chron.",
|
||||||
"2 chronicles": "2 Chron.", "ii chronicles": "2 Chron.", "2 chron": "2 Chron.", "2 ch": "2 Chron.", "2ch": "2 Chron.",
|
"2 chronicles": "2 Chron.", "ii chronicles": "2 Chron.", "2 chron": "2 Chron.", "2ch": "2 Chron.", "2chron": "2 Chron.",
|
||||||
"ezra": "Ezra",
|
"ezra": "Ezra", "ezr": "Ezra",
|
||||||
"nehemiah": "Neh.", "neh": "Neh.", "ne": "Neh.",
|
"nehemiah": "Neh.", "neh": "Neh.",
|
||||||
"esther": "Esth.", "esth": "Esth.",
|
"esther": "Esth.", "esth": "Esth.", "es": "Esth.",
|
||||||
"job": "Job",
|
"job": "Job",
|
||||||
"psalm": "Ps.", "psalms": "Ps.", "ps": "Ps.", "ps.": "Ps.", "pss": "Ps.",
|
"psalm": "Ps.", "psalms": "Ps.", "ps": "Ps.", "psm": "Ps.", "pss": "Ps.",
|
||||||
"proverbs": "Prov.", "prov": "Prov.", "prov.": "Prov.", "pr": "Prov.",
|
"proverbs": "Prov.", "prov": "Prov.", "pr": "Prov.",
|
||||||
"ecclesiastes": "Eccl.", "eccles": "Eccl.", "eccl": "Eccl.", "ecclesiastes.": "Eccl.", "ecc": "Eccl.", "ec": "Eccl.",
|
"ecclesiastes": "Eccl.", "eccles": "Eccl.", "eccl": "Eccl.", "ecc": "Eccl.", "ec": "Eccl.",
|
||||||
"song of solomon": "Song", "song of songs": "Song", "song": "Song",
|
"song of solomon": "Song", "song of songs": "Song", "song": "Song", "so": "Song", "sos": "Song",
|
||||||
"isaiah": "Isa.", "isa": "Isa.", "is": "Isa.",
|
"isaiah": "Isa.", "isa": "Isa.", "is": "Isa.",
|
||||||
"jeremiah": "Jer.", "jer": "Jer.", "jer.": "Jer.", "je": "Jer.",
|
"jeremiah": "Jer.", "jer": "Jer.", "je": "Jer.",
|
||||||
"lamentations": "Lam.", "lam": "Lam.", "la": "Lam.",
|
"lamentations": "Lam.", "lam": "Lam.", "la": "Lam.",
|
||||||
"ezekiel": "Ezek.", "ezek": "Ezek.", "eze": "Ezek.",
|
"ezekiel": "Ezek.", "ezek": "Ezek.", "eze": "Ezek.", "ezk": "Ezek.",
|
||||||
"daniel": "Dan.", "dan": "Dan.", "da": "Dan.",
|
"daniel": "Dan.", "dan": "Dan.", "da": "Dan.",
|
||||||
"hosea": "Hos.", "hos": "Hos.", "ho": "Hos.",
|
"hosea": "Hos.", "hos": "Hos.", "ho": "Hos.",
|
||||||
"joel": "Joel",
|
"joel": "Joel", "joe": "Joel", "jl": "Joel",
|
||||||
"amos": "Amos",
|
"amos": "Amos", "am": "Amos",
|
||||||
"obadiah": "Obad.", "obad": "Obad.",
|
"obadiah": "Obad.", "obad": "Obad.", "ob": "Obad.",
|
||||||
"jonah": "Jon.", "jon": "Jon.",
|
"jonah": "Jon.", "jon": "Jon.",
|
||||||
"micah": "Mic.", "mic": "Mic.",
|
"micah": "Mic.", "mic": "Mic.",
|
||||||
"nahum": "Nah.", "nah": "Nah.", "na": "Nah.",
|
"nahum": "Nah.", "nah": "Nah.",
|
||||||
"habakkuk": "Hab.", "hab": "Hab.",
|
"habakkuk": "Hab.", "hab": "Hab.",
|
||||||
"zephaniah": "Zeph.", "zeph": "Zeph.",
|
"zephaniah": "Zeph.", "zeph": "Zeph.", "zep": "Zeph.",
|
||||||
"haggai": "Hag.", "hag": "Hag.",
|
"haggai": "Hag.", "hag": "Hag.",
|
||||||
"zechariah": "Zech.", "zech": "Zech.", "zec": "Zech.",
|
"zechariah": "Zech.", "zech": "Zech.", "zec": "Zech.",
|
||||||
"malachi": "Mal.", "mal": "Mal.",
|
"malachi": "Mal.", "mal": "Mal.",
|
||||||
# NT
|
# ----- NT -----
|
||||||
"matthew": "Matt.", "matt": "Matt.", "mt": "Matt.", "mt.": "Matt.",
|
"matthew": "Matt.", "matt": "Matt.", "mt": "Matt.", "mat": "Matt.",
|
||||||
"mark": "Mark", "mk": "Mark", "mr": "Mark", "mr.": "Mark",
|
"mark": "Mark", "mrk": "Mark", "mk": "Mark", "mr": "Mark",
|
||||||
"luke": "Luke", "lk": "Luke", "lu": "Luke",
|
"luke": "Luke", "lk": "Luke",
|
||||||
"john": "John", "jn": "John", "joh": "John", "jno": "John", "jo": "John",
|
"john": "John", "jn": "John", "jo": "John", "joh": "John",
|
||||||
"acts": "Acts", "ac": "Acts",
|
"acts": "Acts", "act": "Acts", "ac": "Acts",
|
||||||
"romans": "Rom.", "rom": "Rom.", "ro": "Rom.",
|
"romans": "Rom.", "rom": "Rom.", "ro": "Rom.", "rm": "Rom.",
|
||||||
"1 corinthians": "1 Cor.", "i corinthians": "1 Cor.", "1 cor": "1 Cor.", "1 cor.": "1 Cor.", "1 co": "1 Cor.", "1co": "1 Cor.",
|
"1 corinthians": "1 Cor.", "i corinthians": "1 Cor.", "1 cor": "1 Cor.", "1cor": "1 Cor.", "1co": "1 Cor.", "1 corinthians": "1 Cor.",
|
||||||
"2 corinthians": "2 Cor.", "ii corinthians": "2 Cor.", "2 cor": "2 Cor.", "2 cor.": "2 Cor.", "2 co": "2 Cor.", "2co": "2 Cor.",
|
"2 corinthians": "2 Cor.", "ii corinthians": "2 Cor.", "2 cor": "2 Cor.", "2cor": "2 Cor.", "2co": "2 Cor.", "2 corinthians": "2 Cor.",
|
||||||
# bare "co" (no leading number) is used in your data for Colossians; keep that mapping here:
|
|
||||||
"co": "Col.",
|
|
||||||
"galatians": "Gal.", "gal": "Gal.", "ga": "Gal.",
|
"galatians": "Gal.", "gal": "Gal.", "ga": "Gal.",
|
||||||
"ephesians": "Eph.", "eph": "Eph.", "ep": "Eph.", "eph.": "Eph.",
|
"ephesians": "Eph.", "eph": "Eph.", "eph.": "Eph.",
|
||||||
"philippians": "Phil.", "phil": "Phil.", "php": "Phil.", "philippians 216": "Phil.", # import glitch
|
"philippians": "Phil.", "phil": "Phil.", "php": "Phil.", "phi": "Phil.", "philippians216": "Phil.",
|
||||||
"colossians": "Col.", "col": "Col.",
|
"colossians": "Col.", "col": "Col.",
|
||||||
"1 thessalonians": "1 Thess.", "i thessalonians": "1 Thess.", "1 thess": "1 Thess.", "1th": "1 Thess.",
|
"1 thessalonians": "1 Thess.", "i thessalonians": "1 Thess.", "1 thess": "1 Thess.", "1 th": "1 Thess.", "1thess": "1 Thess.",
|
||||||
"2 thessalonians": "2 Thess.", "ii thessalonians": "2 Thess.", "2 thess": "2 Thess.", "2th": "2 Thess.",
|
"2 thessalonians": "2 Thess.", "ii thessalonians": "2 Thess.", "2 thess": "2 Thess.", "2 th": "2 Thess.", "2thess": "2 Thess.",
|
||||||
"1 timothy": "1 Tim.", "i timothy": "1 Tim.", "1 tim": "1 Tim.", "1ti": "1 Tim.",
|
"1 timothy": "1 Tim.", "i timothy": "1 Tim.", "1 tim": "1 Tim.", "1ti": "1 Tim.", "1 timothy": "1 Tim.",
|
||||||
"2 timothy": "2 Tim.", "ii timothy": "2 Tim.", "2 tim": "2 Tim.", "2ti": "2 Tim.",
|
"2 timothy": "2 Tim.", "ii timothy": "2 Tim.", "2 tim": "2 Tim.", "2ti": "2 Tim.", "2 timothy": "2 Tim.",
|
||||||
"ti": "Tim.", # context handles numbered elsewhere
|
"titus": "Titus", "tit": "Titus", "ti.": "Titus",
|
||||||
"titus": "Titus", "tit": "Titus",
|
|
||||||
"philemon": "Philem.", "philem": "Philem.", "phm": "Philem.",
|
"philemon": "Philem.", "philem": "Philem.", "phm": "Philem.",
|
||||||
"hebrews": "Heb.", "heb": "Heb.", "he": "Heb.",
|
"hebrews": "Heb.", "heb": "Heb.",
|
||||||
"james": "Jas.", "jas": "Jas.", "jam": "Jas.",
|
"james": "Jas.", "jas": "Jas.", "jam": "Jas.", "jms": "Jas.",
|
||||||
"1 peter": "1 Pet.", "i peter": "1 Pet.", "1 pet": "1 Pet.", "1pe": "1 Pet.",
|
"1 peter": "1 Pet.", "i peter": "1 Pet.", "1 pet": "1 Pet.", "1pe": "1 Pet.",
|
||||||
"2 peter": "2 Pet.", "ii peter": "2 Pet.", "2 pet": "2 Pet.", "2pe": "2 Pet.",
|
"2 peter": "2 Pet.", "ii peter": "2 Pet.", "2 pet": "2 Pet.", "2pe": "2 Pet.",
|
||||||
"1 john": "1 John", "i john": "1 John", "1 jn": "1 John", "1 jo": "1 John", "1jo": "1 John",
|
"1 john": "1 John", "i john": "1 John", "1jn": "1 John", "1 jo": "1 John",
|
||||||
"2 john": "2 John", "ii john": "2 John", "2 jn": "2 John", "2jo": "2 John",
|
"2 john": "2 John", "ii john": "2 John", "2jn": "2 John", "2 jo": "2 John",
|
||||||
"3 john": "3 John", "iii john": "3 John", "3 jn": "3 John", "3jo": "3 John",
|
"3 john": "3 John", "iii john": "3 John", "3jn": "3 John", "3 jo": "3 John",
|
||||||
"jude": "Jude",
|
"jude": "Jude", "jud": "Jude",
|
||||||
"revelation": "Rev.", "rev": "Rev.", "re": "Rev.",
|
"revelation": "Rev.", "rev": "Rev.", "re": "Rev.",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# also accept short two-word numbered patterns dynamically (e.g., "1 sam", "2 ki")
|
||||||
def _variants() -> Dict[str, str]:
|
def _variants() -> Dict[str, str]:
|
||||||
"""
|
|
||||||
Add “numbered + book” fallbacks like “1 cor”, “2 ki”, “1 chron”, etc.
|
|
||||||
Also teach the mapper that bare 'co' (no number) means Colossians, while '1co/2co' means Corinthians.
|
|
||||||
"""
|
|
||||||
base = dict(BOOK_CANON)
|
base = dict(BOOK_CANON)
|
||||||
numbered = [
|
numbered = [
|
||||||
("samuel", "Sam."), ("kings", "Ki."), ("chronicles", "Chron."),
|
("samuel", "Sam."), ("kings", "Ki."), ("chronicles", "Chron."),
|
||||||
("corinthians", "Cor."), ("thessalonians", "Thess."),
|
("corinthians", "Cor."), ("thessalonians", "Thess."),
|
||||||
("timothy", "Tim."), ("peter", "Pet."), ("john", "John"),
|
("timothy", "Tim."), ("peter", "Pet."), ("john", "John"),
|
||||||
]
|
]
|
||||||
for n in ("1", "i"):
|
for n, prefix in (("1", "1"), ("i", "1"), ("2", "2"), ("ii", "2"), ("3", "3"), ("iii", "3")):
|
||||||
for name, abbr in numbered:
|
for name, abbr in numbered:
|
||||||
base[f"{n} {name}"] = f"1 {abbr}"
|
base[f"{n} {name}"] = f"{prefix} {abbr}"
|
||||||
# very short glued forms used in the data (no space):
|
base[f"{n}{name}"] = f"{prefix} {abbr}"
|
||||||
base[f"{n}ki"] = "1 Ki."
|
# ultra short no-space combos like "1co", "2ki"
|
||||||
base[f"{n}ch"] = "1 Chron."
|
base[f"{n}{name[:2]}"] = f"{prefix} {abbr}"
|
||||||
base[f"{n}co"] = "1 Cor."
|
# very common shorthands that users type
|
||||||
base[f"{n}jo"] = "1 John"
|
|
||||||
for n in ("2", "ii"):
|
|
||||||
for name, abbr in numbered:
|
|
||||||
base[f"{n} {name}"] = f"2 {abbr}"
|
|
||||||
base[f"{n}ki"] = "2 Ki."
|
|
||||||
base[f"{n}ch"] = "2 Chron."
|
|
||||||
base[f"{n}co"] = "2 Cor."
|
|
||||||
base[f"{n}jo"] = "2 John"
|
|
||||||
for n in ("3", "iii"):
|
|
||||||
base[f"{n} john"] = "3 John"
|
|
||||||
base[f"{n}jo"] = "3 John"
|
|
||||||
|
|
||||||
# other common shorthands / oddities
|
|
||||||
base["ps"] = "Ps."
|
base["ps"] = "Ps."
|
||||||
base["prov"] = "Prov."
|
base["prov"] = "Prov."
|
||||||
base["pr"] = "Prov."
|
|
||||||
base["eccles"] = "Eccl."
|
base["eccles"] = "Eccl."
|
||||||
base["ecc"] = "Eccl."
|
|
||||||
base["ec"] = "Eccl."
|
|
||||||
base["deut "] = "Deut."
|
|
||||||
base["deut."] = "Deut."
|
base["deut."] = "Deut."
|
||||||
base["genesissis"] = "Gen."
|
base["mt"] = "Matt."
|
||||||
|
base["mk"] = "Mark"
|
||||||
|
base["lk"] = "Luke"
|
||||||
|
base["jn"] = "John"
|
||||||
|
base["ti"] = "Tim." # used only with a leading number, handled below
|
||||||
|
base["co"] = "Cor." # used only with a leading number, handled below
|
||||||
return base
|
return base
|
||||||
|
|
||||||
BOOK_MAP = _variants()
|
BOOK_MAP = _variants()
|
||||||
|
|
||||||
# strip cruft words like "Read", "chapter"
|
# Words to strip like "Read", "chapter"
|
||||||
CRUFT_RE = re.compile(r"\b(read|see|chap(?:ter)?|ch)\b\.?", re.I)
|
CRUFT_RE = re.compile(r"\b(read|see|chap(?:ter)?|ch)\b\.?", re.I)
|
||||||
|
|
||||||
# book prefix pattern (handles “1 Cor.”, “2 Peter”, “Rom.”, “Psalms”)
|
# Book prefix (allows "1Co", "2 Pet.", "Rom", etc.)
|
||||||
BOOK_RE = re.compile(
|
BOOK_RE = re.compile(
|
||||||
r"""
|
r"""
|
||||||
^\s*
|
^\s*
|
||||||
(?:
|
(?:
|
||||||
(?P<num>[1-3]|i{1,3})\s*? # optional leading 1/2/3 (or roman i/ii/iii)
|
(?P<num>[1-3]|i{1,3})\s* # optional 1/2/3 or roman
|
||||||
)?
|
)?
|
||||||
\s*
|
\s*
|
||||||
(?P<book>[A-Za-z\.]+(?:\s+[A-Za-z\.]+){0,2}) # book words (1-3 words)
|
(?P<book>[A-Za-z\.]+(?:\s+[A-Za-z\.]+){0,2}) # book words (1-3 words)
|
||||||
\s*
|
|
||||||
""",
|
""",
|
||||||
re.X
|
re.X,
|
||||||
)
|
)
|
||||||
|
|
||||||
# chapter/verse piece like "4:6, 7-9" or "21" (chapter only)
|
# chapter/verse piece like "4:6,7-9" or "21"
|
||||||
C_V_RE = re.compile(
|
C_V_RE = re.compile(
|
||||||
r"""
|
r"""
|
||||||
(?:
|
(?:
|
||||||
(?P<ch>\d+)
|
(?P<ch>\d+)
|
||||||
(?:
|
(?:
|
||||||
:(?P<vs>[\d,\-\u2013\u2014\s]+) # verses: lists/ranges, allow en/em dash
|
:(?P<vs>[\d,\-\u2013\u2014\s]+)
|
||||||
)?
|
)?
|
||||||
)
|
)
|
||||||
""",
|
""",
|
||||||
re.X
|
re.X,
|
||||||
)
|
)
|
||||||
|
|
||||||
def _clean_text(s: str) -> str:
|
def _clean_text(s: str) -> str:
|
||||||
s = s.replace("\xa0", " ").replace("\u2009", " ").replace("\u202f", " ")
|
s = s.replace("\xa0", " ").replace("\u2009", " ").replace("\u202f", " ")
|
||||||
s = CRUFT_RE.sub("", s)
|
s = CRUFT_RE.sub("", s)
|
||||||
s = s.replace("..", ".").replace("—", "-").replace("–", "-")
|
s = s.replace("..", ".").replace("—", "-").replace("–", "-")
|
||||||
s = s.replace(" ", " ").strip(" ;,.\t\r\n")
|
s = re.sub(r"\s{2,}", " ", s)
|
||||||
# NEW: if entry begins with a number stuck to the book (e.g., "1co", "2ki"), insert a space
|
return s.strip(" ;,.\t\r\n ")
|
||||||
s = re.sub(r"^\s*(?P<num>(?:[1-3]|i{1,3}))(?=[A-Za-z])", r"\g<num> ", s, flags=re.I)
|
|
||||||
return s.strip()
|
|
||||||
|
|
||||||
def _canon_book(book_raw: str) -> str | None:
|
def _canon_key(raw: str) -> str:
|
||||||
if not book_raw:
|
key = raw.lower().strip()
|
||||||
return None
|
key = key.replace(".", "")
|
||||||
key = book_raw.lower().strip().replace(".", "")
|
|
||||||
key = re.sub(r"\s+", " ", key)
|
key = re.sub(r"\s+", " ", key)
|
||||||
# allow glued forms (e.g., "1co", "2ki", "1ch")
|
return key
|
||||||
key = re.sub(r"^(?P<num>(?:[1-3]|i{1,3}))(?=[a-z])", r"\g<num> ", key)
|
|
||||||
# try exact
|
def _canon_book(book_raw: str, num: Optional[str] = None) -> Optional[str]:
|
||||||
|
"""
|
||||||
|
Try to map a raw book token (with optional leading number) to our canonical abbr.
|
||||||
|
"""
|
||||||
|
key = _canon_key(book_raw)
|
||||||
|
# if the token was like "co" or "ti" and a number exists, bias to Cor./Tim.
|
||||||
|
if num and key in ("co", "cor"):
|
||||||
|
return f"{num} Cor."
|
||||||
|
if num and key in ("ti", "tim"):
|
||||||
|
return f"{num} Tim."
|
||||||
|
# direct lookup in our expanded map
|
||||||
if key in BOOK_MAP:
|
if key in BOOK_MAP:
|
||||||
return BOOK_MAP[key]
|
val = BOOK_MAP[key]
|
||||||
# finally, try canonical map without variants
|
# If lookup returned a numbered abbr like "1 Cor." (already good)
|
||||||
|
return val
|
||||||
|
# sometimes users omit space: "1co", "2ki"
|
||||||
|
m = re.match(r"(?P<n>[1-3]|i{1,3})(?P(rest>[A-Za-z].*))$", key)
|
||||||
|
if m:
|
||||||
|
n = m.group("n")
|
||||||
|
rest = m.group("rest")
|
||||||
|
if rest in BOOK_MAP:
|
||||||
|
base = BOOK_MAP[rest]
|
||||||
|
# normalize roman to arabic
|
||||||
|
n = {"i": "1", "ii": "2", "iii": "3"}.get(n, n)
|
||||||
|
# if base already includes number, replace it
|
||||||
|
if base[0] in "123":
|
||||||
|
return f"{n} {base.split(' ', 1)[1]}"
|
||||||
|
return f"{n} {base}"
|
||||||
|
# last chance: try the core canon directly
|
||||||
return BOOK_CANON.get(key)
|
return BOOK_CANON.get(key)
|
||||||
|
|
||||||
def _parse_segment(seg: str, last_book: str | None) -> Tuple[str | None, str | None]:
|
def _parse_segment(seg: str, last_book: Optional[str]) -> Tuple[Optional[str], Optional[str], bool]:
|
||||||
"""
|
"""
|
||||||
Return (book_canon, cv_string) for one semicolon-delimited segment.
|
Parse a semicolon-delimited segment.
|
||||||
If no book is present, reuse last_book.
|
Returns (book_canon, cv_string, preserve_raw).
|
||||||
|
- If preserve_raw is True, cv_string contains the original (cleaned) segment to keep verbatim.
|
||||||
"""
|
"""
|
||||||
|
original = seg.strip()
|
||||||
s = _clean_text(seg)
|
s = _clean_text(seg)
|
||||||
if not s:
|
if not s:
|
||||||
return (None, None)
|
return (None, None, False)
|
||||||
|
|
||||||
# try to see if it starts with a book
|
# Try to detect a leading book token
|
||||||
m = BOOK_RE.match(s)
|
m = BOOK_RE.match(s)
|
||||||
book = None
|
book = None
|
||||||
rest = s
|
rest = s
|
||||||
if m:
|
if m:
|
||||||
raw = ((m.group("num") or "").strip() + " " + (m.group("book") or "").strip()).strip()
|
num = (m.group("num") or "").strip()
|
||||||
raw = raw.replace(" ", " ")
|
raw_book = (m.group("book") or "").strip()
|
||||||
canon = _canon_book(raw)
|
raw_joined = f"{num} {raw_book}".strip()
|
||||||
|
canon = _canon_book(raw_joined or raw_book, num=num or None)
|
||||||
if canon:
|
if canon:
|
||||||
book = canon
|
book = canon
|
||||||
rest = s[m.end():].strip(",;: .")
|
rest = s[m.end():].strip(",;: .")
|
||||||
else:
|
else:
|
||||||
rest = s
|
# Not recognized as a book -> keep whole thing verbatim
|
||||||
|
return (None, original, True)
|
||||||
|
|
||||||
if not book:
|
if not book:
|
||||||
book = last_book # inherit prior
|
# Inherit previous recognized book if we have one
|
||||||
|
if last_book:
|
||||||
# now rest should hold "4:6,7-9" or "21" etc — normalize spaces
|
book = last_book
|
||||||
rest = rest.replace(" ", "")
|
|
||||||
rest = re.sub(r":\s+", ":", rest)
|
|
||||||
if not rest:
|
|
||||||
cv = None
|
|
||||||
else:
|
|
||||||
if C_V_RE.search(rest):
|
|
||||||
cv = rest.replace(" ", "")
|
|
||||||
else:
|
else:
|
||||||
m2 = re.search(r"\d+(?::[\d,\-]+)?", rest)
|
# There is no book context — keep segment verbatim to avoid data loss
|
||||||
cv = m2.group(0).replace(" ", "") if m2 else None
|
return (None, original, True)
|
||||||
|
|
||||||
return (book, cv)
|
# Normalize the chapter/verse part
|
||||||
|
rest = re.sub(r"\s+", "", rest)
|
||||||
|
rest = re.sub(r":\s*", ":", rest)
|
||||||
|
|
||||||
|
if not rest:
|
||||||
|
return (book, None, False)
|
||||||
|
|
||||||
|
if C_V_RE.search(rest):
|
||||||
|
cv = rest.replace(" ", "")
|
||||||
|
else:
|
||||||
|
m2 = re.search(r"\d+(?::[\d,\-]+)?", rest)
|
||||||
|
cv = m2.group(0).replace(" ", "") if m2 else None
|
||||||
|
|
||||||
|
if not cv:
|
||||||
|
# Nothing parseable after a valid book; just keep the book
|
||||||
|
return (book, None, False)
|
||||||
|
|
||||||
|
# Normalize dashes, commas
|
||||||
|
cv = cv.replace("–", "-").replace("—", "-")
|
||||||
|
cv = re.sub(r",\s*", ",", cv)
|
||||||
|
|
||||||
|
return (book, cv, False)
|
||||||
|
|
||||||
def normalize_scripture_field(text: str) -> Tuple[str, List[str]]:
|
def normalize_scripture_field(text: str) -> Tuple[str, List[str]]:
|
||||||
"""
|
"""
|
||||||
Normalize a whole scripture_raw string.
|
Normalize an entire scripture_raw string.
|
||||||
|
- Unknown pieces are preserved verbatim.
|
||||||
|
- Known pieces are standardized and each segment repeats the book.
|
||||||
Returns (normalized_text, warnings).
|
Returns (normalized_text, warnings).
|
||||||
"""
|
"""
|
||||||
warnings: List[str] = []
|
warnings: List[str] = []
|
||||||
@ -225,26 +251,31 @@ def normalize_scripture_field(text: str) -> Tuple[str, List[str]]:
|
|||||||
|
|
||||||
pieces = [p for p in re.split(r"\s*;\s*", text) if p and p.strip()]
|
pieces = [p for p in re.split(r"\s*;\s*", text) if p and p.strip()]
|
||||||
out: List[str] = []
|
out: List[str] = []
|
||||||
last_book: str | None = None
|
last_book: Optional[str] = None
|
||||||
|
|
||||||
for piece in pieces:
|
for piece in pieces:
|
||||||
book, cv = _parse_segment(piece, last_book)
|
book, cv, preserve = _parse_segment(piece, last_book)
|
||||||
if not book and not cv:
|
if preserve:
|
||||||
|
out.append(cv or piece.strip())
|
||||||
|
# do not update last_book when we couldn't recognize a book
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
if book and cv:
|
||||||
|
out.append(f"{book} {cv}")
|
||||||
|
last_book = book
|
||||||
|
continue
|
||||||
|
|
||||||
if book and not cv:
|
if book and not cv:
|
||||||
|
# book only (e.g., "Acts")
|
||||||
out.append(book)
|
out.append(book)
|
||||||
last_book = book
|
last_book = book
|
||||||
continue
|
continue
|
||||||
if not book and cv:
|
|
||||||
warnings.append(f"Missing book for '{piece.strip()}'")
|
|
||||||
continue
|
|
||||||
|
|
||||||
cv = (cv or "").replace("–", "-").replace("—", "-")
|
# If we get here: (no book, no preserve) — nothing useful to add
|
||||||
out.append(f"{book} {cv}")
|
if piece.strip():
|
||||||
last_book = book
|
# As a final safeguard, keep original
|
||||||
|
out.append(piece.strip())
|
||||||
norm = "; ".join(o.strip() for o in out if o.strip())
|
|
||||||
norm = norm.strip(" ;,")
|
|
||||||
norm = re.sub(r"\s+", " ", norm)
|
|
||||||
|
|
||||||
|
norm = "; ".join(x.strip() for x in out if x.strip())
|
||||||
|
norm = re.sub(r"\s+", " ", norm).strip(" ;,")
|
||||||
return (norm, warnings)
|
return (norm, warnings)
|
||||||
Loading…
Reference in New Issue
Block a user