forked from hmw3/Tips_and_Hacks
See in Reader
PDF 2 Sam 19
This commit is contained in:
parent
8d594ea22b
commit
cb5709851c
|
|
@ -0,0 +1,102 @@
|
|||
#!/usr/bin/perl
|
||||
use warnings;
|
||||
use strict;
|
||||
|
||||
use autodie;
|
||||
use File::Copy;
|
||||
|
||||
my %filenames;
|
||||
|
||||
while (<DATA>) {
|
||||
chomp;
|
||||
if (/([^\t]*)\t([^\t]*)/) {
|
||||
#($oldName, $newName) = ($1, $2);
|
||||
$filenames{$1} = $2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# capture script name, in case we are running the script from the
|
||||
# same directory we working on.
|
||||
my $this_file = (split(/\//, $0))[-1];
|
||||
print "skipping file: $this_file\n";
|
||||
|
||||
my $oldnames = "/home/henry/Documents/WA_Repo/OSHB";
|
||||
my $newnames = "/home/henry/Documents/WA_Repo/MAST_HB";
|
||||
|
||||
# open the directory
|
||||
opendir(my $dh, $oldnames);
|
||||
|
||||
# grep out all directories and possibly this script.
|
||||
my @files_to_rename = grep { !-d && $_ ne $this_file } readdir $dh;
|
||||
closedir $dh;
|
||||
|
||||
### UPDATED ###
|
||||
# create hash of file names from lists:
|
||||
my @missing_new_file = ();
|
||||
|
||||
|
||||
# change directory, so we don't have to worry about pathing
|
||||
# of files to rename and move...
|
||||
chdir($oldnames);
|
||||
mkdir($newnames) if !-e $newnames;
|
||||
|
||||
|
||||
### UPDATED ###
|
||||
for my $file (@files_to_rename) {
|
||||
# Check that current file exists in the hash,
|
||||
# if true, copy old file to new location with new name
|
||||
if( exists($filenames->{$file}) ) {
|
||||
copy($file, "$newnames/$filenames->{$file}");
|
||||
} else {
|
||||
push @missing_new_file, $file;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if( @missing_new_file ) {
|
||||
print "Could not map files:\n",
|
||||
join("\n", @missing_new_file), "\n";
|
||||
}
|
||||
|
||||
|
||||
__DATA__
|
||||
Gen.xml 01-GEN.xml
|
||||
Exod.xml 02-EXO.xml
|
||||
Lev.xml 03-LEV.xml
|
||||
Num.xml 04-NUM.xml
|
||||
Deut.xml 05-DEU.xml
|
||||
Josh.xml 06-JOS.xml
|
||||
Judg.xml 07-JDG.xml
|
||||
Ruth.xml 08-RUT.xml
|
||||
1Sam.xml 09-1SA.xml
|
||||
2Sam.xml 10-2SA.xml
|
||||
1Kgs.xml 11-1KI.xml
|
||||
2Kgs.xml 12-2KI.xml
|
||||
1Chr.xml 13-1CH.xml
|
||||
2Chr.xml 14-2CH.xml
|
||||
Ezra.xml 15-EZR.xml
|
||||
Neh.xml 16-NEH.xml
|
||||
Esth.xml 17-EST.xml
|
||||
Job.xml 18-JOB.xml
|
||||
Ps.xml 19-PSA.xml
|
||||
Prov.xml 20-PRO.xml
|
||||
Eccl.xml 21-ECC.xml
|
||||
Song.xml 22-SNG.xml
|
||||
Isa.xml 23-ISA.xml
|
||||
Jer.xml 24-JER.xml
|
||||
Lam.xml 25-LAM.xml
|
||||
Ezek.xml 26-EZK.xml
|
||||
Dan.xml 27-DAN.xml
|
||||
Hos.xml 28-HOS.xml
|
||||
Joel.xml 29-JOL.xml
|
||||
Amos.xml 30-AMO.xml
|
||||
Obad.xml 31-OBA.xml
|
||||
Jonah.xml 32-JON.xml
|
||||
Mic.xml 33-MIC.xml
|
||||
Nah.xml 34-NAM.xml
|
||||
Hab.xml 35-HAB.xml
|
||||
Zeph.xml 36-ZEP.xml
|
||||
Hag.xml 37-HAG.xml
|
||||
Zech.xml 38-ZEC.xml
|
||||
Mal.xml 39-MAL.xml
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
# Step 1 in updating OSHB to MAST_HB
|
||||
# Converts file names to WA MAST abbreviations
|
||||
# After this need to run Convert_refs_in_MAST_HB.pl to get data in file to conform
|
||||
|
||||
while (<DATA>) {
|
||||
chomp;
|
||||
if (/([^\t]*)\t([^\t]*)/) {
|
||||
#($oldName, $newName) = ($1, $2);
|
||||
$new_name{$1} = $2;
|
||||
}
|
||||
}
|
||||
|
||||
chdir = "/home/henry/Documents/WA_Repo/MAST_HB";
|
||||
|
||||
foreach $old_name (sort keys %new_name) {
|
||||
print "$old_name to $new_name{$old_name}\n";
|
||||
system "mv $old_name $new_name{$old_name}"
|
||||
#system "mv $olddir/$old_name to $newdir/$new_name{$old_name}"
|
||||
|
||||
}
|
||||
|
||||
print "Done.\n"
|
||||
|
||||
__DATA__
|
||||
Gen.xml 01-GEN.xml
|
||||
Exod.xml 02-EXO.xml
|
||||
Lev.xml 03-LEV.xml
|
||||
Num.xml 04-NUM.xml
|
||||
Deut.xml 05-DEU.xml
|
||||
Josh.xml 06-JOS.xml
|
||||
Judg.xml 07-JDG.xml
|
||||
Ruth.xml 08-RUT.xml
|
||||
1Sam.xml 09-1SA.xml
|
||||
2Sam.xml 10-2SA.xml
|
||||
1Kgs.xml 11-1KI.xml
|
||||
2Kgs.xml 12-2KI.xml
|
||||
1Chr.xml 13-1CH.xml
|
||||
2Chr.xml 14-2CH.xml
|
||||
Ezra.xml 15-EZR.xml
|
||||
Neh.xml 16-NEH.xml
|
||||
Esth.xml 17-EST.xml
|
||||
Job.xml 18-JOB.xml
|
||||
Ps.xml 19-PSA.xml
|
||||
Prov.xml 20-PRO.xml
|
||||
Eccl.xml 21-ECC.xml
|
||||
Song.xml 22-SNG.xml
|
||||
Isa.xml 23-ISA.xml
|
||||
Jer.xml 24-JER.xml
|
||||
Lam.xml 25-LAM.xml
|
||||
Ezek.xml 26-EZK.xml
|
||||
Dan.xml 27-DAN.xml
|
||||
Hos.xml 28-HOS.xml
|
||||
Joel.xml 29-JOL.xml
|
||||
Amos.xml 30-AMO.xml
|
||||
Obad.xml 31-OBA.xml
|
||||
Jonah.xml 32-JON.xml
|
||||
Mic.xml 33-MIC.xml
|
||||
Nah.xml 34-NAM.xml
|
||||
Hab.xml 35-HAB.xml
|
||||
Zeph.xml 36-ZEP.xml
|
||||
Hag.xml 37-HAG.xml
|
||||
Zech.xml 38-ZEC.xml
|
||||
Mal.xml 39-MAL.xml
|
||||
|
|
@ -1,18 +1,25 @@
|
|||
# Step 1 in updating OSHB to MAST_HB
|
||||
# Converts file names and internal verse refs to WA MAST abbreviations
|
||||
# Converts file names to WA MAST abbreviations
|
||||
# After this need to run Convert_refs_in_MAST_HB.pl to get data in file to conform
|
||||
|
||||
while (<DATA>) {
|
||||
chomp;
|
||||
if (/([^\t]*)\t([^\t]*)/) {
|
||||
#($oldName, $newName) = ($1, $2);
|
||||
$new_name{$1} = $2
|
||||
$new_name{$1} = $2;
|
||||
}
|
||||
}
|
||||
|
||||
chdir "/Users/Henry/Documents/git.Door43/MAST_HB";
|
||||
my $oldnames = "/home/henry/Documents/WA_Repo/OSHB";
|
||||
my $newnames = "/home/henry/Documents/WA_Repo/MAST_HB";
|
||||
chdir($oldnames);
|
||||
mkdir($newnames) if !-e $newnames;
|
||||
|
||||
foreach $old_name (sort keys %new_name) {
|
||||
system "mv $old_name $new_name{$old_name}"
|
||||
print "$old_name to $newnames/$new_name{$old_name}\n";
|
||||
system "mv $old_name $newnames/$new_name{$old_name}"
|
||||
#system "mv $olddir/$old_name to $newdir/$new_name{$old_name}"
|
||||
|
||||
}
|
||||
|
||||
print "Done.\n"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ use utf8;
|
|||
use open IO => ":utf8";
|
||||
|
||||
my ($oldName, $newName);
|
||||
my $topDir = "/Users/Henry/Documents/git.Door43/MAST_HB";
|
||||
my $topDir = "/home/henry/Documents/WA_Repo/MAST_HB";
|
||||
#my $topDir = "/Users/Henry/Documents/git.Door43/MAST_HB";
|
||||
my (%new_name);
|
||||
|
||||
while (<DATA>) {
|
||||
|
|
@ -29,6 +30,7 @@ foreach my $file ( @filesToRun ) {
|
|||
my $fileText = read_file("$file", binmode => 'utf8');
|
||||
foreach my $key (sort keys %new_name) {
|
||||
$fileText =~ s/(osisID=")$key(\.\d+\.\d+")/$1$new_name{$key}$2/g;
|
||||
$fileText =~ s/(<note>KJV:)$key(\.\d+\.\d+<\/note>)/$1$new_name{$key}$2/g;
|
||||
}
|
||||
open(OUT, ">:utf8", "$file") or die "$file:\n$!";
|
||||
say OUT $fileText;
|
||||
|
|
|
|||
|
|
@ -6861,7 +6861,10 @@ Ruth 4:17 7121 ||
|
|||
2 Samuel 18:31 935 ||
|
||||
2 Samuel 18:31 3027 ||
|
||||
2 Samuel 18:32 7965 ||
|
||||
|
||||
2 Samuel 18:33 7264 ||
|
||||
2 Samuel 18:33 5927 ||
|
||||
2 Samuel 18:33 3212 ||
|
||||
2 Samuel 18:33 5414 ||
|
||||
|
||||
1 Chronicles 1:5 4074 ||
|
||||
1 Chronicles 1:5 3120 ||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,723 @@
|
|||
|| ||
|
||||
|# Consistent deletes for OLD Testament| |# Consistent deletes for OLD Testament|
|
||||
|100| |100|
|
||||
|1004| |1004|
|
||||
|1060| |1060|
|
||||
|1086| |1086|
|
||||
|1101| |1101|
|
||||
|1116| |1116|
|
||||
|1121| |1121|
|
||||
|1123| |1123|
|
||||
|1129| |1129|
|
||||
|113| |113|
|
||||
|1156| |1156|
|
||||
|116| |116|
|
||||
|1166| |1166|
|
||||
|1167| |1167|
|
||||
|120| |120|
|
||||
|1214| |1214|
|
||||
|1219| |1219|
|
||||
|1220| |1220|
|
||||
|1238| |1238|
|
||||
|1245| |1245|
|
||||
|1262| |1262|
|
||||
|1270| |1270|
|
||||
|1285| |1285|
|
||||
|1293| |1293|
|
||||
|1300| |1300|
|
||||
|1320| |1320|
|
||||
|1323| |1323|
|
||||
|1342| |1342|
|
||||
|1346| |1346|
|
||||
|1350| |1350|
|
||||
|1354| |1354|
|
||||
|1361| |1361|
|
||||
|1363| |1363|
|
||||
|1364| |1364|
|
||||
|1387| |1387|
|
||||
|1389| |1389|
|
||||
|1396| |1396|
|
||||
|1397| |1397|
|
||||
|14| |14|
|
||||
|1406| |1406|
|
||||
|1419| |1419|
|
||||
|1431| |1431|
|
||||
|1438| |1438|
|
||||
|1471| |1471|
|
||||
|1481| |1481|
|
||||
|1494| |1494|
|
||||
|1497| |1497|
|
||||
|1505| |1505|
|
||||
|1513| |1513|
|
||||
|1524| |1524|
|
||||
|1530| |1530|
|
||||
|1540| |1540|
|
||||
|1543| |1543|
|
||||
|1556| |1556|
|
||||
|157| |157|
|
||||
|1580| |1580|
|
||||
|1589| |1589|
|
||||
|1602| |1602|
|
||||
|1644| |1644|
|
||||
|1692| |1692|
|
||||
|1696| |1696|
|
||||
|1697| |1697|
|
||||
|1730| |1730|
|
||||
|1731| |1731|
|
||||
|1732| |1732|
|
||||
|1741| |1741|
|
||||
|1767| |1767|
|
||||
|1777| |1777|
|
||||
|1779| |1779|
|
||||
|1817| |1817|
|
||||
|1819| |1819|
|
||||
|1820| |1820|
|
||||
|1826| |1826|
|
||||
|183| |183|
|
||||
|1869| |1869|
|
||||
|1870| |1870|
|
||||
|1875| |1875|
|
||||
|1878| |1878|
|
||||
|1892| |1892|
|
||||
|1897| |1897|
|
||||
|1899| |1899|
|
||||
|1934| |1934|
|
||||
|1935| |1935|
|
||||
|1980| |1980|
|
||||
|1984| |1984|
|
||||
|1993| |1993|
|
||||
|1995| |1995|
|
||||
|2015| |2015|
|
||||
|2094| |2094|
|
||||
|2100| |2100|
|
||||
|2106| |2106|
|
||||
|2114| |2114|
|
||||
|2119| |2119|
|
||||
|213| |213|
|
||||
|214| |214|
|
||||
|2142| |2142|
|
||||
|2145| |2145|
|
||||
|2146| |2146|
|
||||
|215| |215|
|
||||
|2151| |2151|
|
||||
|2152| |2152|
|
||||
|2154| |2154|
|
||||
|2166| |2166|
|
||||
|2219| |2219|
|
||||
|2220| |2220|
|
||||
|2233| |2233|
|
||||
|2236| |2236|
|
||||
|2256| |2256|
|
||||
|2257| |2257|
|
||||
|2266| |2266|
|
||||
|227| |227|
|
||||
|2280| |2280|
|
||||
|2308| |2308|
|
||||
|2319| |2319|
|
||||
|2342| |2342|
|
||||
|2370| |2370|
|
||||
|2372| |2372|
|
||||
|2376| |2376|
|
||||
|2380| |2380|
|
||||
|2388| |2388|
|
||||
|2398| |2398|
|
||||
|241| |241|
|
||||
|2416| |2416|
|
||||
|2420| |2420|
|
||||
|2428| |2428|
|
||||
|2436| |2436|
|
||||
|2470| |2470|
|
||||
|2490| |2490|
|
||||
|2491| |2491|
|
||||
|2498| |2498|
|
||||
|2502| |2502|
|
||||
|2505| |2505|
|
||||
|2506| |2506|
|
||||
|251| |251|
|
||||
|2530| |2530|
|
||||
|2534| |2534|
|
||||
|2554| |2554|
|
||||
|2560| |2560|
|
||||
|2580| |2580|
|
||||
|2600| |2600|
|
||||
|2617| |2617|
|
||||
|2651| |2651|
|
||||
|2654| |2654|
|
||||
|2656| |2656|
|
||||
|2658| |2658|
|
||||
|2671| |2671|
|
||||
|2672| |2672|
|
||||
|2673| |2673|
|
||||
|2686| |2686|
|
||||
|2691| |2691|
|
||||
|270| |270|
|
||||
|2706| |2706|
|
||||
|2710| |2710|
|
||||
|2720| |2720|
|
||||
|2721| |2721|
|
||||
|2742| |2742|
|
||||
|2764| |2764|
|
||||
|2787| |2787|
|
||||
|2789| |2789|
|
||||
|2790| |2790|
|
||||
|2803| |2803|
|
||||
|281| |281|
|
||||
|2856| |2856|
|
||||
|2859| |2859|
|
||||
|2860| |2860|
|
||||
|2864| |2864|
|
||||
|2891| |2891|
|
||||
|2896| |2896|
|
||||
|2904| |2904|
|
||||
|2940| |2940|
|
||||
|2963| |2963|
|
||||
|2964| |2964|
|
||||
|2975| |2975|
|
||||
|2976| |2976|
|
||||
|3001| |3001|
|
||||
|3021| |3021|
|
||||
|3027| |3027|
|
||||
|3028| |3028|
|
||||
|3034| |3034|
|
||||
|3045| |3045|
|
||||
|3046| |3046|
|
||||
|3068| |3068|
|
||||
|3069| |3069|
|
||||
|3083| |3083|
|
||||
|3117| |3117|
|
||||
|3118| |3118|
|
||||
|312| |312|
|
||||
|314| |314|
|
||||
|3148| |3148|
|
||||
|3176| |3176|
|
||||
|3179| |3179|
|
||||
|319| |319|
|
||||
|3190| |3190|
|
||||
|3198| |3198|
|
||||
|3201| |3201|
|
||||
|3205| |3205|
|
||||
|3206| |3206|
|
||||
|3212| |3212|
|
||||
|3220| |3220|
|
||||
|3225| |3225|
|
||||
|3233| |3233|
|
||||
|3243| |3243|
|
||||
|325| |325|
|
||||
|3254| |3254|
|
||||
|3293| |3293|
|
||||
|3313| |3313|
|
||||
|3318| |3318|
|
||||
|3330| |3330|
|
||||
|3332| |3332|
|
||||
|3335| |3335|
|
||||
|3358| |3358|
|
||||
|3365| |3365|
|
||||
|3366| |3366|
|
||||
|3373| |3373|
|
||||
|3381| |3381|
|
||||
|3384| |3384|
|
||||
|34| |34|
|
||||
|3423| |3423|
|
||||
|3426| |3426|
|
||||
|3427| |3427|
|
||||
|3463| |3463|
|
||||
|3470| |3470|
|
||||
|3474| |3474|
|
||||
|3477| |3477|
|
||||
|3493| |3493|
|
||||
|3498| |3498|
|
||||
|3499| |3499|
|
||||
|3513| |3513|
|
||||
|3515| |3515|
|
||||
|3518| |3518|
|
||||
|3524| |3524|
|
||||
|3533| |3533|
|
||||
|3557| |3557|
|
||||
|3559| |3559|
|
||||
|3581| |3581|
|
||||
|3582| |3582|
|
||||
|3584| |3584|
|
||||
|3611| |3611|
|
||||
|3615| |3615|
|
||||
|3627| |3627|
|
||||
|3644| |3644|
|
||||
|3667| |3667|
|
||||
|3669| |3669|
|
||||
|3671| |3671|
|
||||
|3678| |3678|
|
||||
|3680| |3680|
|
||||
|3708| |3708|
|
||||
|3709| |3709|
|
||||
|3722| |3722|
|
||||
|3730| |3730|
|
||||
|3738| |3738|
|
||||
|374| |374|
|
||||
|376| |376|
|
||||
|3760| |3760|
|
||||
|3766| |3766|
|
||||
|3772| |3772|
|
||||
|3782| |3782|
|
||||
|3789| |3789|
|
||||
|3791| |3791|
|
||||
|3811| |3811|
|
||||
|3820| |3820|
|
||||
|3856| |3856|
|
||||
|386| |386|
|
||||
|3868| |3868|
|
||||
|3885| |3885|
|
||||
|3898| |3898|
|
||||
|3899| |3899|
|
||||
|3908| |3908|
|
||||
|3920| |3920|
|
||||
|3947| |3947|
|
||||
|3956| |3956|
|
||||
|3966| |3966|
|
||||
|3971| |3971|
|
||||
|3978| |3978|
|
||||
|398| |398|
|
||||
|399| |399|
|
||||
|400| |400|
|
||||
|4005| |4005|
|
||||
|4009| |4009|
|
||||
|4042| |4042|
|
||||
|4043| |4043|
|
||||
|4055| |4055|
|
||||
|4060| |4060|
|
||||
|4101| |4101|
|
||||
|4116| |4116|
|
||||
|4127| |4127|
|
||||
|4136| |4136|
|
||||
|4150| |4150|
|
||||
|4161| |4161|
|
||||
|4164| |4164|
|
||||
|4186| |4186|
|
||||
|4201| |4201|
|
||||
|4229| |4229|
|
||||
|4241| |4241|
|
||||
|4242| |4242|
|
||||
|4279| |4279|
|
||||
|430| |430|
|
||||
|4307| |4307|
|
||||
|4325| |4325|
|
||||
|4334| |4334|
|
||||
|4339| |4339|
|
||||
|4347| |4347|
|
||||
|4349| |4349|
|
||||
|4385| |4385|
|
||||
|4390| |4390|
|
||||
|4399| |4399|
|
||||
|4405| |4405|
|
||||
|4406| |4406|
|
||||
|4417| |4417|
|
||||
|4422| |4422|
|
||||
|4456| |4456|
|
||||
|4481| |4481|
|
||||
|4483| |4483|
|
||||
|4486| |4486|
|
||||
|4487| |4487|
|
||||
|4557| |4557|
|
||||
|4578| |4578|
|
||||
|4585| |4585|
|
||||
|4591| |4591|
|
||||
|4592| |4592|
|
||||
|4605| |4605|
|
||||
|4672| |4672|
|
||||
|4686| |4686|
|
||||
|4692| |4692|
|
||||
|4725| |4725|
|
||||
|4740| |4740|
|
||||
|4744| |4744|
|
||||
|4758| |4758|
|
||||
|4791| |4791|
|
||||
|4800| |4800|
|
||||
|481| |481|
|
||||
|4830| |4830|
|
||||
|4832| |4832|
|
||||
|4834| |4834|
|
||||
|4906| |4906|
|
||||
|4908| |4908|
|
||||
|4912| |4912|
|
||||
|4917| |4917|
|
||||
|4941| |4941|
|
||||
|4960| |4960|
|
||||
|4975| |4975|
|
||||
|4994| |4994|
|
||||
|4997| |4997|
|
||||
|5027| |5027|
|
||||
|5034| |5034|
|
||||
|5035| |5035|
|
||||
|5042| |5042|
|
||||
|5045| |5045|
|
||||
|5046| |5046|
|
||||
|5051| |5051|
|
||||
|5057| |5057|
|
||||
|5058| |5058|
|
||||
|5061| |5061|
|
||||
|5062| |5062|
|
||||
|5065| |5065|
|
||||
|5066| |5066|
|
||||
|5071| |5071|
|
||||
|5074| |5074|
|
||||
|5081| |5081|
|
||||
|5098| |5098|
|
||||
|5104| |5104|
|
||||
|5110| |5110|
|
||||
|5116| |5116|
|
||||
|5117| |5117|
|
||||
|5127| |5127|
|
||||
|5128| |5128|
|
||||
|5130| |5130|
|
||||
|5140| |5140|
|
||||
|5142| |5142|
|
||||
|5148| |5148|
|
||||
|5181| |5181|
|
||||
|5183| |5183|
|
||||
|5186| |5186|
|
||||
|5193| |5193|
|
||||
|5197| |5197|
|
||||
|5203| |5203|
|
||||
|5221| |5221|
|
||||
|5232| |5232|
|
||||
|5234| |5234|
|
||||
|5237| |5237|
|
||||
|5253| |5253|
|
||||
|5254| |5254|
|
||||
|5274| |5274|
|
||||
|5301| |5301|
|
||||
|5307| |5307|
|
||||
|5310| |5310|
|
||||
|5315| |5315|
|
||||
|5324| |5324|
|
||||
|5337| |5337|
|
||||
|5341| |5341|
|
||||
|5344| |5344|
|
||||
|5362| |5362|
|
||||
|5365| |5365|
|
||||
|5375| |5375|
|
||||
|5381| |5381|
|
||||
|5387| |5387|
|
||||
|539| |539|
|
||||
|5413| |5413|
|
||||
|5414| |5414|
|
||||
|5425| |5425|
|
||||
|5428| |5428|
|
||||
|5437| |5437|
|
||||
|5445| |5445|
|
||||
|5458| |5458|
|
||||
|5459| |5459|
|
||||
|5462| |5462|
|
||||
|5475| |5475|
|
||||
|5493| |5493|
|
||||
|5518| |5518|
|
||||
|5526| |5526|
|
||||
|5532| |5532|
|
||||
|5549| |5549|
|
||||
|5564| |5564|
|
||||
|5568| |5568|
|
||||
|5590| |5590|
|
||||
|5592| |5592|
|
||||
|560| |560|
|
||||
|5608| |5608|
|
||||
|5631| |5631|
|
||||
|5640| |5640|
|
||||
|5642| |5642|
|
||||
|5647| |5647|
|
||||
|5674| |5674|
|
||||
|5675| |5675|
|
||||
|5676| |5676|
|
||||
|5705| |5705|
|
||||
|5732| |5732|
|
||||
|5750| |5750|
|
||||
|5769| |5769|
|
||||
|5782| |5782|
|
||||
|5791| |5791|
|
||||
|5794| |5794|
|
||||
|5800| |5800|
|
||||
|5810| |5810|
|
||||
|5824| |5824|
|
||||
|5849| |5849|
|
||||
|5857| |5857|
|
||||
|5869| |5869|
|
||||
|5892| |5892|
|
||||
|5922| |5922|
|
||||
|5927| |5927|
|
||||
|5945| |5945|
|
||||
|5953| |5953|
|
||||
|5957| |5957|
|
||||
|5970| |5970|
|
||||
|5971| |5971|
|
||||
|5975| |5975|
|
||||
|5977| |5977|
|
||||
|5980| |5980|
|
||||
|6| |6|
|
||||
|6030| |6030|
|
||||
|6031| |6031|
|
||||
|6035| |6035|
|
||||
|6041| |6041|
|
||||
|606| |606|
|
||||
|6083| |6083|
|
||||
|6086| |6086|
|
||||
|6089| |6089|
|
||||
|6099| |6099|
|
||||
|6106| |6106|
|
||||
|6113| |6113|
|
||||
|6118| |6118|
|
||||
|6119| |6119|
|
||||
|6121| |6121|
|
||||
|6148| |6148|
|
||||
|6153| |6153|
|
||||
|6160| |6160|
|
||||
|6186| |6186|
|
||||
|6203| |6203|
|
||||
|6213| |6213|
|
||||
|622| |622|
|
||||
|6235| |6235|
|
||||
|6242| |6242|
|
||||
|6256| |6256|
|
||||
|6285| |6285|
|
||||
|6293| |6293|
|
||||
|631| |631|
|
||||
|6310| |6310|
|
||||
|6315| |6315|
|
||||
|6327| |6327|
|
||||
|6362| |6362|
|
||||
|6381| |6381|
|
||||
|639| |639|
|
||||
|6418| |6418|
|
||||
|6437| |6437|
|
||||
|6438| |6438|
|
||||
|6440| |6440|
|
||||
|6443| |6443|
|
||||
|6466| |6466|
|
||||
|6471| |6471|
|
||||
|6475| |6475|
|
||||
|6485| |6485|
|
||||
|6486| |6486|
|
||||
|650| |650|
|
||||
|6504| |6504|
|
||||
|6524| |6524|
|
||||
|6544| |6544|
|
||||
|6555| |6555|
|
||||
|6565| |6565|
|
||||
|6567| |6567|
|
||||
|6600| |6600|
|
||||
|6601| |6601|
|
||||
|6607| |6607|
|
||||
|6612| |6612|
|
||||
|6679| |6679|
|
||||
|6696| |6696|
|
||||
|6697| |6697|
|
||||
|6723| |6723|
|
||||
|6726| |6726|
|
||||
|6735| |6735|
|
||||
|6738| |6738|
|
||||
|6743| |6743|
|
||||
|6757| |6757|
|
||||
|6770| |6770|
|
||||
|6779| |6779|
|
||||
|6789| |6789|
|
||||
|6793| |6793|
|
||||
|68| |68|
|
||||
|6805| |6805|
|
||||
|6862| |6862|
|
||||
|6872| |6872|
|
||||
|6884| |6884|
|
||||
|6887| |6887|
|
||||
|6901| |6901|
|
||||
|6921| |6921|
|
||||
|6924| |6924|
|
||||
|6944| |6944|
|
||||
|6957| |6957|
|
||||
|6960| |6960|
|
||||
|6963| |6963|
|
||||
|6965| |6965|
|
||||
|6966| |6966|
|
||||
|6994| |6994|
|
||||
|7019| |7019|
|
||||
|7043| |7043|
|
||||
|7050| |7050|
|
||||
|7069| |7069|
|
||||
|7070| |7070|
|
||||
|7105| |7105|
|
||||
|7110| |7110|
|
||||
|7114| |7114|
|
||||
|7121| |7121|
|
||||
|7123| |7123|
|
||||
|7125| |7125|
|
||||
|7126| |7126|
|
||||
|7138| |7138|
|
||||
|7144| |7144|
|
||||
|7194| |7194|
|
||||
|7198| |7198|
|
||||
|7200| |7200|
|
||||
|7218| |7218|
|
||||
|7223| |7223|
|
||||
|7225| |7225|
|
||||
|7227| |7227|
|
||||
|7230| |7230|
|
||||
|7233| |7233|
|
||||
|7235| |7235|
|
||||
|7236| |7236|
|
||||
|724| |724|
|
||||
|7264| |7264|
|
||||
|7267| |7267|
|
||||
|7270| |7270|
|
||||
|7272| |7272|
|
||||
|7280| |7280|
|
||||
|7291| |7291|
|
||||
|7307| |7307|
|
||||
|7308| |7308|
|
||||
|7311| |7311|
|
||||
|7312| |7312|
|
||||
|7339| |7339|
|
||||
|7342| |7342|
|
||||
|7368| |7368|
|
||||
|7378| |7378|
|
||||
|7381| |7381|
|
||||
|7386| |7386|
|
||||
|7399| |7399|
|
||||
|7423| |7423|
|
||||
|7445| |7445|
|
||||
|7451| |7451|
|
||||
|7453| |7453|
|
||||
|7455| |7455|
|
||||
|7462| |7462|
|
||||
|7468| |7468|
|
||||
|7469| |7469|
|
||||
|7481| |7481|
|
||||
|7489| |7489|
|
||||
|7493| |7493|
|
||||
|7494| |7494|
|
||||
|7497| |7497|
|
||||
|7503| |7503|
|
||||
|7521| |7521|
|
||||
|7522| |7522|
|
||||
|753| |753|
|
||||
|7560| |7560|
|
||||
|7576| |7576|
|
||||
|7580| |7580|
|
||||
|7581| |7581|
|
||||
|7588| |7588|
|
||||
|759| |759|
|
||||
|7592| |7592|
|
||||
|7604| |7604|
|
||||
|7605| |7605|
|
||||
|7606| |7606|
|
||||
|7607| |7607|
|
||||
|7623| |7623|
|
||||
|7637| |7637|
|
||||
|7641| |7641|
|
||||
|7646| |7646|
|
||||
|7651| |7651|
|
||||
|7655| |7655|
|
||||
|7657| |7657|
|
||||
|7665| |7665|
|
||||
|7673| |7673|
|
||||
|7674| |7674|
|
||||
|7682| |7682|
|
||||
|7722| |7722|
|
||||
|7725| |7725|
|
||||
|7737| |7737|
|
||||
|7743| |7743|
|
||||
|7751| |7751|
|
||||
|776| |776|
|
||||
|7760| |7760|
|
||||
|7761| |7761|
|
||||
|7768| |7768|
|
||||
|7786| |7786|
|
||||
|7789| |7789|
|
||||
|7812| |7812|
|
||||
|7814| |7814|
|
||||
|7817| |7817|
|
||||
|7832| |7832|
|
||||
|7834| |7834|
|
||||
|7836| |7836|
|
||||
|7857| |7857|
|
||||
|7872| |7872|
|
||||
|7878| |7878|
|
||||
|7879| |7879|
|
||||
|7896| |7896|
|
||||
|7897| |7897|
|
||||
|7901| |7901|
|
||||
|7909| |7909|
|
||||
|7916| |7916|
|
||||
|7921| |7921|
|
||||
|7922| |7922|
|
||||
|7931| |7931|
|
||||
|7934| |7934|
|
||||
|7936| |7936|
|
||||
|7962| |7962|
|
||||
|7970| |7970|
|
||||
|7971| |7971|
|
||||
|7973| |7973|
|
||||
|7981| |7981|
|
||||
|7992| |7992|
|
||||
|7993| |7993|
|
||||
|7999| |7999|
|
||||
|8003| |8003|
|
||||
|8027| |8027|
|
||||
|8032| |8032|
|
||||
|8040| |8040|
|
||||
|8042| |8042|
|
||||
|8064| |8064|
|
||||
|8081| |8081|
|
||||
|8085| |8085|
|
||||
|8086| |8086|
|
||||
|8104| |8104|
|
||||
|8130| |8130|
|
||||
|8133| |8133|
|
||||
|8138| |8138|
|
||||
|8145| |8145|
|
||||
|8147| |8147|
|
||||
|8150| |8150|
|
||||
|8159| |8159|
|
||||
|8172| |8172|
|
||||
|8175| |8175|
|
||||
|8193| |8193|
|
||||
|8217| |8217|
|
||||
|8245| |8245|
|
||||
|8248| |8248|
|
||||
|8252| |8252|
|
||||
|8254| |8254|
|
||||
|8267| |8267|
|
||||
|8269| |8269|
|
||||
|830| |830|
|
||||
|8334| |8334|
|
||||
|8354| |8354|
|
||||
|8389| |8389|
|
||||
|8393| |8393|
|
||||
|8394| |8394|
|
||||
|8421| |8421|
|
||||
|8426| |8426|
|
||||
|8433| |8433|
|
||||
|8444| |8444|
|
||||
|8446| |8446|
|
||||
|8454| |8454|
|
||||
|8462| |8462|
|
||||
|8503| |8503|
|
||||
|8510| |8510|
|
||||
|8537| |8537|
|
||||
|8543| |8543|
|
||||
|8544| |8544|
|
||||
|8548| |8548|
|
||||
|8549| |8549|
|
||||
|8552| |8552|
|
||||
|8562| |8562|
|
||||
|857| |857|
|
||||
|8582| |8582|
|
||||
|8585| |8585|
|
||||
|8588| |8588|
|
||||
|8610| |8610|
|
||||
|8615| |8615|
|
||||
|8651| |8651|
|
||||
|8663| |8663|
|
||||
|8666| |8666|
|
||||
|8668
5414| |8668
5414|
|
||||
|926| |926|
|
||||
|927| |927|
|
||||
|935| |935|
|
||||
|954| |954|
|
||||
|977| |977|
|
||||
|983| |983|
|
||||
|990| |990|
|
||||
|995| |995|
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
ParseLine
|
||||
$book_name: 2 Samuel, $bkno{2 Samuel}: 10
|
||||
$exceptions_file: /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_MAST_HB.txt
|
||||
$blbRef: https://www.biblehub.com/2_samuel/15-28.htm
|
||||
$blbRef: https://www.biblehub.com/2_samuel/19-6.htm
|
||||
xxx
|
||||
$missingLine: 2 Samuel 15:28 4057, $ref: 2 Samuel 15:28, $book_name: 2 Samuel, $ch: 15, $vs: 28
|
||||
$missingLine: 2 Samuel 19:6 5650, $ref: 2 Samuel 19:6, $book_name: 2 Samuel, $ch: 19, $vs: 6
|
||||
|
||||
$dataFile: /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/User/tW_work_OT.txt
|
||||
$line: ### Single hash means the book has been done but is not currently being done
|
||||
|
|
@ -21,12 +21,12 @@ $line: #09 1 Samuel 1sa 1Sa
|
|||
$line: 10 2 Samuel 2sa 2Sa
|
||||
$fullBk: 2 Samuel, $wabbr: 2sa, $numBk: 2Sa, $abr: 2Sa, $lbsBk: 2Sa
|
||||
$fullBk: |2 Samuel|, $wa{2 Samuel}: ||, $numBk: 2Sa, $abr: 2Sa, $book_name: |2 Samuel|, $lbsBk: 2Sa
|
||||
logos4:TextComparison;ref=BibleNIV.2Sa15.28;res=esv,niv2011,niv,nasb95,nrsv,gs-netbible,nlt,leb,kjv1900
|
||||
logos4:TextComparison;ref=BibleNIV.2Sa19.6;res=esv,niv2011,niv,nasb95,nrsv,gs-netbible,nlt,leb,kjv1900
|
||||
$abbr: 2sa
|
||||
|
||||
$wa{2 Samuel}/$ch/$vs: 2sa/15/28
|
||||
$wa{2 Samuel}/$ch/$vs: 2sa/19/06
|
||||
To system:
|
||||
/home/henry/Komodo-Edit-8/lib/mozilla/komodo /home/henry/Documents/WA_Repo/en_tn/2sa/15/28.md
|
||||
/home/henry/Komodo-Edit-8/lib/mozilla/komodo /home/henry/Documents/WA_Repo/en_tn/2sa/19/06.md
|
||||
|
||||
$line: ## 11 1 Kings 1ki 1Ki
|
||||
$line: ## 12 2 Kings 2ki 2Ki
|
||||
|
|
@ -57,17 +57,17 @@ $line: #36 Zephaniah zep Zep
|
|||
$line: #37 Haggai hag Hag
|
||||
$line: #38 Zechariah zec Zec
|
||||
$line: #39 Malachi mal Mal
|
||||
FindVerse |H4057|.
|
||||
$ref: 2 Samuel 15:28
|
||||
$fore: See, I will wait at the fords of the wilderness until word comes from you to inform me."
|
||||
FindVerse |H5650|.
|
||||
$ref: 2 Samuel 19:6
|
||||
$fore: because you love those who hate you, and you hate those who love you. For today you have shown that commanders and soldiers are nothing to you. Today I believe that if Absalom had lived, and we all had died, then that would have pleased you.
|
||||
|
||||
"See <H7200>, I am going to wait <H4102> at the fords <H5679> of the wilderness <H4057b> until <H5704> word <H1697> comes <H935> from you to inform <H5046> me."
|
||||
by loving <H157> those who hate <H8130> you, and by hating <H8130> those who love <H157> you. For you have shown <H5046> today <H3117> that princes <H8269> and servants <H5650> are nothing <H369> to you; for I know <H3045> this day <H3117> that if <H3863> Absalom <H53> were alive <H2416a> and all <H3605> of us were dead <H4191> today <H3117>, then <H227> you would be pleased <H3474> <H5869>.
|
||||
$precon:
|
||||
"See <H7200>, I am going to wait <H4102> at the fords <H5679> of the wilderness <
|
||||
$aft: b> until <H5704> word <H1697> comes <H935> from you to inform <H5046> me."
|
||||
$thisULB: See, I will wait at the fords of the wilderness until word comes from you to inform me."
|
||||
by loving <H157> those who hate <H8130> you, and by hating <H8130> those who love <H157> you. For you have shown <H5046> today <H3117> that princes <H8269> and servants <
|
||||
$aft: > are nothing <H369> to you; for I know <H3045> this day <H3117> that if <H3863> Absalom <H53> were alive <H2416a> and all <H3605> of us were dead <H4191> today <H3117>, then <H227> you would be pleased <H3474> <H5869>.
|
||||
$thisULB: because you love those who hate you, and you hate those who love you. For today you have shown that commanders and soldiers are nothing to you. Today I believe that if Absalom had lived, and we all had died, then that would have pleased you.
|
||||
|
||||
$&: "See <H7200>, I am going to wait <H4102> at the fords <H5679> of the wilderness <
|
||||
$preprecon: "See <H7200>, I am going to wait <H4102> at the fords <H5679> of the
|
||||
$word: wilderness
|
||||
<<wilderness>>
|
||||
$&: by loving <H157> those who hate <H8130> you, and by hating <H8130> those who love <H157> you. For you have shown <H5046> today <H3117> that princes <H8269> and servants <
|
||||
$preprecon: by loving <H157> those who hate <H8130> you, and by hating <H8130> those who love <H157> you. For you have shown <H5046> today <H3117> that princes <H8269> and
|
||||
$word: servants
|
||||
<<servants>>
|
||||
|
|
|
|||
|
|
@ -1,666 +1,175 @@
|
|||
2 Samuel 19:1 7264
|
||||
2 Samuel 19:1 5927
|
||||
2 Samuel 19:1 8179
|
||||
2 Samuel 19:1 3212
|
||||
2 Samuel 19:1 1121
|
||||
2 Samuel 19:1 5414
|
||||
2 Samuel 19:1 4191
|
||||
2 Samuel 19:2 5046
|
||||
2 Samuel 19:2 3097
|
||||
2 Samuel 19:2 53
|
||||
2 Samuel 19:3 8668
|
||||
2 Samuel 19:3 60
|
||||
2 Samuel 19:3 8085
|
||||
2 Samuel 19:3 6087
|
||||
2 Samuel 19:3 4428
|
||||
2 Samuel 19:4 1589
|
||||
2 Samuel 19:4 5971
|
||||
2 Samuel 19:4 3117
|
||||
2 Samuel 19:4 935
|
||||
2 Samuel 19:4 5892
|
||||
2 Samuel 19:4 3637
|
||||
2 Samuel 19:4 5127
|
||||
2 Samuel 19:5 2199
|
||||
2 Samuel 19:5 6963
|
||||
2 Samuel 19:5 1419
|
||||
2 Samuel 19:5 53
|
||||
2 Samuel 19:6 935
|
||||
2 Samuel 19:6 3097
|
||||
2 Samuel 19:6 4428
|
||||
2 Samuel 19:6 1004
|
||||
2 Samuel 19:6 3001
|
||||
2 Samuel 19:6 6440
|
||||
2 Samuel 19:6 5650
|
||||
2 Samuel 19:6 4422
|
||||
2 Samuel 19:6 1121
|
||||
2 Samuel 19:6 1323
|
||||
2 Samuel 19:6 6370
|
||||
2 Samuel 19:7 157
|
||||
2 Samuel 19:7 8130
|
||||
2 Samuel 19:7 5046
|
||||
2 Samuel 19:7 8269
|
||||
2 Samuel 19:3 1589 ||
|
||||
2 Samuel 19:3 935 ||
|
||||
2 Samuel 19:3 5892 ||
|
||||
2 Samuel 19:4 1419 ||
|
||||
2 Samuel 19:5 935 ||
|
||||
2 Samuel 19:5 5650
|
||||
2 Samuel 19:5 1323 ||
|
||||
2 Samuel 19:6 5046 ||
|
||||
2 Samuel 19:6 3045 ||
|
||||
2 Samuel 19:6 227 ||
|
||||
2 Samuel 19:6 3477 ||
|
||||
2 Samuel 19:6 5869 ||
|
||||
2 Samuel 19:7 1696 ||
|
||||
2 Samuel 19:7 3820 ||
|
||||
2 Samuel 19:7 5650
|
||||
2 Samuel 19:7 3045
|
||||
2 Samuel 19:7 53
|
||||
2 Samuel 19:7 2416
|
||||
2 Samuel 19:7 4191
|
||||
2 Samuel 19:7 227
|
||||
2 Samuel 19:7 3477
|
||||
2 Samuel 19:7 5869
|
||||
2 Samuel 19:8 3318
|
||||
2 Samuel 19:8 3820
|
||||
2 Samuel 19:8 5650
|
||||
2 Samuel 19:8 3068
|
||||
2 Samuel 19:8 7650
|
||||
2 Samuel 19:8 3885
|
||||
2 Samuel 19:8 376
|
||||
2 Samuel 19:8 7489
|
||||
2 Samuel 19:8 7451
|
||||
2 Samuel 19:8 935
|
||||
2 Samuel 19:8 5271
|
||||
2 Samuel 19:9 3427
|
||||
2 Samuel 19:9 8179
|
||||
2 Samuel 19:9 5046
|
||||
2 Samuel 19:9 935
|
||||
2 Samuel 19:9 5127
|
||||
2 Samuel 19:9 376
|
||||
2 Samuel 19:9 168
|
||||
2 Samuel 19:10 5971
|
||||
2 Samuel 19:10 1777
|
||||
2 Samuel 19:10 7626
|
||||
2 Samuel 19:10 3478
|
||||
2 Samuel 19:10 5337
|
||||
2 Samuel 19:10 3709
|
||||
2 Samuel 19:10 341
|
||||
2 Samuel 19:10 4422
|
||||
2 Samuel 19:10 6430
|
||||
2 Samuel 19:10 1272
|
||||
2 Samuel 19:10 776
|
||||
2 Samuel 19:11 53
|
||||
2 Samuel 19:11 4886
|
||||
2 Samuel 19:11 4191
|
||||
2 Samuel 19:11 2790
|
||||
2 Samuel 19:11 7725
|
||||
2 Samuel 19:12 1732
|
||||
2 Samuel 19:12 7971
|
||||
2 Samuel 19:12 6659
|
||||
2 Samuel 19:12 54
|
||||
2 Samuel 19:12 3548
|
||||
2 Samuel 19:12 1696
|
||||
2 Samuel 19:12 2205
|
||||
2 Samuel 19:12 3063
|
||||
2 Samuel 19:12 314
|
||||
2 Samuel 19:12 1004
|
||||
2 Samuel 19:12 1697
|
||||
2 Samuel 19:12 3478
|
||||
2 Samuel 19:12 935
|
||||
2 Samuel 19:13 251
|
||||
2 Samuel 19:13 6106
|
||||
2 Samuel 19:13 314
|
||||
2 Samuel 19:13 7725
|
||||
2 Samuel 19:13 4428
|
||||
2 Samuel 19:14 6106
|
||||
2 Samuel 19:14 1320
|
||||
2 Samuel 19:14 6213
|
||||
2 Samuel 19:14 430
|
||||
2 Samuel 19:14 3254
|
||||
2 Samuel 19:14 8269
|
||||
2 Samuel 19:14 6635
|
||||
2 Samuel 19:14 6440
|
||||
2 Samuel 19:14 3117
|
||||
2 Samuel 19:14 3097
|
||||
2 Samuel 19:15 5186
|
||||
2 Samuel 19:15 3824
|
||||
2 Samuel 19:15 376
|
||||
2 Samuel 19:15 7971
|
||||
2 Samuel 19:15 5650
|
||||
2 Samuel 19:16 7725
|
||||
2 Samuel 19:16 935
|
||||
2 Samuel 19:16 3383
|
||||
2 Samuel 19:16 1537
|
||||
2 Samuel 19:16 5674
|
||||
2 Samuel 19:17 4116
|
||||
2 Samuel 19:17 8096
|
||||
2 Samuel 19:17 3381
|
||||
2 Samuel 19:17 376
|
||||
2 Samuel 19:17 3063
|
||||
2 Samuel 19:17 7125
|
||||
2 Samuel 19:17 1732
|
||||
2 Samuel 19:18 376
|
||||
2 Samuel 19:18 1144
|
||||
2 Samuel 19:18 5288
|
||||
2 Samuel 19:18 7586
|
||||
2 Samuel 19:18 6242
|
||||
2 Samuel 19:18 5650
|
||||
2 Samuel 19:19 5674
|
||||
2 Samuel 19:19 1004
|
||||
2 Samuel 19:19 2896
|
||||
2 Samuel 19:19 5869
|
||||
2 Samuel 19:19 1121
|
||||
2 Samuel 19:19 5307
|
||||
2 Samuel 19:19 6440
|
||||
2 Samuel 19:19 3383
|
||||
2 Samuel 19:20 2803
|
||||
2 Samuel 19:20 5771
|
||||
2 Samuel 19:20 2142
|
||||
2 Samuel 19:20 5753
|
||||
2 Samuel 19:20 3318
|
||||
2 Samuel 19:20 3389
|
||||
2 Samuel 19:20 7760
|
||||
2 Samuel 19:20 3820
|
||||
2 Samuel 19:21 3045
|
||||
2 Samuel 19:21 5650
|
||||
2 Samuel 19:21 2398
|
||||
2 Samuel 19:21 935
|
||||
2 Samuel 19:21 3117
|
||||
2 Samuel 19:21 7223
|
||||
2 Samuel 19:21 1004
|
||||
2 Samuel 19:21 3130
|
||||
2 Samuel 19:21 3381
|
||||
2 Samuel 19:21 7125
|
||||
2 Samuel 19:21 113
|
||||
2 Samuel 19:21 4428
|
||||
2 Samuel 19:22 6030
|
||||
2 Samuel 19:22 8096
|
||||
2 Samuel 19:22 7043
|
||||
2 Samuel 19:22 4899
|
||||
2 Samuel 19:22 3068
|
||||
2 Samuel 19:23 1732
|
||||
2 Samuel 19:23 1121
|
||||
2 Samuel 19:23 3117
|
||||
2 Samuel 19:23 7854
|
||||
2 Samuel 19:23 376
|
||||
2 Samuel 19:23 3478
|
||||
2 Samuel 19:23 3045
|
||||
2 Samuel 19:24 8096
|
||||
2 Samuel 19:24 4191
|
||||
2 Samuel 19:24 7650
|
||||
2 Samuel 19:25 1121
|
||||
2 Samuel 19:25 7586
|
||||
2 Samuel 19:25 3381
|
||||
2 Samuel 19:25 6213
|
||||
2 Samuel 19:25 7272
|
||||
2 Samuel 19:25 899
|
||||
2 Samuel 19:25 3117
|
||||
2 Samuel 19:25 3212
|
||||
2 Samuel 19:25 935
|
||||
2 Samuel 19:25 7965
|
||||
2 Samuel 19:26 935
|
||||
2 Samuel 19:26 3389
|
||||
2 Samuel 19:26 7125
|
||||
2 Samuel 19:26 1980
|
||||
2 Samuel 19:27 7411
|
||||
2 Samuel 19:27 2280
|
||||
2 Samuel 19:27 2543
|
||||
2 Samuel 19:27 3212
|
||||
2 Samuel 19:28 7270
|
||||
2 Samuel 19:28 4397
|
||||
2 Samuel 19:28 430
|
||||
2 Samuel 19:28 6213
|
||||
2 Samuel 19:28 2896
|
||||
2 Samuel 19:28 5869
|
||||
2 Samuel 19:29 1004
|
||||
2 Samuel 19:29 1
|
||||
2 Samuel 19:29 376
|
||||
2 Samuel 19:29 4194
|
||||
2 Samuel 19:29 113
|
||||
2 Samuel 19:29 7896
|
||||
2 Samuel 19:29 5650
|
||||
2 Samuel 19:29 398
|
||||
2 Samuel 19:29 3426
|
||||
2 Samuel 19:29 5750
|
||||
2 Samuel 19:29 6666
|
||||
2 Samuel 19:30 1696
|
||||
2 Samuel 19:30 5750
|
||||
2 Samuel 19:30 1697
|
||||
2 Samuel 19:30 2505
|
||||
2 Samuel 19:31 3947
|
||||
2 Samuel 19:31 935
|
||||
2 Samuel 19:31 113
|
||||
2 Samuel 19:31 7965
|
||||
2 Samuel 19:31 1004
|
||||
2 Samuel 19:32 1569
|
||||
2 Samuel 19:32 3381
|
||||
2 Samuel 19:32 5674
|
||||
2 Samuel 19:32 3383
|
||||
2 Samuel 19:32 7971
|
||||
2 Samuel 19:33 3966
|
||||
2 Samuel 19:33 1121
|
||||
2 Samuel 19:33 8141
|
||||
2 Samuel 19:33 3557
|
||||
2 Samuel 19:33 376
|
||||
2 Samuel 19:33 1419
|
||||
2 Samuel 19:34 5674
|
||||
2 Samuel 19:34 3557
|
||||
2 Samuel 19:35 3117
|
||||
2 Samuel 19:35 2416
|
||||
2 Samuel 19:35 5927
|
||||
2 Samuel 19:35 3389
|
||||
2 Samuel 19:36 1121
|
||||
2 Samuel 19:36 8141
|
||||
2 Samuel 19:36 3117
|
||||
2 Samuel 19:36 3045
|
||||
2 Samuel 19:36 2896
|
||||
2 Samuel 19:36 7451
|
||||
2 Samuel 19:36 398
|
||||
2 Samuel 19:36 8354
|
||||
2 Samuel 19:36 8085
|
||||
2 Samuel 19:36 5750
|
||||
2 Samuel 19:36 6963
|
||||
2 Samuel 19:36 4853
|
||||
2 Samuel 19:36 113
|
||||
2 Samuel 19:37 4592
|
||||
2 Samuel 19:37 5674
|
||||
2 Samuel 19:37 3383
|
||||
2 Samuel 19:37 1578
|
||||
2 Samuel 19:38 7725
|
||||
2 Samuel 19:38 4994
|
||||
2 Samuel 19:38 5650
|
||||
2 Samuel 19:38 4191
|
||||
2 Samuel 19:38 5892
|
||||
2 Samuel 19:38 6913
|
||||
2 Samuel 19:38 1
|
||||
2 Samuel 19:38 5674
|
||||
2 Samuel 19:38 113
|
||||
2 Samuel 19:38 6213
|
||||
2 Samuel 19:39 5674
|
||||
2 Samuel 19:39 6213
|
||||
2 Samuel 19:39 2896
|
||||
2 Samuel 19:39 5869
|
||||
2 Samuel 19:39 977
|
||||
2 Samuel 19:40 5674
|
||||
2 Samuel 19:40 3383
|
||||
2 Samuel 19:40 5401
|
||||
2 Samuel 19:40 1288
|
||||
2 Samuel 19:40 7725
|
||||
2 Samuel 19:40 4725
|
||||
2 Samuel 19:41 5674
|
||||
2 Samuel 19:41 1537
|
||||
2 Samuel 19:41 5971
|
||||
2 Samuel 19:42 376
|
||||
2 Samuel 19:42 935
|
||||
2 Samuel 19:42 1589
|
||||
2 Samuel 19:42 251
|
||||
2 Samuel 19:42 1004
|
||||
2 Samuel 19:42 3383
|
||||
2 Samuel 19:42 1732
|
||||
2 Samuel 19:43 6030
|
||||
2 Samuel 19:43 376
|
||||
2 Samuel 19:43 7138
|
||||
2 Samuel 19:43 2734
|
||||
2 Samuel 19:43 398
|
||||
2 Samuel 19:43 5379
|
||||
2 Samuel 19:43 5375
|
||||
2 Samuel 20:1 376
|
||||
2 Samuel 19:7 3885 ||
|
||||
2 Samuel 19:7 376 ||
|
||||
2 Samuel 19:7 7489 ||
|
||||
2 Samuel 19:7 7451 ||
|
||||
2 Samuel 19:7 935 ||
|
||||
2 Samuel 19:8 3427 ||
|
||||
2 Samuel 19:8 935 ||
|
||||
2 Samuel 19:8 376 ||
|
||||
2 Samuel 19:8 168
|
||||
2 Samuel 19:10 2790 ||
|
||||
2 Samuel 19:10 7725 ||
|
||||
2 Samuel 19:11 1696 ||
|
||||
2 Samuel 19:11 314 ||
|
||||
2 Samuel 19:11 7725 ||
|
||||
2 Samuel 19:11 935 ||
|
||||
2 Samuel 19:12 6106 ||
|
||||
2 Samuel 19:12 314 ||
|
||||
2 Samuel 19:13 6106 ||
|
||||
2 Samuel 19:13 6213 ||
|
||||
2 Samuel 19:13 3254 ||
|
||||
2 Samuel 19:13 6440 ||
|
||||
2 Samuel 19:13 3117 ||
|
||||
2 Samuel 19:14 5186 ||
|
||||
2 Samuel 19:14 376 ||
|
||||
2 Samuel 19:14 5650
|
||||
2 Samuel 19:15 935 ||
|
||||
2 Samuel 19:15 3212 ||
|
||||
2 Samuel 19:15 5674 ||
|
||||
2 Samuel 19:16 4116 ||
|
||||
2 Samuel 19:16 376 ||
|
||||
2 Samuel 19:17 376 ||
|
||||
2 Samuel 19:17 1004 ||
|
||||
2 Samuel 19:17 6242 ||
|
||||
2 Samuel 19:17 6743 ||
|
||||
2 Samuel 19:18 5674 ||
|
||||
2 Samuel 19:18 5869 ||
|
||||
2 Samuel 19:18 5307 ||
|
||||
2 Samuel 19:19 2803 ||
|
||||
2 Samuel 19:19 2142 ||
|
||||
2 Samuel 19:19 3318 ||
|
||||
2 Samuel 19:19 7760 ||
|
||||
2 Samuel 19:20 935 ||
|
||||
2 Samuel 19:20 7223 ||
|
||||
2 Samuel 19:20 3381 ||
|
||||
2 Samuel 19:21 6030 ||
|
||||
2 Samuel 19:22 376 ||
|
||||
2 Samuel 19:24 3381 ||
|
||||
2 Samuel 19:24 6213 ||
|
||||
2 Samuel 19:24 7272 ||
|
||||
2 Samuel 19:24 3212 ||
|
||||
2 Samuel 19:24 935 ||
|
||||
2 Samuel 19:25 935 ||
|
||||
2 Samuel 19:25 1980 ||
|
||||
2 Samuel 19:26 2280 ||
|
||||
2 Samuel 19:26 3212 ||
|
||||
2 Samuel 19:27 6213 ||
|
||||
2 Samuel 19:27 5869 ||
|
||||
2 Samuel 19:28 376 ||
|
||||
2 Samuel 19:28 7896 ||
|
||||
2 Samuel 19:28 398 ||
|
||||
2 Samuel 19:28 3426 ||
|
||||
2 Samuel 19:28 5750 ||
|
||||
2 Samuel 19:29 5750 ||
|
||||
2 Samuel 19:29 2505 ||
|
||||
2 Samuel 19:30 3947 ||
|
||||
2 Samuel 19:30 935 ||
|
||||
2 Samuel 19:31 3381 ||
|
||||
2 Samuel 19:31 5674 ||
|
||||
2 Samuel 19:31 7971 ||
|
||||
2 Samuel 19:32 3966 ||
|
||||
2 Samuel 19:32 1121 ||
|
||||
2 Samuel 19:32 3557 ||
|
||||
2 Samuel 19:32 376 ||
|
||||
2 Samuel 19:33 5674 ||
|
||||
2 Samuel 19:33 3557 ||
|
||||
2 Samuel 19:34 5927 ||
|
||||
2 Samuel 19:35 1121 ||
|
||||
2 Samuel 19:35 3117 ||
|
||||
2 Samuel 19:35 3045 ||
|
||||
2 Samuel 19:35 398 ||
|
||||
2 Samuel 19:35 8354 ||
|
||||
2 Samuel 19:35 5750 ||
|
||||
2 Samuel 19:36 4592 ||
|
||||
2 Samuel 19:36 5674 ||
|
||||
2 Samuel 19:37 4994 ||
|
||||
2 Samuel 19:37 5892 ||
|
||||
2 Samuel 19:37 5674 ||
|
||||
2 Samuel 19:37 6213 ||
|
||||
2 Samuel 19:37 5869 ||
|
||||
2 Samuel 19:38 5674 ||
|
||||
2 Samuel 19:38 6213 ||
|
||||
2 Samuel 19:38 977 ||
|
||||
2 Samuel 19:39 5674 ||
|
||||
2 Samuel 19:39 4725 ||
|
||||
2 Samuel 19:40 5674 ||
|
||||
2 Samuel 19:41 376 ||
|
||||
2 Samuel 19:41 935 ||
|
||||
2 Samuel 19:41 5674 ||
|
||||
2 Samuel 19:42 6030 ||
|
||||
2 Samuel 19:42 376 ||
|
||||
2 Samuel 19:42 7138 ||
|
||||
2 Samuel 19:42 1697 ||
|
||||
2 Samuel 19:42 398 ||
|
||||
2 Samuel 19:42 5375 ||
|
||||
2 Samuel 19:43 6030 ||
|
||||
2 Samuel 19:43 376 ||
|
||||
2 Samuel 19:43 6235 ||
|
||||
2 Samuel 19:43 3027 ||
|
||||
2 Samuel 19:43 7043 ||
|
||||
2 Samuel 19:43 7223 ||
|
||||
2 Samuel 19:43 7185
|
||||
2 Samuel 20:1 1100
|
||||
2 Samuel 20:1 5159
|
||||
2 Samuel 20:1 168
|
||||
2 Samuel 20:2 5927
|
||||
2 Samuel 20:2 376
|
||||
2 Samuel 20:2 1692
|
||||
2 Samuel 20:3 935
|
||||
2 Samuel 20:3 3947
|
||||
2 Samuel 20:3 4428
|
||||
2 Samuel 20:3 6370
|
||||
2 Samuel 20:3 5414
|
||||
2 Samuel 20:3 4931
|
||||
2 Samuel 20:3 3557
|
||||
2 Samuel 20:3 6887
|
||||
2 Samuel 20:4 376
|
||||
2 Samuel 20:4 5975
|
||||
2 Samuel 20:5 3212
|
||||
2 Samuel 20:5 3259
|
||||
2 Samuel 20:6 3947
|
||||
2 Samuel 20:6 4672
|
||||
2 Samuel 20:6 5892
|
||||
2 Samuel 20:6 5337
|
||||
2 Samuel 20:6 5869
|
||||
2 Samuel 20:7 3318
|
||||
2 Samuel 20:7 376
|
||||
2 Samuel 20:8 935
|
||||
2 Samuel 20:8 6440
|
||||
2 Samuel 20:8 3830
|
||||
2 Samuel 20:8 3318
|
||||
2 Samuel 20:8 5307
|
||||
2 Samuel 20:9 7965
|
||||
2 Samuel 20:9 251
|
||||
2 Samuel 20:9 270
|
||||
2 Samuel 20:9 3225
|
||||
2 Samuel 20:10 8104
|
||||
2 Samuel 20:10 2719
|
||||
2 Samuel 20:10 5221
|
||||
2 Samuel 20:10 4578
|
||||
2 Samuel 20:10 8138
|
||||
2 Samuel 20:11 376
|
||||
2 Samuel 20:11 5975
|
||||
2 Samuel 20:11 5288
|
||||
2 Samuel 20:11 2654
|
||||
2 Samuel 20:12 1556
|
||||
2 Samuel 20:12 7200
|
||||
2 Samuel 20:12 376
|
||||
2 Samuel 20:12 5975
|
||||
2 Samuel 20:12 5437
|
||||
2 Samuel 20:12 7993
|
||||
2 Samuel 20:12 935
|
||||
2 Samuel 20:13 5674
|
||||
2 Samuel 20:13 376
|
||||
2 Samuel 20:13 7291
|
||||
2 Samuel 20:14 5674
|
||||
2 Samuel 20:14 935
|
||||
2 Samuel 20:15 935
|
||||
2 Samuel 20:15 5892
|
||||
2 Samuel 20:15 5975
|
||||
2 Samuel 20:15 7843
|
||||
2 Samuel 20:15 5307
|
||||
2 Samuel 20:16 5892
|
||||
2 Samuel 20:16 4994
|
||||
2 Samuel 20:16 7126
|
||||
2 Samuel 20:16 1696
|
||||
2 Samuel 20:17 7126
|
||||
2 Samuel 20:18 1696
|
||||
2 Samuel 20:18 8552
|
||||
2 Samuel 20:19 5892
|
||||
2 Samuel 20:20 6030
|
||||
2 Samuel 20:20 7843
|
||||
2 Samuel 20:21 376
|
||||
2 Samuel 20:21 5414
|
||||
2 Samuel 20:21 3212
|
||||
2 Samuel 20:21 5892
|
||||
2 Samuel 20:22 935
|
||||
2 Samuel 20:22 6327
|
||||
2 Samuel 20:22 5892
|
||||
2 Samuel 20:22 376
|
||||
2 Samuel 20:22 168
|
||||
2 Samuel 20:24 2142
|
||||
2 Samuel 20:26 3548
|
||||
2 Samuel 21:1 1818
|
||||
2 Samuel 21:2 7121
|
||||
2 Samuel 21:2 4428
|
||||
2 Samuel 21:2 3499
|
||||
2 Samuel 21:3 6213
|
||||
2 Samuel 21:4 376
|
||||
2 Samuel 21:4 6213
|
||||
2 Samuel 21:5 376
|
||||
2 Samuel 21:5 1819
|
||||
2 Samuel 21:6 5414
|
||||
2 Samuel 21:6 7651
|
||||
2 Samuel 21:6 376
|
||||
2 Samuel 21:7 1322
|
||||
2 Samuel 21:8 3947
|
||||
2 Samuel 21:8 8147
|
||||
2 Samuel 21:8 1323
|
||||
2 Samuel 21:9 5414
|
||||
2 Samuel 21:9 5307
|
||||
2 Samuel 21:9 7223
|
||||
2 Samuel 21:9 8462
|
||||
2 Samuel 21:10 3947
|
||||
2 Samuel 21:10 1323
|
||||
2 Samuel 21:10 5186
|
||||
2 Samuel 21:10 6697
|
||||
2 Samuel 21:10 8462
|
||||
2 Samuel 21:10 5413
|
||||
2 Samuel 21:10 4325
|
||||
2 Samuel 21:10 5414
|
||||
2 Samuel 21:10 5117
|
||||
2 Samuel 21:11 6213
|
||||
2 Samuel 21:11 1323
|
||||
2 Samuel 21:11 6370
|
||||
2 Samuel 21:12 3212
|
||||
2 Samuel 21:12 3947
|
||||
2 Samuel 21:12 6106
|
||||
2 Samuel 21:12 1167
|
||||
2 Samuel 21:12 7339
|
||||
2 Samuel 21:12 3117
|
||||
2 Samuel 21:13 6106
|
||||
2 Samuel 21:14 6106
|
||||
2 Samuel 21:14 6213
|
||||
2 Samuel 21:15 5750
|
||||
2 Samuel 21:15 3381
|
||||
2 Samuel 21:15 5650
|
||||
2 Samuel 21:16 2319
|
||||
2 Samuel 21:17 4191
|
||||
2 Samuel 21:17 227
|
||||
2 Samuel 21:17 376
|
||||
2 Samuel 21:17 3318
|
||||
2 Samuel 21:17 5750
|
||||
2 Samuel 21:18 5750
|
||||
2 Samuel 21:18 227
|
||||
2 Samuel 21:19 5750
|
||||
2 Samuel 21:20 5750
|
||||
2 Samuel 21:20 376
|
||||
2 Samuel 21:20 7272
|
||||
2 Samuel 21:20 6242
|
||||
2 Samuel 21:20 4557
|
||||
2 Samuel 21:21 8096
|
||||
2 Samuel 21:22 5307
|
||||
2 Samuel 21:22 5650
|
||||
2 Samuel 22:1 1696
|
||||
2 Samuel 22:3 6697
|
||||
2 Samuel 22:5 1100
|
||||
2 Samuel 22:5 1204
|
||||
2 Samuel 22:6 5437
|
||||
2 Samuel 22:7 7775
|
||||
2 Samuel 22:7 241
|
||||
2 Samuel 22:9 5927
|
||||
2 Samuel 22:9 639
|
||||
2 Samuel 22:9 6310
|
||||
2 Samuel 22:9 398
|
||||
2 Samuel 22:9 1513
|
||||
2 Samuel 22:9 1197
|
||||
2 Samuel 22:10 5186
|
||||
2 Samuel 22:10 3381
|
||||
2 Samuel 22:10 7272
|
||||
2 Samuel 22:11 7200
|
||||
2 Samuel 22:11 7307
|
||||
2 Samuel 22:12 7896
|
||||
2 Samuel 22:12 4325
|
||||
2 Samuel 22:13 1513
|
||||
2 Samuel 22:13 784
|
||||
2 Samuel 22:14 7481
|
||||
2 Samuel 22:14 5414
|
||||
2 Samuel 22:15 7971
|
||||
2 Samuel 22:15 2000
|
||||
2 Samuel 22:16 7200
|
||||
2 Samuel 22:16 650
|
||||
2 Samuel 22:16 1540
|
||||
2 Samuel 22:16 7307
|
||||
2 Samuel 22:16 639
|
||||
2 Samuel 22:17 7971
|
||||
2 Samuel 22:17 4791
|
||||
2 Samuel 22:17 7227
|
||||
2 Samuel 22:20 3318
|
||||
2 Samuel 22:20 4800
|
||||
2 Samuel 22:22 1870
|
||||
2 Samuel 22:23 4941
|
||||
2 Samuel 22:24 8549
|
||||
2 Samuel 22:24 5771
|
||||
2 Samuel 22:25 5869
|
||||
2 Samuel 22:26 8552
|
||||
2 Samuel 22:28 5869
|
||||
2 Samuel 22:28 8213
|
||||
2 Samuel 22:30 1416
|
||||
2 Samuel 22:31 1870
|
||||
2 Samuel 22:31 3068
|
||||
2 Samuel 22:32 430
|
||||
2 Samuel 22:33 2428
|
||||
2 Samuel 22:33 5425
|
||||
2 Samuel 22:33 1870
|
||||
2 Samuel 22:34 7272
|
||||
2 Samuel 22:34 1116
|
||||
2 Samuel 22:34 5975
|
||||
2 Samuel 22:35 3925
|
||||
2 Samuel 22:35 5181
|
||||
2 Samuel 22:35 2220
|
||||
2 Samuel 22:36 6031
|
||||
2 Samuel 22:36 7235
|
||||
2 Samuel 22:39 5307
|
||||
2 Samuel 22:39 7272
|
||||
2 Samuel 22:40 3766
|
||||
2 Samuel 22:41 5414
|
||||
2 Samuel 22:41 6203
|
||||
2 Samuel 22:41 6789
|
||||
2 Samuel 22:42 8159
|
||||
2 Samuel 22:43 1854
|
||||
2 Samuel 22:44 1471
|
||||
2 Samuel 22:45 1121
|
||||
2 Samuel 22:45 3584
|
||||
2 Samuel 22:45 241
|
||||
2 Samuel 22:46 1121
|
||||
2 Samuel 22:46 5034
|
||||
2 Samuel 22:46 2296
|
||||
2 Samuel 22:47 430
|
||||
2 Samuel 22:48 5414
|
||||
2 Samuel 22:48 3381
|
||||
2 Samuel 22:49 7311
|
||||
2 Samuel 22:49 376
|
||||
2 Samuel 22:50 3034
|
||||
2 Samuel 22:50 2167
|
||||
2 Samuel 22:51 6213
|
||||
2 Samuel 23:1 314
|
||||
2 Samuel 23:1 5002
|
||||
2 Samuel 23:1 1397
|
||||
2 Samuel 23:1 2158
|
||||
2 Samuel 23:2 1696
|
||||
2 Samuel 23:3 1696
|
||||
2 Samuel 23:3 120
|
||||
2 Samuel 23:5 7760
|
||||
2 Samuel 23:5 6186
|
||||
2 Samuel 23:5 3468
|
||||
2 Samuel 23:5 6779
|
||||
2 Samuel 23:6 5074
|
||||
2 Samuel 23:6 3947
|
||||
2 Samuel 23:7 376
|
||||
2 Samuel 23:7 4390
|
||||
2 Samuel 23:7 1270
|
||||
2 Samuel 23:7 6086
|
||||
2 Samuel 23:7 7675
|
||||
2 Samuel 23:8 7991
|
||||
2 Samuel 23:8 6471
|
||||
2 Samuel 23:9 5927
|
||||
2 Samuel 23:9 376
|
||||
2 Samuel 23:10 6965
|
||||
2 Samuel 23:10 5221
|
||||
2 Samuel 23:10 3021
|
||||
2 Samuel 23:10 1692
|
||||
2 Samuel 23:10 6213
|
||||
2 Samuel 23:11 4395
|
||||
2 Samuel 23:11 5127
|
||||
2 Samuel 23:11 6440
|
||||
2 Samuel 23:12 6213
|
||||
2 Samuel 23:13 3381
|
||||
2 Samuel 23:13 7970
|
||||
2 Samuel 23:13 7218
|
||||
2 Samuel 23:13 935
|
||||
2 Samuel 23:13 2416
|
||||
2 Samuel 23:15 183
|
||||
2 Samuel 23:16 5375
|
||||
2 Samuel 23:16 935
|
||||
2 Samuel 23:16 14
|
||||
2 Samuel 23:16 8354
|
||||
2 Samuel 23:16 5258
|
||||
2 Samuel 23:17 376
|
||||
2 Samuel 23:17 1980
|
||||
2 Samuel 23:17 14
|
||||
2 Samuel 23:17 8354
|
||||
2 Samuel 23:18 7992
|
||||
2 Samuel 23:18 5782
|
||||
2 Samuel 23:18 8034
|
||||
2 Samuel 23:19 935
|
||||
2 Samuel 23:20 376
|
||||
2 Samuel 23:20 2416
|
||||
2 Samuel 23:20 8147
|
||||
2 Samuel 23:20 3381
|
||||
2 Samuel 23:20 738
|
||||
2 Samuel 23:21 376
|
||||
2 Samuel 23:21 4758
|
||||
2 Samuel 23:21 3381
|
||||
2 Samuel 23:22 6213
|
||||
2 Samuel 23:23 7970
|
||||
2 Samuel 23:23 935
|
||||
2 Samuel 23:23 7760
|
||||
2 Samuel 23:23 4928
|
||||
2 Samuel 23:24 7970
|
||||
2 Samuel 23:39 7970
|
||||
2 Samuel 23:39 7651
|
||||
2 Samuel 24:1 3254
|
||||
2 Samuel 24:1 2734
|
||||
2 Samuel 24:1 3212
|
||||
2 Samuel 24:1 4487
|
||||
2 Samuel 24:2 7751
|
||||
2 Samuel 24:2 4994
|
||||
2 Samuel 24:2 6485
|
||||
2 Samuel 24:2 4557
|
||||
2 Samuel 24:3 5869
|
||||
2 Samuel 24:3 7200
|
||||
2 Samuel 24:3 2654
|
||||
2 Samuel 24:3 1697
|
||||
2 Samuel 24:4 2388
|
||||
2 Samuel 24:4 3318
|
||||
2 Samuel 24:4 6485
|
||||
2 Samuel 24:5 5674
|
||||
2 Samuel 24:5 3225
|
||||
2 Samuel 24:5 5892
|
||||
2 Samuel 24:6 935
|
||||
2 Samuel 24:7 935
|
||||
2 Samuel 24:7 5892
|
||||
2 Samuel 24:7 3318
|
||||
2 Samuel 24:8 7751
|
||||
2 Samuel 24:8 935
|
||||
2 Samuel 24:8 3117
|
||||
2 Samuel 24:9 5414
|
||||
2 Samuel 24:9 4557
|
||||
2 Samuel 24:9 4662
|
||||
2 Samuel 24:9 5971
|
||||
2 Samuel 24:9 376
|
||||
2 Samuel 24:10 5608
|
||||
2 Samuel 24:10 5971
|
||||
2 Samuel 24:10 3966
|
||||
2 Samuel 24:10 6213
|
||||
2 Samuel 24:10 5674
|
||||
2 Samuel 24:11 3068
|
||||
2 Samuel 24:12 1980
|
||||
2 Samuel 24:12 1696
|
||||
2 Samuel 24:12 6213
|
||||
2 Samuel 24:13 935
|
||||
2 Samuel 24:13 5046
|
||||
2 Samuel 24:13 6440
|
||||
2 Samuel 24:13 3045
|
||||
2 Samuel 24:13 7200
|
||||
2 Samuel 24:14 3966
|
||||
2 Samuel 24:14 5307
|
||||
2 Samuel 24:14 4994
|
||||
2 Samuel 24:14 7227
|
||||
2 Samuel 24:14 120
|
||||
2 Samuel 24:15 4150
|
||||
2 Samuel 24:15 7657
|
||||
2 Samuel 24:15 376
|
||||
2 Samuel 24:16 7971
|
||||
2 Samuel 24:16 7227
|
||||
2 Samuel 24:16 7503
|
||||
2 Samuel 24:17 7200
|
||||
2 Samuel 24:17 6213
|
||||
2 Samuel 24:17 4994
|
||||
2 Samuel 24:18 935
|
||||
2 Samuel 24:18 5927
|
||||
2 Samuel 24:18 6965
|
||||
2 Samuel 24:19 5927
|
||||
2 Samuel 24:20 7200
|
||||
2 Samuel 24:20 5674
|
||||
2 Samuel 24:20 3318
|
||||
2 Samuel 24:21 935
|
||||
2 Samuel 24:21 7069
|
||||
2 Samuel 24:21 1129
|
||||
2 Samuel 24:21 6113
|
||||
2 Samuel 24:22 3947
|
||||
2 Samuel 24:22 5869
|
||||
2 Samuel 24:22 7200
|
||||
2 Samuel 24:22 5930
|
||||
2 Samuel 24:22 6086
|
||||
2 Samuel 24:23 5414
|
||||
2 Samuel 24:24 7069
|
||||
2 Samuel 24:24 4242
|
||||
2 Samuel 24:24 430
|
||||
2 Samuel 24:24 5930
|
||||
2 Samuel 24:24 2600
|
||||
2 Samuel 24:25 1129
|
||||
2 Samuel 24:25 6113
|
||||
|
||||
|
|
|
|||
|
|
@ -491,8 +491,8 @@
|
|||
2 Samuel 19:2 So the victory that day was turned into mourning for all the army, for the army heard it said that day, "The king is mourning for his son."
|
||||
2 Samuel 19:3 The soldiers had to sneak quietly into the city that day, like people who are ashamed sneak away when they run from battle.
|
||||
2 Samuel 19:4 The king covered his face and cried in a loud voice, "My son Absalom, Absalom, my son, my son!"
|
||||
2 Samuel 19:5 Then Joab entered into the house to the king and said to him, "You have shamed the faces of all your soldiers today, who have saved your life today, and the lives of your sons and of your daughters, and the lives of your wives, and the lives of your slave wives,
|
||||
2 Samuel 19:6 because you love those who hate you, and you hate those who love you. For today you have shown that commanders and soldiers are nothing to you. Today I believe that if Absalom had lived, and we all had died, then that would have pleased you.
|
||||
2 Samuel 19:5 Then Joab entered into the house to the king and said to him, "You have shamed the faces of all your soldiers today, who have saved your life today, and the lives of your sons and of your daughters, and the lives of your wives, and the lives of your concubines,
|
||||
2 Samuel 19:6 because you love those who hate you, and you hate those who love you. For today you have shown that commanders and servants are nothing to you. Today I believe that if Absalom had lived, and we all had died, then that would have pleased you.
|
||||
2 Samuel 19:7 Now therefore get up and go out and speak kindly to your soldiers, for I swear by Yahweh, if you do not go, not one man will remain with you tonight. That would be worse for you than all the disasters that have ever happened to you from your youth until now."
|
||||
2 Samuel 19:8 So the king got up and sat in the city gate, and all the people were told, "Look, the king is sitting in the gate," and all the people came before the king. So Israel fled, every man to his home.
|
||||
2 Samuel 19:9 All the people were arguing with each other throughout all the tribes of Israel saying, "The king rescued us out of the hand of our enemies, and he saved us out of the hand of the Philistines, but now he has run out of the land because of Absalom.
|
||||
|
|
@ -532,7 +532,7 @@
|
|||
2 Samuel 19:43 The men of Israel answered the men of Judah, "We have ten tribes related to the king, so we have even more right to David than you. Why then did you despise us? Was not our proposal to bring back our king the first to be heard?" But the words of the men of Judah were even more harsh than the words of the men of Israel.
|
||||
2 Samuel 20:1 There also happened to be at the same place a troublemaker whose name was Sheba son of Bikri, a Benjamite. He blew the trumpet and said, "We have no part in David, neither have we any inheritance in the son of Jesse. Let every man go back to his home, Israel."
|
||||
2 Samuel 20:2 So all the men of Israel deserted David and followed Sheba son of Bikri. But the men of Judah followed closely their king, from the Jordan all the way to Jerusalem.
|
||||
2 Samuel 20:3 When David came to his palace at Jerusalem, he took the ten slave wives whom he had left to keep the palace, and he put them in a house under guard. He provided for their needs, but he did not lie with them any longer. So they were shut up to the day of their death, living as if they were widows.
|
||||
2 Samuel 20:3 When David came to his palace at Jerusalem, he took the ten concubines whom he had left to keep the palace, and he put them in a house under guard. He provided for their needs, but he did not lie with them any longer. So they were shut up to the day of their death, living as if they were widows.
|
||||
2 Samuel 20:4 Then the king said to Amasa, "Call the men of Judah together within three days; you must be here, too."
|
||||
2 Samuel 20:5 So Amasa went to call Judah, but he was delayed beyond the time that the king had allotted for him.
|
||||
2 Samuel 20:6 So David said to Abishai, "Now Sheba son of Bikri will do us more harm than Absalom did. Take your master's servants and pursue after him, or he will find fortified cities and escape out of our sight."
|
||||
|
|
@ -566,7 +566,7 @@
|
|||
2 Samuel 21:8 But the king took the two sons of Rizpah daughter of Aiah, sons whom she bore to Saul—the two sons were named Armoni and Mephibosheth; and David also took the five sons of Merab daughter of Saul, whom she bore to Adriel son of Barzillai the Meholathite.
|
||||
2 Samuel 21:9 He handed them over into the hands of the Gibeonites. They hanged them on the mountain before Yahweh, and they died all seven together. They were put to death during the time of harvest, during the first days at the beginning of barley harvest.
|
||||
2 Samuel 21:10 Then Rizpah, the daughter of Aiah, took sackcloth and spread it for herself on the mountain beside the dead bodies, from the beginning of harvest until the rain poured down on them from the sky. She did not allow the birds of the sky to disturb the bodies by day or the wild animals by night.
|
||||
2 Samuel 21:11 It was told to David what Rizpah, the daughter of Aiah, the slave wife of Saul, had done.
|
||||
2 Samuel 21:11 It was told to David what Rizpah, the daughter of Aiah, the concubine of Saul, had done.
|
||||
2 Samuel 21:12 So David went and took the bones of Saul and the bones of Jonathan his son from the men of Jabesh Gilead, who had stolen them from the public square of Beth Shan, where the Philistines had hanged them, after the Philistines had killed Saul in Gilboa.
|
||||
2 Samuel 21:13 David took away from there the bones of Saul and the bones of Jonathan his son, and they gathered the bones of the seven men who had been hanged, as well.
|
||||
2 Samuel 21:14 They buried the bones of Saul and Jonathan his son in the country of Benjamin in Zela, in the tomb of Kish his father. They performed all that the king commanded. After that God answered their prayers for the land.
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,3 +1,3 @@
|
|||
2 Samuel 15:28 4057
|
||||
2 Samuel 19:6 5650
|
||||
hebrew
|
||||
firefox<>
|
||||
|
|
@ -5,21 +5,25 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
<p>2 Samuel 15:28 See, I will wait at the fords of the wilderness until word comes from you to inform me."
|
||||
<p>2 Samuel 19:6 because you love those who hate you, and you hate those who love you. For today you have shown that commanders and soldiers are nothing to you. Today I believe that if Absalom had lived, and we all had died, then that would have pleased you.
|
||||
</p>
|
||||
<p>"See <H7200>, I am going to wait <H4102> at the fords <H5679> of the <span style="color:red">wilderness</span> <<span style="color:red">H4057</span>b> until <H5704> word <H1697> comes <H935> from you to inform <H5046> me."</p>
|
||||
<p>by loving <H157> those who hate <H8130> you, and by hating <H8130> those who love <H157> you. For you have shown <H5046> today <H3117> that princes <H8269> and <span style="color:red">servants</span> <<span style="color:red">H5650</span>> are nothing <H369> to you; for I know <H3045> this day <H3117> that if <H3863> Absalom <H53> were alive <H2416a> and all <H3605> of us were dead <H4191> today <H3117>, then <H227> you would be pleased <H3474> <H5869>.</p>
|
||||
|
||||
<p>
|
||||
/home/henry/Documents/WA_Repo/en_tw/bible/other/desert<br />
|
||||
/home/henry/Documents/WA_Repo/en_tw/bible/other/enslave<br />
|
||||
|
||||
/home/henry/Documents/WA_Repo/en_tw/bible/other/desert<br />
|
||||
/home/henry/Documents/WA_Repo/en_tw/bible/other/servant<br />
|
||||
|
||||
/home/henry/Documents/WA_Repo/en_tw/bible/other/servant<br />
|
||||
|
||||
</p>
|
||||
<p>
|
||||
<b><a href="/home/henry/Documents/WA_Repo/en_tw/bible/other/desert.md">/home/henry/Documents/WA_Repo/en_tw/bible/other/desert.md</a></b>: * Strong's: H776, H2723, H3293, H3452, <span style="color:red">H4057,</span> H6160, H6723, H6728, H6921, H8047, H8414, G2047, G2048<br />
|
||||
<b><a href="/home/henry/Documents/WA_Repo/en_tw/bible/other/enslave.md">/home/henry/Documents/WA_Repo/en_tw/bible/other/enslave.md</a></b>: * Strong's: H519, H4522, H5647, <span style="color:red">H5650,</span> H5659, H8198, G1397, G1398, G1401, G1402, G3814<br />
|
||||
|
||||
<b><a href="/home/henry/Documents/WA_Repo/en_tw/bible/other/servant.md">/home/henry/Documents/WA_Repo/en_tw/bible/other/servant.md</a></b>: * Strong's: H327, H519, H519, H4931, H5288, H5647, H5649, <span style="color:red">H5650,</span> H5656, H5657, H5659, H5673, H6402, H6635, H7916, H8120, H8198, H8278, H8334, H8335, G1199, G1247, G1248, G1249, G1397, G1398, G1401, G1402, G2038, G2322, G2324, G2615, G2999, G3000, G3008, G3009, G3010, G3011, G3407, G3411, G3610, G3814, G3816, G4342, G5256, G5257<br />
|
||||
|
||||
</p>
|
||||
<p>
|
||||
<b><a href="/home/henry/Documents/WA_Repo/en_tw/bible/other/desert.md">/home/henry/Documents/WA_Repo/en_tw/bible/other/desert.md</a></b>: desert, deserts, <span style="color:red">wilderness</span>, wildernesses, solitary place, remote places<br />
|
||||
<b><a href="/home/henry/Documents/WA_Repo/en_tw/bible/other/servant.md">/home/henry/Documents/WA_Repo/en_tw/bible/other/servant.md</a></b>: servant, servants, hired servant, hired servants, male servant, male servants, female servant, female <span style="color:red">servants</span>, servant girl, servant girls, maidservants, serve, serves, one who serves, served, serving, service, services, eyeservice, distribution of help, helpers, hired worker, attendant, assistant, office, offices<br />
|
||||
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
curl https://biblehub.com/hebrew/4057.htm > /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs_raw.html
|
||||
curl https://biblehub.com/hebrew/5650.htm > /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs_raw.html
|
||||
perl get_strongs_gist.pl
|
||||
firefox /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_interlinear.html /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_verse.html /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs.html /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/mine_results.html &
|
||||
/home/henry/Komodo-Edit-8/lib/mozilla/komodo --new-window /home/henry/Documents/WA_Repo/en_tw/bible/other/desert.md /home/henry/Documents/WA_Repo/en_tn/2sa/15/28.md &
|
||||
/home/henry/Komodo-Edit-8/lib/mozilla/komodo --new-window /home/henry/Documents/WA_Repo/en_tw/bible/other/enslave.md /home/henry/Documents/WA_Repo/en_tw/bible/other/servant.md /home/henry/Documents/WA_Repo/en_tn/2sa/19/06.md &
|
||||
|
|
|
|||
|
|
@ -0,0 +1,649 @@
|
|||
# Produces list of tWs for each verse by linking MAST_HB to ULB through tWs.
|
||||
|
||||
# Taken from tWs.from.UGNT.7.pl, with changes needed because that used USFM
|
||||
# and this uses XML
|
||||
|
||||
# The output from this script is useful for the interleaved PDFs used in MAST.
|
||||
# This version uses an exception file to handle places where the MAST_HB points to
|
||||
# a tW page different from that on which the ULB term appears.
|
||||
|
||||
# Make sure the correct input file is $ULBfile. Run script.
|
||||
# Output is in $output file.
|
||||
# Check the $missing
|
||||
# file for needed corrections, probably lines needing to be added to the
|
||||
# $exceptions file.
|
||||
# Change from ver. 2 in that this uses converted MAST_HB files.
|
||||
|
||||
use 5.12.0;
|
||||
use File::Slurp;
|
||||
use File::Find ;
|
||||
use Cwd ;
|
||||
use FindBin '$Bin';
|
||||
use utf8;
|
||||
#use open IN => ":utf8", OUT => ":utf8";
|
||||
use open IO => ":utf8";
|
||||
use List::MoreUtils qw(uniq);
|
||||
$|=1;
|
||||
$"="\n";
|
||||
|
||||
my ($pwd, $d) = ($Bin, "/");
|
||||
if ($^O eq "MSWin32") {
|
||||
$d = "\\";
|
||||
$pwd =~ s/\//\\/g;
|
||||
}
|
||||
|
||||
my ($udf) = "User_defaults.windows.txt";
|
||||
if ($^O eq "linux") {$udf = "User_defaults.linux.txt"}
|
||||
elsif ($^O eq "darwin") {$udf = "User_defaults.mac.txt"}
|
||||
|
||||
open (my $defaults, "<:utf8", "$pwd${d}User${d}$udf") or die "$pwd${d}User${d}$udf:\n$!";
|
||||
|
||||
my ($cv, $ULBfile, $exceptions, $missing, $exc_log, $tW_log, $log, $output, $workFile, $verseMap) =
|
||||
("00000",
|
||||
"$Bin${d}Temp${d}Extract.txt",
|
||||
"$Bin${d}Exceptions${d}Exceptions_tWs_from_MAST_HB.txt",
|
||||
"$Bin${d}Output${d}Entries_not_handled.txt",
|
||||
"Logs${d}Exc_log.log",
|
||||
"Logs${d}tW_pairs.log",
|
||||
"Logs${d}tWs_from_MAST.log",
|
||||
"Output${d}tWs_for_PDF.txt",
|
||||
"User${d}tW_work_OT.txt",
|
||||
"MAST_HB${d}VerseMap.xml",
|
||||
);
|
||||
|
||||
my ($MAST_HBfile, $topTwDir, $textEditor, $repoPath, $topSourceLangDir);
|
||||
|
||||
my (%entries, %text, %ref, %order, %pages, %listOfPages, %sourcePage, %checkPages, %foundPages, %substitutedPages,
|
||||
%specifiedText, %realPage, %checkPage, %workEntries, %vsn, %StrongNum, %fullText, %ulbOrder, %bkAbr, %bkFull, %relevantSNs,
|
||||
%SNsInCV, %entriesThisSN, %entriesThisPage, %pagesThisSN, %pageThisEntry, %adjust, %newRef);
|
||||
|
||||
my $book;
|
||||
my (@MAST_HBfileList);
|
||||
|
||||
# ==============================
|
||||
|
||||
chdir("$pwd");
|
||||
open LOG, ">:utf8", "$exc_log" or die "\$log: $exc_log: $!";
|
||||
open OUT, ">:utf8", $output or die "$!";
|
||||
open MISSING, ">$missing" or die "$!";
|
||||
|
||||
while (<DATA>) {
|
||||
chomp;
|
||||
if (/([^\t]*)\t([^\t]*)/) {
|
||||
$bkAbr{$2} = $1;
|
||||
$bkFull{$1} = $2;
|
||||
say LOG "\$bkAbr{$2}: $bkAbr{$2}, \$bkFull{$1}: $bkFull{$1}";
|
||||
}
|
||||
}
|
||||
GetUserDefaults();
|
||||
GetULBBooksToProcess();
|
||||
CheckForRemaps();
|
||||
ReadExceptions();
|
||||
close LOG;
|
||||
open LOG, ">:utf8", "$tW_log" or die "\$tW_log: $tW_log: $!";
|
||||
PairtWEntriesTotWPageAndUniqSNs();
|
||||
close LOG;
|
||||
open LOG, ">:utf8", "$log" or die "\$log: $log: $!";
|
||||
say LOG "Hi";
|
||||
ReadLinkedSNs();
|
||||
LinkULBtoCV();
|
||||
LinkSNsToULBtextViaEntries();
|
||||
#Output();
|
||||
|
||||
close MISSING;
|
||||
close OUT;
|
||||
close LOG;
|
||||
|
||||
if ($^O eq "darwin") {system ("$textEditor $missing")}
|
||||
|
||||
print "\n\tDone.\n\n";
|
||||
|
||||
# ==============================
|
||||
|
||||
sub GetUserDefaults {
|
||||
open (my $defaults, "<:utf8", "User${d}$udf") or die "User${d}$udf:\n$!";
|
||||
|
||||
while (my $thisLine = <$defaults>) {
|
||||
chomp $thisLine;
|
||||
if ($thisLine =~ /^Text editor: (.*)$/) {
|
||||
$textEditor = $1;
|
||||
if ($^O eq "darwin") {
|
||||
$textEditor = "open -a $textEditor"
|
||||
}
|
||||
} elsif ($thisLine =~ /^Repository directory: (.*)$/) {
|
||||
$repoPath = $1;
|
||||
#say $repoPath; die;
|
||||
}
|
||||
}
|
||||
|
||||
say LOG "\$textEditor: $textEditor\n\$repoPath: $repoPath";
|
||||
die "No text editor found" if $textEditor eq "";
|
||||
die "No path to repo found" if $repoPath eq "";
|
||||
|
||||
($topTwDir, $topSourceLangDir) = ("$repoPath${d}en_tw${d}bible", "$repoPath${d}MAST_HB");
|
||||
|
||||
close $defaults;
|
||||
}
|
||||
|
||||
sub GetULBBooksToProcess {
|
||||
say LOG "GetULBBooksToProcess on \$workFile: $workFile";
|
||||
open (my $file, "<:utf8", "$workFile") or die "$workFile:\n$!";
|
||||
|
||||
while (my $line = <$file>) {
|
||||
chomp $line;
|
||||
#say LOG $line;
|
||||
if ($line =~ /^([^#][^\t]*)\t[^\t]*\t([^\t]*)\t[^\t]*$/) {
|
||||
my ($this_bk) = $1 . "-" . uc $2;
|
||||
$MAST_HBfile = "$topSourceLangDir${d}$this_bk.xml";
|
||||
push @MAST_HBfileList, $MAST_HBfile;
|
||||
}
|
||||
}
|
||||
close $file;
|
||||
say LOG "\@MAST_HBfileList: @MAST_HBfileList"
|
||||
}
|
||||
|
||||
sub CheckForRemaps {
|
||||
say "Checking for remaps in $repoPath${d}$verseMap";
|
||||
#/media/henry/92C6F7E3C6F7C58F/Users/henry/Documents/WA_Repo/MAST_HB/VerseMap.xml:
|
||||
#/media/henry/92C6F7E3C6F7C58F/Users/henry/WA_Repo/MAST_HB/VerseMap.xml
|
||||
open (my $file, "<:utf8", "$repoPath${d}$verseMap") or die "$repoPath${d}$verseMap:\n$!";
|
||||
|
||||
while (my $thisLine = <$file>) {
|
||||
chomp $thisLine;
|
||||
#say LOG $thisLine;
|
||||
if ($thisLine =~ /<verse wlc="([^\.]*)\.(\d+)\.(\d+)" kjv="([^\.]*)\.(\d+)\.(\d+)" type="full"\/>/) {
|
||||
say LOG "|\t$thisLine";
|
||||
my ($oldB, $oldC, $oldV, $newB, $newC, $newV) = ($bkFull{$1}, $2, $3, $bkFull{$4}, $5, $6);
|
||||
say LOG "*\t\$oldB:$oldB , \$oldC:$oldC , \$oldV:$oldV , \$newB:$newB , \$newC:$newC , \$newV:$newV ";
|
||||
my $oldie = "$oldB $oldC:$oldV";
|
||||
$newRef{$oldie} = "$newB $newC:$newV";
|
||||
say LOG "**\t" . "\$newRef{$oldie}: " . $newRef{"$oldB $oldC:$oldV"}
|
||||
}
|
||||
}
|
||||
|
||||
close $file;
|
||||
}
|
||||
|
||||
sub ReadExceptions {
|
||||
say "Reading exceptions";
|
||||
say LOG "ReadExceptions from \$exceptions: $exceptions";
|
||||
open (my $file, "<:utf8", "$exceptions") or die "$exceptions:\n$!";
|
||||
|
||||
while (my $line = <$file>) {
|
||||
chomp $line;
|
||||
if ($line =~ /^([^#\n][^\t\n]*)\t([^\t\n]*\t[^\t\n]*)/) {
|
||||
my ($rf, $oldNew) = ($1, $2);
|
||||
say LOG "\$line: $line, \$rf: $rf, \$oldNew: $oldNew";
|
||||
($adjust{$rf}) .= "$oldNew, ";
|
||||
$specifiedText{$rf} = 1;
|
||||
}
|
||||
}
|
||||
foreach my $key (sort keys %adjust) {
|
||||
say LOG "\$key: $key: \$adjust{$key}: $adjust{$key}"
|
||||
}
|
||||
close $file;
|
||||
}
|
||||
|
||||
sub PairtWEntriesTotWPageAndUniqSNs {
|
||||
say "Pairing tW entries with tW pages and unique Strong's numbers";
|
||||
my (@filesToRun, @relevantSNs) = ();
|
||||
my $filePattern = '*.md' ;
|
||||
find (sub {push @filesToRun, $File::Find::name if (m/^(.*)$filePattern$/)}, $topTwDir) ;
|
||||
@filesToRun = sort @filesToRun;
|
||||
#say LOG "\@filesToRun: @filesToRun";
|
||||
foreach my $file (@filesToRun) {
|
||||
print ".";
|
||||
$file =~ s/\//\\/g unless $^O eq "linux" || $^O eq "darwin";
|
||||
my ($thisList, $shortFile) = ("", $file);
|
||||
$shortFile =~ s/^\Q$topTwDir${d}\E//;
|
||||
$shortFile =~ s/\.md$//;
|
||||
$shortFile =~ s/\Q$d\E/,/;
|
||||
#say "|$shortFile|"; die;
|
||||
#if ($shortFile =~ /^(kt|names)/) {
|
||||
#my $fileText = read_file("$file", binmode => 'utf8');
|
||||
open IN, $file or die "$!";
|
||||
while (<IN>) {
|
||||
if (/^# ([^\n]*)$/) {
|
||||
$thisList = $1;
|
||||
$thisList =~ s/[\r\n]*$//;
|
||||
#say LOG "\$thisList = |$thisList|";
|
||||
$thisList =~ s/ \([^\)]*\)//g;
|
||||
$entriesThisPage{$shortFile} = $thisList;
|
||||
my @ULBEntries = split /, /, $thisList;
|
||||
foreach my $ULB_entry (@ULBEntries) {
|
||||
$pageThisEntry{$ULB_entry} = $shortFile;
|
||||
}
|
||||
my @tempArray = split /, /, $thisList;
|
||||
foreach my $slice (@tempArray) {
|
||||
$sourcePage{$slice} = $shortFile;
|
||||
#say LOG "$slice: $sourcePage{$slice}";
|
||||
}
|
||||
}
|
||||
if (/Strong's(.*)$/) {
|
||||
my $SNs = $1;
|
||||
while ($SNs =~ s/[H](\d*)//) {
|
||||
push @relevantSNs, $1;
|
||||
$entriesThisSN{$1} .= "$thisList, ";
|
||||
$pagesThisSN{$1} .= "$shortFile, ";
|
||||
}
|
||||
}
|
||||
@relevantSNs = uniq(@relevantSNs);
|
||||
foreach (@relevantSNs) {
|
||||
$relevantSNs{$_} = "$_";
|
||||
#say LOG $relevantSNs{$_}
|
||||
}
|
||||
}
|
||||
close IN;
|
||||
}
|
||||
say "";
|
||||
#say LOG "====";
|
||||
#say LOG "====";
|
||||
foreach my $thisSN (sort keys %entriesThisSN) {
|
||||
say LOG "tW entries for $thisSN: $entriesThisSN{$thisSN}"
|
||||
}
|
||||
}
|
||||
|
||||
sub LinkULBtoCV {
|
||||
say "Linking ULB to chapter and verse";
|
||||
say LOG "LinkULBtoCV, \$ULBfile: $ULBfile";
|
||||
open IN, "$ULBfile" or die "$ULBfile: $!";
|
||||
while (<IN>) {
|
||||
if (/^([^\t]*)\t(.*)$/) {
|
||||
$cv ++;
|
||||
($text{$1}, $fullText{$1}) = ($2, $2);
|
||||
$ref{$cv} = $1;
|
||||
$order{$1} = $cv;
|
||||
}
|
||||
#say LOG "First \$ref{$cv}: $ref{$cv}\n\$text{$ref{$cv}}: $text{$ref{$cv}}";
|
||||
}
|
||||
close IN;
|
||||
#foreach my $key (sort keys %ref) {
|
||||
#say LOG "\$key: $key:, \$ref{$key}: $ref{$key}, \$text{$ref{$key}}: $text{$ref{$key}}"
|
||||
#}
|
||||
}
|
||||
|
||||
sub ReadLinkedSNs {
|
||||
say "Reading linked Strong's numbers\n\@MAST_HBfileList: @MAST_HBfileList";
|
||||
my ($flag, $MAST_HBfile) = ("","");
|
||||
foreach $MAST_HBfile (@MAST_HBfileList) {
|
||||
say LOG "opening \$MAST_HBfile: $MAST_HBfile";
|
||||
open IN, "$MAST_HBfile" or die "$MAST_HBfile can't be opened\n\n";
|
||||
my ($thisBook, $thisChap, $thisVers, $thisRef);
|
||||
my (@pages);
|
||||
while (<IN>) {
|
||||
chomp;
|
||||
if (/<verse osisID="([^\.]*).(\d+).(\d+)">/) {
|
||||
my ($bk, $ch, $vs) = ($1, $2, $3);
|
||||
#say LOG "#>\t$bk $ch:$vs";
|
||||
#if (exists $newRef{"$bk $ch:$vs"}) {
|
||||
# $thisRef = $newRef{"$bk $ch:$vs"}
|
||||
#} else {
|
||||
($thisRef) = ("$bkFull{$bk} $ch:$vs");
|
||||
#}
|
||||
say LOG "##\t\$bk \$ch:\$vs: $bk $ch:$vs, \$bkFull{$bk}: $bkFull{$bk}, \$thisRef: $thisRef";
|
||||
}
|
||||
else {
|
||||
while (/<w lemma="(\w\/)?(\d+)( \w)?"/g) {
|
||||
#say LOG $_;
|
||||
my ($thisNum) = ($2);
|
||||
say LOG "\t\$thisNum: $thisNum, \$SNsInCV{$thisRef}: $SNsInCV{$thisRef}";
|
||||
if (exists $relevantSNs{$thisNum}) {
|
||||
say LOG "\t\t\$relevantSNs{$thisNum}: $relevantSNs{$thisNum}";
|
||||
$SNsInCV{$thisRef} .= "$thisNum√" unless ($SNsInCV{$thisRef} =~ /\b$thisNum\b/);
|
||||
}
|
||||
#say LOG ">\t\$thisNum: $thisNum, \$SNsInCV{$thisRef}: $SNsInCV{$thisRef}";
|
||||
}
|
||||
}
|
||||
}
|
||||
close IN;
|
||||
}
|
||||
my %temp;
|
||||
foreach my $oldRef (sort keys %SNsInCV) {
|
||||
if (exists $newRef{$oldRef}) {
|
||||
$temp{$newRef{$oldRef}} = $SNsInCV{$oldRef};
|
||||
delete $SNsInCV{$oldRef};
|
||||
}
|
||||
}
|
||||
foreach my $changedRef (sort keys %temp) {
|
||||
$SNsInCV{$changedRef} = $temp{$changedRef};
|
||||
say LOG "\$SNsInCV{$changedRef}: $SNsInCV{$changedRef}";
|
||||
}
|
||||
}
|
||||
|
||||
sub LinkSNsToULBtextViaEntries {
|
||||
say "Linking Strong's numbers to ULB text via tW page entries";
|
||||
say LOG "sub LinkSNsToULBtextViaEntries called";
|
||||
foreach my $thisRef (sort keys %ref) {
|
||||
say LOG "\nLinkSNsToULBtextViaEntries: \$thisRef: $thisRef\t\$ref{$thisRef}: $ref{$thisRef}, \$specifiedText{$ref{$thisRef}}: $specifiedText{$ref{$thisRef}}";
|
||||
(%workEntries, %ulbOrder) = ();
|
||||
my %workPage;
|
||||
my ($thisCV, $checkList, $tempString, $outString) = ($ref{$thisRef}, "", "", "");
|
||||
say OUT "$thisCV:";
|
||||
my (@allEntries);
|
||||
$listOfPages{$thisCV} = "";
|
||||
#say LOG "\$SNsInCV{$thisCV}: |$SNsInCV{$thisCV}|\n$text{$thisCV}";
|
||||
#say LOG "\t\$SNsInCV{$thisCV}: >$SNsInCV{$thisCV}<\n\$text{$thisCV}: $text{$thisCV}";
|
||||
$SNsInCV{$thisCV} =~ s/^ +//;
|
||||
$SNsInCV{$thisCV} =~ s/ +$//;
|
||||
$SNsInCV{$thisCV} =~ s/ {2,}/ /g;
|
||||
#say LOG "*\t\$SNsInCV{$thisCV}: >$SNsInCV{$thisCV}<";
|
||||
if (exists $specifiedText{$thisCV}) {
|
||||
#say LOG "*\t\$SNsInCV{$thisCV}: $SNsInCV{$thisCV}";
|
||||
|
||||
$SNsInCV{$thisCV} = Adjust($SNsInCV{$thisCV}, $thisCV);
|
||||
|
||||
$SNsInCV{$thisCV} =~ s/^ +(.*)/$1/;
|
||||
$SNsInCV{$thisCV} =~ s/(.*) +$/$1/;
|
||||
$SNsInCV{$thisCV} =~ s/ {2,}/ /g;
|
||||
$SNsInCV{$thisCV} =~ s/√ /√/g;
|
||||
say LOG "**\t\$SNsInCV{$thisCV}: >$SNsInCV{$thisCV}<";
|
||||
}
|
||||
#say LOG "<>\t<>\t\$SNsInCV{$thisCV}: |$SNsInCV{$thisCV}|";
|
||||
$SNsInCV{$thisCV} =~ s/ \.\.\. /.*?/g;
|
||||
say LOG "1\t\$SNsInCV{$thisCV}:$SNsInCV{$thisCV}";
|
||||
#while ($SNsInCV{$thisCV} =~ s/(\[[^\]]*?) ([^\]]*?\] )/$1√$2/) {};
|
||||
$SNsInCV{$thisCV} =~ s/√{2,}/√/g;
|
||||
$SNsInCV{$thisCV} =~ s/^√+//g;
|
||||
say LOG "2\t\$SNsInCV{$thisCV}:$SNsInCV{$thisCV}";
|
||||
my @regArray = split /√/, $SNsInCV{$thisCV};
|
||||
say LOG "\@regArray: >@regArray<";
|
||||
foreach my $thisNum (@regArray) {
|
||||
say LOG "\$thisNum: $thisNum";
|
||||
my ($found, $specPage);
|
||||
if ($thisNum =~ /(\d+)\[(.*?)\]/) {
|
||||
($thisNum) = ($1);
|
||||
my ($forced_entry_for_display) = ($2);
|
||||
#while ($forced_entry_for_display =~ s/([^ \]]*?)√([^ \]]*?)/$1 $2/) {}
|
||||
my $forced_entry_for_search = $forced_entry_for_display;
|
||||
$pageThisEntry{$forced_entry_for_search} = $pageThisEntry{$forced_entry_for_display};
|
||||
while ($forced_entry_for_display =~ s/\.\*\?/ ... /) {}
|
||||
say LOG "\n\n\$thisNum: >>$thisNum<<\t\$forced_entry_for_display: >$forced_entry_for_display<,
|
||||
\$forced_entry_for_search: >>$forced_entry_for_search<<\n\t\$pageThisEntry{$forced_entry_for_display}: $pageThisEntry{$forced_entry_for_display}";
|
||||
$outString .= "[$forced_entry_for_display]($pageThisEntry{$forced_entry_for_display})\n";
|
||||
if ($forced_entry_for_search =~ /([^,]*) \.\.\. ([^,]*) \.\.\. ([^,]*)/) {
|
||||
my ($first, $second, $third) = ($1, $2, $3);
|
||||
$text{$thisCV} =~ s/$first(.*?)$second(.*?)$third/$1 $2/;
|
||||
} elsif ($forced_entry_for_search =~ /([^,]*) \.\.\. ([^,]*)/) {
|
||||
my ($first, $second) = ($1, $2);
|
||||
$text{$thisCV} =~ s/$first(.*?)$second/$1/;
|
||||
} else {
|
||||
$text{$thisCV} =~ s/$forced_entry_for_search//;
|
||||
}
|
||||
next;
|
||||
} elsif ($thisNum =~ /\d+(\(([\w\/]+)\))/) {
|
||||
$specPage .= $2;
|
||||
say LOG "\t375\t\$specPage: $specPage";
|
||||
}
|
||||
say LOG "\t\$specPage: $specPage";
|
||||
if ($specPage) {
|
||||
$workEntries{$thisNum} = $entriesThisPage{$specPage};
|
||||
} else {
|
||||
$workEntries{$thisNum} = $entriesThisSN{$thisNum};
|
||||
}
|
||||
$workEntries{$thisNum} =~ s/, $//;
|
||||
say LOG "**\t\$thisNum: >$thisNum<\t\$workEntries{$thisNum}: >$workEntries{$thisNum}<";
|
||||
my @beforeArray = split /, /, $workEntries{$thisNum};
|
||||
my @sortedArray = reverse sort { substr($a,0,1) <=> substr($b,0,1)
|
||||
|| length($a) <=> length($b)
|
||||
|| $a <=> $b }
|
||||
@beforeArray;
|
||||
$" = "\n\t";
|
||||
#say LOG "\@sortedArray: @sortedArray\n\$outString: $outString\n\$text{$ref{$thisRef}}: $text{$ref{$thisRef}}";
|
||||
foreach my $entry (@sortedArray) {
|
||||
my $testEntry = $entry;
|
||||
#print LOG "\$entry: $entry. Becomes ";
|
||||
while ($testEntry =~ s/^(.*) \.\.\. (.*)/($1)\\b(.*?)\\b($2)/) {}
|
||||
#print LOG "\$testEntry: |$testEntry| ";
|
||||
if ($testEntry =~ /\(\.\*\?\)/ && $text{$thisCV} =~ s/\b($testEntry)\b/$3/i) {
|
||||
say LOG "\n===\n$thisNum |$testEntry| is found in first test.\n===";
|
||||
$outString .= "[$entry]($pageThisEntry{$entry})\n";
|
||||
say LOG $outString . "\n===" . $text{$thisCV};
|
||||
$found = 1;
|
||||
goto Breakout;
|
||||
} elsif ($text{$thisCV} =~ s/\b($testEntry)\b//i) {
|
||||
say LOG "\n===\n$thisNum |$testEntry| is found in second test.\n===";
|
||||
$outString .= "[$entry]($pageThisEntry{$entry})\n";
|
||||
say LOG $outString . "\n" . $text{$thisCV};
|
||||
$found = 1;
|
||||
goto Breakout;
|
||||
} else {
|
||||
#say LOG "and is not found in\n$text{$ref{$thisRef}}";
|
||||
}
|
||||
}
|
||||
Breakout:
|
||||
say MISSING "$thisCV $thisNum" unless ($found);
|
||||
next if $found;
|
||||
}
|
||||
say LOG "\t\$outString:\n$outString";
|
||||
$outString = ProperOrderOutString($outString, $thisCV);
|
||||
say LOG "<>\t\$outString: $outString";
|
||||
say OUT "$outString";
|
||||
#say LOG "sub LinkSNsToULBtextViaEntries finished";
|
||||
}
|
||||
}
|
||||
|
||||
sub Adjust {
|
||||
my ($snsOld, $ref, $snsNew, $addToSnsNew) = ($_[0], $_[1], "", "");
|
||||
say LOG "\$specifiedText{$ref}: $specifiedText{$ref}\n\$snsOld: |$snsOld|";
|
||||
my (%tempEntries);
|
||||
#say LOG ">\t\$sns: |$sns|";
|
||||
#say LOG ">\t\$specifiedText{$ref}: |$specifiedText{$ref}|";
|
||||
$snsOld =~ s/^[√ ]+/ /;
|
||||
my @oldArray = split / /, $snsOld;
|
||||
#say LOG "\$adjust{$ref}: $adjust{$ref}";
|
||||
my @preadjustments = split /, /, $adjust{$ref};
|
||||
foreach my $adjustment (@preadjustments) {
|
||||
say LOG "<><>\t\$adjustment: >$adjustment<";
|
||||
if ($adjustment =~ /([^\t]*)\t\|\|$/) { # delete this from list to look for
|
||||
my $found = $1;
|
||||
$snsOld =~ s/\b$found\b ?//;
|
||||
say LOG "*1*\t\$found: $found should be deleted from \$snsOld: $snsOld";
|
||||
} elsif ($adjustment =~ /^(\d+)\t(\d+)$/) { # change to specified number
|
||||
my ($found1, $found2) = ($1, $2);
|
||||
#$addToSnsNew .= "$1\[$2\] ";
|
||||
$snsOld =~ s/$found1√//g;
|
||||
$snsNew .= "$found2√" unless $snsNew =~ /\b$found2\b /;
|
||||
say LOG "*2*\t\$snsOld: $snsOld\n\$snsNew: $snsNew";
|
||||
} elsif ($adjustment =~ /^\|\|\t(.*)/) { # add this to list to look for
|
||||
my $adj = $1;
|
||||
say LOG "\$adjustment: $adjustment, \$adj: $adj";
|
||||
if ($adj =~ /([^\t]*)\t([^\t]*)/) {
|
||||
$snsNew = "[$1]($pageThisEntry{$2})"
|
||||
} else {
|
||||
$snsNew .= "$adj "
|
||||
}
|
||||
say LOG "*4*\t\$snsOld: $snsOld\n\$snsNew: $snsNew";
|
||||
} elsif ($adjustment =~ /^(\d+)\t([\w\. \-\']+)$/) { # add specified word
|
||||
my ($found1, $found2) = ($1, $2);
|
||||
#$addToSnsNew .= "$1\[$2\] ";
|
||||
if ($snsOld =~ s/\b$found1\b/$found1\[$found2\]/) {}
|
||||
else {$snsNew =~ s/\b$found1\b/$found1\[$found2\]/}
|
||||
$snsOld =~ s/ {2,}/ /;
|
||||
say LOG "*4*\t\$snsOld: $snsOld\n\$snsNew: $snsNew";
|
||||
} elsif (($adjustment =~ /^(\d+)\t([\/\d\w]+)$/)) { # add specified page
|
||||
#$addToSnsNew .= "$1\{$2\} "
|
||||
my ($found1, $found2) = ($1, $2);
|
||||
$snsOld =~ s/$found1/$found1\($found2\)/;
|
||||
say LOG "*5*\t\$snsOld: $snsOld";
|
||||
}
|
||||
}
|
||||
say LOG "\$snsNew: >$snsNew<\n\$snsOld+\$snsNew: >$snsOld< >$snsNew<";
|
||||
$snsNew = "$snsOld $snsNew";
|
||||
while ($snsNew =~ s/(\d+) (\d+\[[^\[\]]*\])/$2 $1/) {}
|
||||
return $snsNew;
|
||||
}
|
||||
|
||||
sub Output {
|
||||
say "Outputting";
|
||||
#say LOG "Output subRoutine called";
|
||||
foreach my $key (sort keys %ref) {
|
||||
my %donePages;
|
||||
my $thisRef = $ref{$key};
|
||||
#print LOG "\$key: $key\t\$thisRef: $thisRef\t";
|
||||
#say LOG "\$SNsInCV{$thisRef}: |$SNsInCV{$thisRef}|";
|
||||
$SNsInCV{$thisRef} =~ s/^ +//;
|
||||
$SNsInCV{$thisRef} =~ s/ +$//;
|
||||
$SNsInCV{$thisRef} =~ s/ {2,}/ /;
|
||||
#say LOG "\$SNsInCV{$thisRef}: |$SNsInCV{$thisRef}|";
|
||||
#say LOG "\$listOfPages{$thisRef}: |$listOfPages{$thisRef}|";
|
||||
#$listOfPages{$thisRef} =~ s/^ +//;
|
||||
#$listOfPages{$thisRef} =~ s/ +$//;
|
||||
#$listOfPages{$thisRef} =~ s/ {2,}/ /;
|
||||
#say LOG "\$listOfPages{$thisRef}: |$listOfPages{$thisRef}|";
|
||||
my @array = split /\n/, $listOfPages{$thisRef};
|
||||
#say LOG "\@array: |@array|";
|
||||
my @sorted =
|
||||
sort sort { lc($a) cmp lc($b) }
|
||||
@array;
|
||||
#say LOG "\@sorted: |@sorted|";
|
||||
$" = "\n";
|
||||
$listOfPages{$thisRef} = "@sorted";
|
||||
say LOG "\$listOfPages{$thisRef}: $listOfPages{$thisRef}\n\$checkPages{$thisRef}: $checkPages{$thisRef}";
|
||||
#say OUT "$thisRef: $listOfPages{$thisRef}\n";
|
||||
$checkPages{$thisRef} =~ s/^ +//;
|
||||
$checkPages{$thisRef} =~ s/ +$//;
|
||||
$checkPages{$thisRef} =~ s/ {2,}/ /;
|
||||
$checkPages{$thisRef} =~ s/ \|\|//;
|
||||
say LOG "\$checkPages{$thisRef}:\t|$checkPages{$thisRef}|";
|
||||
my @checkArray = split / /, $checkPages{$thisRef};
|
||||
shift @sorted;
|
||||
#say LOG "\@checkArray: |@checkArray|";
|
||||
#say LOG "\@sorted: |@sorted|";
|
||||
#shift @sorted;
|
||||
#say LOG "\@sorted: |@sorted|";
|
||||
foreach my $slice (@sorted) {
|
||||
#print LOG "\$slice: $slice\t";
|
||||
$slice =~ s/\[.*?\]\((.*?)\)/$1/;
|
||||
#say LOG "\t\$slice: $slice";
|
||||
$donePages{$slice} = $slice;
|
||||
#say LOG "\t\$donePages{$slice}: $donePages{$slice}"
|
||||
}
|
||||
#say LOG "\@checkArray: |@checkArray|";
|
||||
foreach my $slice (@checkArray) {
|
||||
#say LOG "\$slice: $slice";
|
||||
unless (exists $donePages{$slice}) {
|
||||
#say LOG "\$thisRef: $thisRef\t\$slice:$slice";
|
||||
#say MISSING "$thisRef\t$slice\t||";
|
||||
say MISSING "$thisRef\t$slice";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub Substitute {
|
||||
foreach my $key (sort keys %pages) {
|
||||
say LOG "\$key: $key\t\$SNsInCV{$key}: $SNsInCV{$key}";
|
||||
if (exists $substitutedPages{$key}) {
|
||||
#say LOG "\$substitutedPages{$key}: $substitutedPages{$key}";
|
||||
$substitutedPages{$key} =~ s/, $//;
|
||||
my @array = split /, /, $substitutedPages{$key};
|
||||
foreach my $slice (@array) {
|
||||
#say LOG "\$slice: $slice";
|
||||
if ($slice =~ /([^\t]*)\t([^\t]*)/) {
|
||||
#say LOG "\n\$key: $key";
|
||||
my ($old, $new) = ($1, $2);
|
||||
#say LOG "\$old: >$old<\t\$new: >$new<";
|
||||
#say LOG "\$SNsInCV{$key}: >>$SNsInCV{$key}<<";
|
||||
if ($old eq "||") {
|
||||
$SNsInCV{$key} .= "$new√";
|
||||
$checkPages{$key} = $SNsInCV{$key};
|
||||
}
|
||||
elsif ($new eq "||") {
|
||||
$SNsInCV{$key} =~ s/$old //;
|
||||
$checkPages{$key} = $SNsInCV{$key};
|
||||
}
|
||||
else {
|
||||
$SNsInCV{$key} =~ s/$old/$new/;
|
||||
$checkPages{$key} = $SNsInCV{$key};
|
||||
}
|
||||
$SNsInCV{$key} =~ s/ \|\|//g;
|
||||
#say LOG "\$SNsInCV{$key}: >>>$SNsInCV{$key}<<<";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$checkPages{$key} = $SNsInCV{$key};
|
||||
}
|
||||
say LOG "<>\t\$key: $key\t\$SNsInCV{$key}: $SNsInCV{$key}";
|
||||
}
|
||||
}
|
||||
|
||||
sub ProperOrderOutString {
|
||||
say LOG "\$_[0]: $_[0]\n\$_[1]: |$_[1]|";
|
||||
my @unordered = split /\n/, $_[0];
|
||||
my ($thisCV, $outS) = ($_[1], "");
|
||||
my (%orderedSet);
|
||||
foreach my $thisSet (@unordered) {
|
||||
say LOG "\t>\t\$thisSet: $thisSet";
|
||||
if ($thisSet =~ /(\[([^\]]*)\])(\([^\)]*\))/) {
|
||||
my ($ulb, $fileLoc) = ($2, $3);
|
||||
$ulb =~ s/ \.\.\. /.*?/g;
|
||||
say LOG "\t>>\t\$ulb: $ulb, \$fileLoc: $fileLoc, \$fullText{$thisCV}\n$fullText{$thisCV}";
|
||||
if ($ulb =~ /^(.*)\.\.\.(.*)$/) {
|
||||
my ($found1, $found2, $blank1, $blank2) = ($1, $2, "", "");
|
||||
while (length $blank1 < length $found1) {$blank1 .= " "}
|
||||
while (length $blank2 < length $found2) {$blank2 .= " "}
|
||||
if ($fullText{$thisCV} =~ s/^(.*?)\b$found1\b(.*)\b$found1\b(.*)$/$1$blank1$2$blank2$3/i) {
|
||||
say LOG "\t>>>\t$fullText{$thisCV}";
|
||||
my ($order) = (length $1);
|
||||
$orderedSet{$order} = $thisSet;
|
||||
say LOG "\t\t\t\$order: $order\t \$orderedSet{$order}: $orderedSet{$order}"
|
||||
}
|
||||
} else {
|
||||
my $blank = "";
|
||||
while (length $blank < length $ulb) {$blank .= " "}
|
||||
if ($fullText{$thisCV} =~ s/^(.*?)\b$ulb\b(.*)$/$1$blank$2/i) {
|
||||
say LOG "\t>>>>\t$fullText{$thisCV}";
|
||||
my ($order) = (length $1);
|
||||
$orderedSet{$order} = $thisSet;
|
||||
say LOG "\$order: $order\t \$orderedSet{$order}: $orderedSet{$order}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach my $key (sort {$a<=>$b} keys %orderedSet) {
|
||||
$outS .= "$orderedSet{$key}\n"
|
||||
}
|
||||
#say LOG "\$outS: $outS";
|
||||
return $outS;
|
||||
}
|
||||
|
||||
__DATA__
|
||||
gen Genesis
|
||||
exo Exodus
|
||||
lev Leviticus
|
||||
num Numbers
|
||||
deu Deuteronomy
|
||||
jos Joshua
|
||||
jdg Judges
|
||||
rut Ruth
|
||||
1sa 1 Samuel
|
||||
2sa 2 Samuel
|
||||
1ki 1 Kings
|
||||
2ki 2 Kings
|
||||
1ch 1 Chronicles
|
||||
2ch 2 Chronicles
|
||||
ezr Ezra
|
||||
neh Nehemiah
|
||||
est Esther
|
||||
job Job
|
||||
psa Psalms
|
||||
pro Proverbs
|
||||
ecc Ecclesiastes
|
||||
sng Song of Solomon
|
||||
isa Isaiah
|
||||
jer Jeremiah
|
||||
lam Lamentations
|
||||
ezk Ezekiel
|
||||
dan Daniel
|
||||
hos Hosea
|
||||
jol Joel
|
||||
amo Amos
|
||||
oba Obadiah
|
||||
jon Jonah
|
||||
mic Micah
|
||||
nam Nahum
|
||||
hab Habakkuk
|
||||
zep Zephaniah
|
||||
hag Haggai
|
||||
zec Zechariah
|
||||
mal Malachi
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
# file for needed corrections, probably lines needing to be added to the
|
||||
# $exceptions file.
|
||||
# Change from ver. 2 in that this uses converted MAST_HB files.
|
||||
# Change from ver. 3 in that this uses the KJV verses in the XML file, not the remaps file
|
||||
|
||||
use 5.12.0;
|
||||
use File::Slurp;
|
||||
|
|
@ -38,7 +39,7 @@ elsif ($^O eq "darwin") {$udf = "User_defaults.mac.txt"}
|
|||
|
||||
open (my $defaults, "<:utf8", "$pwd${d}User${d}$udf") or die "$pwd${d}User${d}$udf:\n$!";
|
||||
|
||||
my ($cv, $ULBfile, $exceptions, $missing, $exc_log, $tW_log, $log, $output, $workFile, $verseMap) =
|
||||
my ($cv, $ULBfile, $exceptions, $missing, $exc_log, $tW_log, $log, $output, $workFile) =
|
||||
("00000",
|
||||
"$Bin${d}Temp${d}Extract.txt",
|
||||
"$Bin${d}Exceptions${d}Exceptions_tWs_from_MAST_HB.txt",
|
||||
|
|
@ -48,7 +49,6 @@ my ($cv, $ULBfile, $exceptions, $missing, $exc_log, $tW_log, $log, $output, $wor
|
|||
"Logs${d}tWs_from_MAST.log",
|
||||
"Output${d}tWs_for_PDF.txt",
|
||||
"User${d}tW_work_OT.txt",
|
||||
"MAST_HB${d}VerseMap.xml",
|
||||
);
|
||||
|
||||
my ($MAST_HBfile, $topTwDir, $textEditor, $repoPath, $topSourceLangDir);
|
||||
|
|
@ -77,14 +77,12 @@ while (<DATA>) {
|
|||
}
|
||||
GetUserDefaults();
|
||||
GetULBBooksToProcess();
|
||||
CheckForRemaps();
|
||||
ReadExceptions();
|
||||
close LOG;
|
||||
open LOG, ">:utf8", "$tW_log" or die "\$tW_log: $tW_log: $!";
|
||||
PairtWEntriesTotWPageAndUniqSNs();
|
||||
close LOG;
|
||||
open LOG, ">:utf8", "$log" or die "\$log: $log: $!";
|
||||
say LOG "Hi";
|
||||
ReadLinkedSNs();
|
||||
LinkULBtoCV();
|
||||
LinkSNsToULBtextViaEntries();
|
||||
|
|
@ -142,28 +140,6 @@ sub GetULBBooksToProcess {
|
|||
say LOG "\@MAST_HBfileList: @MAST_HBfileList"
|
||||
}
|
||||
|
||||
sub CheckForRemaps {
|
||||
say "Checking for remaps in $repoPath${d}$verseMap";
|
||||
#/media/henry/92C6F7E3C6F7C58F/Users/henry/Documents/WA_Repo/MAST_HB/VerseMap.xml:
|
||||
#/media/henry/92C6F7E3C6F7C58F/Users/henry/WA_Repo/MAST_HB/VerseMap.xml
|
||||
open (my $file, "<:utf8", "$repoPath${d}$verseMap") or die "$repoPath${d}$verseMap:\n$!";
|
||||
|
||||
while (my $thisLine = <$file>) {
|
||||
chomp $thisLine;
|
||||
#say LOG $thisLine;
|
||||
if ($thisLine =~ /<verse wlc="([^\.]*)\.(\d+)\.(\d+)" kjv="([^\.]*)\.(\d+)\.(\d+)" type="full"\/>/) {
|
||||
say LOG "|\t$thisLine";
|
||||
my ($oldB, $oldC, $oldV, $newB, $newC, $newV) = ($bkFull{$1}, $2, $3, $bkFull{$4}, $5, $6);
|
||||
say LOG "*\t\$oldB:$oldB , \$oldC:$oldC , \$oldV:$oldV , \$newB:$newB , \$newC:$newC , \$newV:$newV ";
|
||||
my $oldie = "$oldB $oldC:$oldV";
|
||||
$newRef{$oldie} = "$newB $newC:$newV";
|
||||
say LOG "**\t" . "\$newRef{$oldie}: " . $newRef{"$oldB $oldC:$oldV"}
|
||||
}
|
||||
}
|
||||
|
||||
close $file;
|
||||
}
|
||||
|
||||
sub ReadExceptions {
|
||||
say "Reading exceptions";
|
||||
say LOG "ReadExceptions from \$exceptions: $exceptions";
|
||||
|
|
@ -274,14 +250,14 @@ sub ReadLinkedSNs {
|
|||
chomp;
|
||||
if (/<verse osisID="([^\.]*).(\d+).(\d+)">/) {
|
||||
my ($bk, $ch, $vs) = ($1, $2, $3);
|
||||
#say LOG "#>\t$bk $ch:$vs";
|
||||
#if (exists $newRef{"$bk $ch:$vs"}) {
|
||||
# $thisRef = $newRef{"$bk $ch:$vs"}
|
||||
#} else {
|
||||
($thisRef) = ("$bkFull{$bk} $ch:$vs");
|
||||
#}
|
||||
($thisRef) = ("$bkFull{$bk} $ch:$vs");
|
||||
say LOG "##\t\$bk \$ch:\$vs: $bk $ch:$vs, \$bkFull{$bk}: $bkFull{$bk}, \$thisRef: $thisRef";
|
||||
}
|
||||
elsif (/<note>KJV:([^\.]*).(\d+).(\d+)<\/note>/) {
|
||||
my ($bk, $ch, $vs) = ($1, $2, $3);
|
||||
($thisRef) = ("$bkFull{$bk} $ch:$vs");
|
||||
say LOG "###\t\$bk \$ch:\$vs: $bk $ch:$vs, \$bkFull{$bk}: $bkFull{$bk}, \$thisRef: $thisRef";
|
||||
}
|
||||
else {
|
||||
while (/<w lemma="(\w\/)?(\d+)( \w)?"/g) {
|
||||
#say LOG $_;
|
||||
|
|
|
|||
Loading…
Reference in New Issue