blue
/
Douay-Rheims-Bible
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change matching of book names with numbers to be more strict

This commit is contained in:
Tim Cooper 2018-08-10 18:39:47 -03:00
parent e4ba918970
commit 7fa179c6a0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kjv.awk
View File

@ -8,18 +8,18 @@ BEGIN {
FS = "\t"
if (cmd == "ref") {
if (match(ref, "^[a-zA-Z0-9 ]+$")) {
if (match(ref, "^[1-9]?[a-zA-Z ]+$")) {
mode = "exact"
r_book = tolower(ref)
} else if (match(ref, "^[a-zA-Z0-9 ]+:[0-9]+$")) {
} else if (match(ref, "^[1-9]?[a-zA-Z ]+:[0-9]+$")) {
mode = "exact"
split(ref, arr, ":")
r_book = tolower(arr[1])
r_chapter = arr[2]
} else if (match(ref, "^[a-zA-Z0-9 ]+:[0-9]+:[0-9]+$")) {
} else if (match(ref, "^[1-9]?[a-zA-Z ]+:[0-9]+:[0-9]+$")) {
mode = "exact"
split(ref, arr, ":")
@ -27,7 +27,7 @@ BEGIN {
r_chapter = arr[2]
r_verse = arr[3]
} else if (match(ref, "^[a-zA-Z0-9 ]+:[0-9]+-[0-9]+$")) {
} else if (match(ref, "^[1-9]?[a-zA-Z ]+:[0-9]+-[0-9]+$")) {
mode = "range"
split(ref, arr, ":")
@ -37,7 +37,7 @@ BEGIN {
r_chapter_lower = arr[1]
r_chapter_upper = arr[2]
} else if (match(ref, "^[a-zA-Z0-9 ]+:[0-9]+:[0-9]+-[0-9]+$")) {
} else if (match(ref, "^[1-9]?[a-zA-Z ]+:[0-9]+:[0-9]+-[0-9]+$")) {
mode = "range"
split(ref, arr, ":")
@ -48,7 +48,7 @@ BEGIN {
r_verse_lower = arr[1]
r_verse_upper = arr[2]
} else if (match(ref, "^[a-zA-Z0-9 ]+:[0-9]+:[0-9]+-[0-9]+:[0-9]+$")) {
} else if (match(ref, "^[1-9]?[a-zA-Z ]+:[0-9]+:[0-9]+-[0-9]+:[0-9]+$")) {
mode = "range_ext"
split(ref, arr, ":")
@ -65,14 +65,14 @@ BEGIN {
r_search = substr(ref, 2)
} else if (match(ref, "^[a-zA-Z0-9 ]+/")) {
} else if (match(ref, "^[1-9]?[a-zA-Z ]+/")) {
mode = "search"
i = index(ref, "/")
r_book = tolower(substr(ref, 1, i - 1))
r_search = substr(ref, i + 1)
} else if (match(ref, "^[a-zA-Z0-9 ]+:[0-9]+/")) {
} else if (match(ref, "^[1-9]?[a-zA-Z ]+:[0-9]+/")) {
mode = "search"
i = index(ref, ":")