X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLogPrint.pm;h=ded2f6186a783e27eb865a1eb02d1309efa2c308;hb=b43b533709ed2bb51df19b5aebe3c668a9986cce;hp=356c7cd1efb3dd44c9904dd587a35aaa9087e5bd;hpb=ee3201c65017b91e2e42e8792b4db7c9c1122ae5;p=spider.git diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm index 356c7cd1..ded2f618 100644 --- a/perl/DXLogPrint.pm +++ b/perl/DXLogPrint.pm @@ -3,7 +3,7 @@ # # Copyright (c) - 1998 Dirk Koopman G1TLH # -# $Id$ +# # package DXLog; @@ -18,12 +18,7 @@ use RingBuf; use strict; -use vars qw($VERSION $BRANCH $maxmonths); -$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); -$main::build += $VERSION; -$main::branch += $BRANCH; - +use vars qw($maxmonths); $maxmonths = 36; # @@ -38,7 +33,7 @@ sub print my $to = shift || 10; my $jdate = $fcb->unixtoj(shift); my $pattern = shift; - my $who = uc shift; + my $who = shift; my $search; my @in; my @out = (); @@ -46,6 +41,8 @@ sub print my $tot = $from + $to; my $hint = ""; + $who = uc $who if defined $who; + if ($pattern) { $hint = "m{\\Q$pattern\\E}i"; } else { @@ -119,12 +116,13 @@ sub print_item my $s = 'undef'; if ($r->[1] eq 'rcmd') { + $r->[6] ||= 'Unknown'; if ($r->[2] eq 'in') { $r->[5] ||= ""; - $s = "$r->[4] (priv: $r->[3]) rcmd: $r->[5]"; + $s = "in: $r->[4] ($r->[6] priv: $r->[3]) rcmd: $r->[5]"; } else { $r->[4] ||= ""; - $s = "$r->[3] reply: $r->[4]"; + $s = "$r->[3] $r->[6] reply: $r->[4]"; } } elsif ($r->[1] eq 'talk') { $r->[5] ||= "";