1. Fixed help and apropos commands so that they default to english if

[spider.git] / cmd / apropos.pl

diff --git a/cmd/apropos.pl b/cmd/apropos.pl
index 1226a0a729df48fc63ebddeec50b0eb9c7d4d28c..8e4d4eb24fff17d4943e3db394bb13b3038b5771 100644 (file)
--- a/cmd/apropos.pl
+++ b/cmd/apropos.pl
@@ -15,26 +15,37 @@ my @out;
 my $lang = $self->lang;
 $lang = 'en' if !$lang;
 
-my $h = new IO::File;
+my $in;
+$line = 'help' unless $line;
+$line =~ s/\W//g;   # remove dubious characters
+
+my ($priv, $cmd, $desc);
+my %cmd;
 
-if (!open($h, "$main::localcmd/Commands_$lang.hlp")) {
-       if (!open($h, "$main::cmd/Commands_$lang.hlp")) {
+my $defh = new IO::File;
+unless ($defh->open("$main::localcmd/Commands_en.hlp")) {
+       unless($defh->open("$main::cmd/Commands_en.hlp")) {
                return (1, $self->msg('helpe1'));
        }
 }
-my $in;
 
-$line = 'help' unless $line;
-$line =~ s/\W//og;   # remove dubious characters
+my $h;
+unless ($lang ne 'en') {
+       $h = new IO::File;
+       unless ($h->open("$main::localcmd/Commands_$lang.hlp")) {
+               unless($h->open("$main::cmd/Commands_$lang.hlp")) {
+                       undef $h;
+               }
+       }
+}
 
+# do english help
 my $include;
-my ($priv, $cmd, $desc);
-
-foreach $in (<$h>) {
+foreach $in (<$defh>) {
        next if $in =~ /^\#/;
        chomp $in;
        if ($in =~ /^===/) {
-               push @out, "$cmd $desc" if $include;
+               $cmd{$cmd} = "$cmd $desc" if $include;
                $include = 0;
                $in =~ s/=== //;
                ($priv, $cmd, $desc) = split /\^/, $in;
@@ -46,9 +57,33 @@ foreach $in (<$h>) {
        }
        $include =~ 1 if $cmd =~ /$line/i;
 }
-push @out, "$cmd $desc" if $include;
+$cmd{$cmd} = "$cmd $desc" if $include;
+$defh->close;
+
+# override with any not english help
+if ($h) {
+       my $include;
+       foreach $in (<$h>) {
+               next if $in =~ /^\#/;
+               chomp $in;
+               if ($in =~ /^===/) {
+                       $cmd{$cmd} = "$cmd $desc" if $include;
+                       $include = 0;
+                       $in =~ s/=== //;
+                       ($priv, $cmd, $desc) = split /\^/, $in;
+                       next if $priv > $self->priv;             # ignore subcommands that are of no concern
+                       next unless $cmd =~ /$line/i || $desc =~ /$line/i;
+                       next if $cmd =~ /-$/o;
+                       $include = 1;
+                       next;
+               }
+               $include =~ 1 if $cmd =~ /$line/i;
+       }
+       $cmd{$cmd} = "$cmd $desc" if $include;
+       $h->close;
+}
 
-close($h);
+push @out, map {$cmd{$_}} sort keys %cmd;
 
 push @out, $self->msg('helpe2', $line) if @out == 0;