[sword-svn] r218 - trunk/versification

[chrislit at crosswire.org]

Author: chrislit
Date: 2009-10-23 20:08:15 -0700 (Fri, 23 Oct 2009)
New Revision: 218

Modified:
   trunk/versification/v11nsys.pl
Log:
made (my) most common usage the default

Modified: trunk/versification/v11nsys.pl
===================================================================
--- trunk/versification/v11nsys.pl	2009-10-20 04:43:38 UTC (rev 217)
+++ trunk/versification/v11nsys.pl	2009-10-24 03:08:15 UTC (rev 218)
@@ -10,10 +10,10 @@
 ###############################################################################
 
 
-$mode = "xml";
+$mode = "osis";
 $count = "last";
 $aMode = "";
-$warn = 0;
+$warn = 1;
 
 if (@ARGV[0] ne "") {
     $n = 0;
@@ -40,9 +40,9 @@
 	elsif (@ARGV[$n] eq "--last") {
 	    $count = "last";
 	}
-	elsif (@ARGV[$n] eq "--warn") {
-	    $warn = 1;
-	    print "Warning messages enabled.\n";
+	elsif (@ARGV[$n] eq "--nowarn") {
+	    $warn = 0;
+	    print "Warning messages disabled.\n";
 	}
 	elsif (@ARGV[$n] =~ /--abbr=(.+)/) {
 	    $aMode = $1;
@@ -100,7 +100,7 @@
 }
 
 sub printUsage() {
-    print " v11nsys.pl --? --warn --(vpl|imp|xml|osis) --(count|last) --abbr=[abbrMode] [files]\n\n  When run without any arguments, this script looks for the CCEL files: Bible.*.xml.\n\n  Otherwise, supply the script with a list of files (or wildcard) and it  will attempt to create a v11n system definition on that basis.\n\n --? prints usage (this).\n\n --warn turns on warning messages.\n\n --vpl instructs the script to interpret files as VPL files.\n --imp instructs the script to interpret files as IMP files.\n --xml instructs the script to interpret files as XML files using CCEL's definition format (default).\n --osis instructs the script to interpret files as OSIS XML files.\n\n --count instructs the script to count chapters/verse it encounters.\n --last instructs the script to assume that the last chapter/verse it encounters is equal to the number of chaptes/verses in a book/chapter (default).\n\n --abbr=[abbrMode] instructs the script to use an alternative set of abbreviations (olb, westminster, & lxx are currently defined) in preference to the default, whenever the two conflict.\n\n";
+    print " v11nsys.pl --? --nowarn --(vpl|imp|xml|osis) --(count|last) --abbr=[abbrMode] [files]\n\n  When run without any arguments, this script looks for the CCEL files: Bible.*.xml.\n\n  Otherwise, supply the script with a list of files (or wildcard) and it  will attempt to create a v11n system definition on that basis.\n\n --? prints usage (this).\n\n --nowarn turns warning messages off.\n\n --vpl instructs the script to interpret files as VPL files.\n --imp instructs the script to interpret files as IMP files.\n --xml instructs the script to interpret files as XML files using CCEL's definition format (default).\n --osis instructs the script to interpret files as OSIS XML files.\n\n --count instructs the script to count chapters/verse it encounters.\n --last instructs the script to assume that the last chapter/verse it encounters is equal to the number of chaptes/verses in a book/chapter (default).\n\n --abbr=[abbrMode] instructs the script to use an alternative set of abbreviations (olb, westminster, & lxx are currently defined) in preference to the default, whenever the two conflict.\n\n";
 }
 
 # @canons will contain this list of files, these are in a basic XML format.