X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Flog.pl;h=bad1f61df3a325612f1c52db57d541717a0e8902;hb=fd0973e8351e0fc5e762034da5fa02e2a715b6dd;hp=26b99ef213fc062a514edf47012e2b6a7dd0c3bd;hpb=85564500ce87c832f2a99fd96ccc1775dc896a0d;p=spider.git diff --git a/cmd/show/log.pl b/cmd/show/log.pl index 26b99ef2..bad1f61d 100644 --- a/cmd/show/log.pl +++ b/cmd/show/log.pl @@ -7,31 +7,36 @@ # my $self = shift; -return (1, $self->msg('e5')) if $self->priv < 6; - 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; -@out = DXLog::print($from, $to, $main::systime, undef, $who); +if ($self->priv < 6) { + return (1, $self->msg('e5')) if defined $who && $who ne $self->call; + $who = $self->call; +} + +@out = DXLog::print($from, $to, $main::systime, undef, $who); return (1, @out);