made book ID identification case insensitive

git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@168 07627401-56e2-0310-80f4-f8cd0041bdcd

4 files changed, 62 insertions, 29 deletions

diff --git a/versification/af.xml b/versification/af.xml
index 751a3da..26bbe14 100644
--- a/versification/af.xml
+++ b/versification/af.xml
@@ -6,7 +6,7 @@
 	<book>
 		<id>Barn</id>
 		<abbr>Brn</abbr>
-		<name>Epistle of Barnabas</name>
+		<name>Barnabas</name>
 	</book>
 	<book>
 		<id>1Clem</id>
@@ -46,44 +46,37 @@
 	<book>
 		<id>IgnMagn</id>
 		<abbr>IMg</abbr>
-		<abbr>Img</abbr>
-		<name>Epistle of Ignatius to the Magnesians</name>
+		<name>Ignatius to the Magnesians</name>
 	</book>
 	<book>
 		<id>IgnPhld</id>
 		<abbr>IPh</abbr>
-		<abbr>Iph</abbr>
-		<name>Epistle of Ignatius to the Philadephians</name>
+		<name>Ignatius to the Philadephians</name>
 	</book>
 	<book>
 		<id>IgnPol</id>
 		<abbr>IPo</abbr>
-		<abbr>Ipo</abbr>
-		<name>Epistle of Ignatius to Polycarp</name>
+		<name>Ignatius to Polycarp</name>
 	</book>
 	<book>
 		<id>IgnRom</id>
 		<abbr>IRo</abbr>
-		<abbr>Iro</abbr>
-		<name>Epistle of Ignatius to the Romans</name>
+		<name>Ignatius to the Romans</name>
 	</book>
 	<book>
 		<id>IgnSmyrn</id>
 		<abbr>ISm</abbr>
-		<abbr>Ism</abbr>
-		<name>Epistle of Ignatius to the Smyrnaeans</name>
+		<name>Ignatius to the Smyrnaeans</name>
 	</book>
 	<book>
 		<id>IgnTrall</id>
 		<abbr>ITr</abbr>
-		<abbr>Itr</abbr>
-		<name>Epistle of Ignatius to the Trallians</name>
+		<name>Ignatius to the Trallians</name>
 	</book>
 	<book>
 		<id>IgnEph</id>
 		<abbr>IEp</abbr>
-		<abbr>Iep</abbr>
-		<name>Epistle of Ignatius to the Ephesians</name>
+		<name>Ignatius to the Ephesians</name>
 	</book>
 	<book>
 		<id>MartPol</id>
@@ -93,6 +86,45 @@
 	<book>
 	        <id>PolPhil</id>
 		<abbr>Pol</abbr>
-		<name>Epistle of Polycarp to the Philippians</name>
+		<name>Polycarp to the Philippians</name>
 	</book>
+
+	<!-- long versions -->
+
+	<book>
+		<id>IgnMagnLg</id>
+		<abbr>IMgl</abbr>
+		<name>Ignatius to the Magnesians (Longer)</name>
+	</book>
+	<book>
+		<id>IgnPhldLg</id>
+		<abbr>IPl</abbr>
+		<name>Ignatius to the Philadephians (Longer)</name>
+	</book>
+	<book>
+		<id>IgnPolLg</id>
+		<abbr>IPc</abbr>
+		<name>Ignatius to Polycarp (Longer)</name>
+	</book>
+	<book>
+		<id>IgnRomLg</id>
+		<abbr>IRl</abbr>
+		<name>Ignatius to the Romans (Longer)</name>
+	</book>
+	<book>
+		<id>IgnSmyrnLg</id>
+		<abbr>ISl</abbr>
+		<name>Ignatius to the Smyrnaeans (Longer)</name>
+	</book>
+	<book>
+		<id>IgnTrallLg</id>
+		<abbr>ITl</abbr>
+		<name>Ignatius to the Trallians (Longer)</name>
+	</book>
+	<book>
+		<id>IgnEphLg</id>
+		<abbr>IEl</abbr>
+		<name>Ignatius to the Ephesians (Longer)</name>
+	</book>
+
 </collection>
diff --git a/versification/bible.xml b/versification/bible.xml
index a0590b5..4d5abb5 100644
--- a/versification/bible.xml
+++ b/versification/bible.xml
@@ -308,7 +308,6 @@
 	<book>
 		<id>Jude</id>
 		<abbr>Jud</abbr>
-		<abbr>JUD</abbr>
 		<name>Jude</name>
 	</book>
 	<book>
@@ -392,8 +391,8 @@
 	</book>
 	<book>
 		<id>AddPs</id>
