X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Flog.pl;h=bad1f61df3a325612f1c52db57d541717a0e8902;hb=b26c5204bc58c12fc4d61725ba4f1cfc1a38be45;hp=8a00e3852131b0972bfd44b9971ea185cd97885e;hpb=c20a2c1e01d707d6c3fa25067df93d491aba8fff;p=spider.git diff --git a/cmd/show/log.pl b/cmd/show/log.pl index 8a00e385..bad1f61d 100644 --- a/cmd/show/log.pl +++ b/cmd/show/log.pl @@ -11,29 +11,32 @@ my $cmdline = shift; my @f = split /\s+/, $cmdline; my $f; my @out; -my ($from, $to, $who); +my ($from, $to, $who, $hint); $from = 0; while ($f = shift @f) { # next field # print "f: $f list: ", join(',', @list), "\n"; - if (!$from && !$to) { + unless ($from || $to) { ($from, $to) = $f =~ /^(\d+)-(\d+)$/o; # is it a from -> to count? next if $from && $to > $from; } - if (!$to) { + unless ($to) { ($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count? next if $to; } - next if $who; - ($who) = $f =~ /^(\w+)/o; + unless ($who) { + $who = $f; + next if $who; + } } $to = 20 unless $to; $from = 0 unless $from; + if ($self->priv < 6) { - $who = $self->call unless $who; - return (1, $self->msg('e5')) if $who ne $self->call; + return (1, $self->msg('e5')) if defined $who && $who ne $self->call; + $who = $self->call; } -@out = DXLog::print($from, $to, $main::systime, $who); +@out = DXLog::print($from, $to, $main::systime, undef, $who); return (1, @out);