Changeset 6921 for trunk/gsdl/bin/script/pluginfo.pl

Timestamp:

2004-03-04T15:47:20+13:00 (20 years ago)

Author:

mdewsnip

Message:

Updated to use gsprintf in preparation for adding the French/Spanish/Russian translations.

File:

• trunk/gsdl/bin/script/pluginfo.pl (modified) (5 diffs)

trunk/gsdl/bin/script/pluginfo.pl

@@ -63 +63 @@
         'args' => $arguments };
 
-
-sub lookup_string
+sub gsprintf
 {
-    return &gsprintf::lookup_string($language, shift(@_));
+    return &gsprintf::gsprintf(@_);
 }
-
-
-sub print_txt_usage
-{
-    local $language = shift(@_);
-
-    local $programname = $options->{'name'};
-    local $programargs = $options->{'args'};
-
-    # Find the length of the longest option string
-    local $descoffset = 0;
-    if (defined($programargs)) {
-    $descoffset = &PrintUsage::find_longest_option_string($programargs);
-    }
-
-    # Produce the usage information using the data structure above
-    print STDERR $programname . ": " . &lookup_string($options->{'desc'}) . "\n\n";
-    print STDERR " " . &lookup_string("{common.usage}") . ": $programname";
-    print STDERR " " . &lookup_string("{pluginfo.params}") . "\n\n";
-
-    # Display the program options, if there are some
-    if (defined($programargs)) {
-    # Calculate the column offset of the option descriptions
-    local $optiondescoffset = $descoffset + 2;  # 2 spaces between options & descriptions
-
-    print STDERR " " . &lookup_string("{common.options}") . ":\n";
-
-    # Display the program options
-    &PrintUsage::print_options_txt($language, $programargs, $optiondescoffset);
-    }
-}
-
 
 
@@ -112 +79 @@
              q^language/.*/^, \$language))
     {
-    &print_txt_usage($language);
+    &PrintUsage::print_txt_usage($language, $options, "{pluginfo.params}", 1);
     die "\n";
     }
@@ -118 +85 @@
     my $plugin = shift (@ARGV);
     if (!defined $plugin || $plugin eq "") {
-    print STDERR &lookup_string("{pluginfo.no_plugin_name}") . "\n\n";
-    &print_txt_usage($language);
+    &gsprintf(STDERR, "{pluginfo.no_plugin_name}\n\n");
+    &PrintUsage::print_txt_usage($language, $options, "{pluginfo.params}", 1);
     die "\n";
     }
@@ -136 +103 @@
     }
     else {
-    print STDERR "\n$plugin " . &lookup_string("{pluginfo.info}") . ":\n\n";
-    print STDERR &lookup_string("{pluginfo.passing_options}") . "\n\n";
-    print STDERR &lookup_string("{pluginfo.option_types}") . ":\n\n";
-    print STDERR &lookup_string("{pluginfo.specific_options}") . "\n\n";
-    print STDERR &lookup_string("{pluginfo.general_options}") . "\n\n";
+    &gsprintf(STDERR, "\n$plugin {pluginfo.info}:\n\n");
+    &gsprintf(STDERR, "{pluginfo.passing_options}\n\n");
+    &gsprintf(STDERR, "{pluginfo.option_types}:\n\n");
+    &gsprintf(STDERR, "{pluginfo.specific_options}\n\n");
+    &gsprintf(STDERR, "{pluginfo.general_options}\n\n");
 
     $plugobj->print_txt_usage($language);
@@ -155 +122 @@
     $pid = open(STDIN, "-|"); # this does a fork... see man perlipc(1)
     if (!defined $pid) {
-    print STDERR "pluginfo.pl - can't fork: $!";
+    &gsprintf(STDERR, "pluginfo.pl - can't fork: $!");
     } else {
     if ($pid != 0) { # parent (ie forking) process. child gets 0