-		<id>Psx</id>
-		<name>Additional Psalm(s)</name>
+		<abbr>Psx</abbr>
+		<name>Additional Psalm</name>
 	</book>
 	<book>
 		<id>EsthGr</id>
@@ -434,12 +433,10 @@
 	</book>
 	<book>
 		<id>Sus</id>
-		<abbr>SUS</abbr>
 		<name>Susanna</name>
 	</book>
 	<book>
 		<id>Bel</id>
-		<abbr>BEL</abbr>
 		<name>Bel and the Dragon</name>
 	</book>
 	<book>
@@ -497,7 +494,6 @@
 	<book>
 		<id>SirP</id>
 		<abbr>Sip</abbr>
-		<abbr>SIP</abbr>
 		<name>Sirach (Prologue)</name>
 	</book>
 </collection>
diff --git a/versification/otp.xml b/versification/otp.xml
index 7acaa5f..5c90874 100644
--- a/versification/otp.xml
+++ b/versification/otp.xml
@@ -51,16 +51,19 @@
 	</book>
 	<book>
 		<id>2Bar</id>
+		<abbr>2Ba</abbr>
 		<name>II Baruch</name>
 		<name>Syriac Apocalypse of Baruch</name>
 	</book>
 	<book>
 		<id>3Bar</id>
+		<abbr>3Ba</abbr>
 		<name>III Baruch</name>
 		<name>Greek Apocalypse of Baruch</name>
 	</book>
 	<book>
 		<id>4Bar</id>
+		<abbr>4Ba</abbr>
 		<name>IV Baruch</name>
 		<name>Paraleipomena Jeremiou</name>
 	</book>
@@ -94,6 +97,7 @@
 	</book>
 	<book>
 		<id>2En</id>
+		<abbr>2En</abbr>
 		<name>II Enoch</name>
 		<name>Slavonic Apocalypse of Enoch</name>
 	</book>
@@ -216,6 +220,7 @@
 	</book>
 	<book>
 		<id>5Mac</id>
+		<abbr>5Ma</abbr>
 		<name>V Maccabees</name>
 	</book>
 	<book>
diff --git a/versification/v11nsys.pl b/versification/v11nsys.pl
index 5dfc44b..0b672f9 100644
--- a/versification/v11nsys.pl
+++ b/versification/v11nsys.pl
@@ -16,17 +16,17 @@
 

 

 sub buildBooks {

-    if ($lastBook ne "" && $osis{$lastBook} eq "") {

+    if ($lastBook ne "" && $osis{lc($lastBook)} eq "") {

 	print "ERROR: Unknown book abbreviation: $lastBook in $v11n\n";

     }

-    if ($osis{$lastBook} eq "Matt") {

+    if ($osis{lc($lastBook)} eq "Matt") {

 	$otnt = 1;

     }

     if ($otnt == 0) {

-	$otbooks .= "\t{\"$idmap{$osis{$lastBook}}\", \"$osis{$lastBook}\", \"$osis{$lastBook}\", $cCount},\n";

+	$otbooks .= "\t{\"$idmap{$osis{lc($lastBook)}}\", \"$osis{lc($lastBook)}\", \"$osis{lc($lastBook)}\", $cCount},\n";

     }

     else {

-	$ntbooks .= "\t{\"$idmap{$osis{$lastBook}}\", \"$osis{$lastBook}\", \"$osis{$lastBook}\", $cCount},\n";

+	$ntbooks .= "\t{\"$idmap{$osis{lc($lastBook)}}\", \"$osis{lc($lastBook)}\", \"$osis{lc($lastBook)}\", $cCount},\n";

     }

 }

 

@@ -52,10 +52,10 @@ foreach $mapfile (@canons) {
 	

 	if ($line =~ /<id>(.+?)<\/id>/) {

 	    $id = $1;

-	    $osis{$id} = $id;

+	    $osis{lc($id)} = $id;

 	}

 	elsif ($line =~ /<abbr>(.+?)<\/abbr>/) {

-	    $osis{$1} = $id;

+	    $osis{lc($1)} = $id;

 	}

 	elsif ($line =~ /<name>(.+?)<\/name>/) {

 	    $name = $1;

@@ -159,7 +159,7 @@ foreach $infile (@srcfiles) {
 

 	    if ($thisBook ne $lastBook) {

 		$bCount++;

-		$vm .= "\n\t// $idmap{$osis{$thisBook}}\n\t";

+		$vm .= "\n\t// $idmap{$osis{lc($thisBook)}}\n\t";

 		if ($lastBook ne "") {

 		    buildBooks{};

 		}