added uniform revision & date printing to usage statement

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

1 files changed, 7 insertions, 7 deletions

diff --git a/modules/perlconverters/usfm2osis.pl b/modules/perlconverters/usfm2osis.pl
index 055d1e0..796400b 100644
--- a/modules/perlconverters/usfm2osis.pl
+++ b/modules/perlconverters/usfm2osis.pl
@@ -42,9 +42,14 @@
 use utf8;
 
 # Stores the script version and date
-$version = "1.7";
+$version = "1.7.1";
+
 $date = '$Date$';
 $rev = '$Rev$';
+
+$date =~ s/^.+?(\d{4}-\d{2}-\d{2}).+/$1/;
+$rev =~ s/^.+?(\d+).+/$1/g;
+
 # Sets the version of OSIS used in the OSIS header
 $osisVersion = "2.1.1";
 # Stores the USFM Version
@@ -80,11 +85,6 @@ $usfmVersion = "2.2"; # The USFM reference document can be found at http://www.u
  "BLT" => "Bel", "ADE" => "AddEsth"
  );
 
-$date =~ /(\d{4}-\d{2}-\d{2})/;
-$rev .= "($1)";
-$rev =~ s/\$//g;
-$rev =~ s/Rev: //;
-
 # Generates a list of available encodings.
 use Encode;
 @encodingList = Encode->encodings(":all");
@@ -95,7 +95,7 @@ $encodings =~ s/\, $//;
 
 # Syntax instructions
 if (scalar(@ARGV) < 2) {
-    print "\nusfm2osis.pl -- USFM $usfmVersion to OSIS $osisVersion converter version $version\nRevision $rev\n\nSyntax: usfm2osis.pl <osisWork> [-o OSIS-file] [-e USFM encoding] <USFM filenames|wildcard>\n";
+    print "\nusfm2osis.pl -- USFM $usfmVersion to OSIS $osisVersion converter version $version\nRevision $rev ($date)\nSyntax: usfm2osis.pl <osisWork> [-o OSIS-file] [-e USFM encoding] <USFM filenames|wildcard>\n";
     print "- Arguments in braces < > are required. Arguments in brackets [ ] are optional.\n";
     print "- The osisWork is a short name with no spaces which will identify your module.\n";
     print "- If no -o option is specified for the output filename, the default output file is: \n\tosisWork.osis.xml.\n";