fixed fast log printing

diff --git a/cmd/show/announce.pl b/cmd/show/announce.pl
index bd6e05ae7fcde280390003db3a02e2dd129091e6..350ff0efdddfb6cb2916997289cccd269e2f1075 100644 (file)
--- a/cmd/show/announce.pl
+++ b/cmd/show/announce.pl
@@ -34,5 +34,5 @@ while ($f = shift @f) {                 # next field
 $to = 20 unless $to;
 $from = 0 unless $from;
 
-@out = DXLog::print($from, $to, $main::systime, '^ann', $who);
+@out = DXLog::print($from, $to, $main::systime, 'ann', $who);
 return (1, @out);

diff --git a/cmd/show/log.pl b/cmd/show/log.pl
index 8a00e3852131b0972bfd44b9971ea185cd97885e..570286f38f96170e8f4f0cd18fcb574b19c8861d 100644 (file)
--- a/cmd/show/log.pl
+++ b/cmd/show/log.pl
@@ -35,5 +35,5 @@ if ($self->priv < 6) {
        return (1, $self->msg('e5')) if $who ne $self->call;
 }
 
-@out = DXLog::print($from, $to, $main::systime, $who);
+@out = DXLog::print($from, $to, $main::systime, undef, $who);
 return (1, @out);

diff --git a/cmd/show/rcmd.pl b/cmd/show/rcmd.pl
index bc3a71f95590e8a239d03e0ba75f7af6d088781f..d8f02d5e2c707bdceb47ac9c285efa54064189af 100644 (file)
--- a/cmd/show/rcmd.pl
+++ b/cmd/show/rcmd.pl
@@ -33,5 +33,5 @@ while ($f = shift @f) {                 # next field
 $to = 20 unless $to;
 $from = 0 unless $from;
 
-@out = DXLog::print($from, $to, $main::systime, '^rcmd', $who);
+@out = DXLog::print($from, $to, $main::systime, 'rcmd', $who);
 return (1, @out);

diff --git a/cmd/show/talk.pl b/cmd/show/talk.pl
index 93b0ab9a8a70275e5b462793bb8ad130a34eb963..81d6dc06b18a50d7abda3a9441785f3b9af98811 100644 (file)
--- a/cmd/show/talk.pl
+++ b/cmd/show/talk.pl
@@ -35,5 +35,5 @@ if ($self->priv < 6) {
        return (1, $self->msg('e5')) if $who ne $self->call;
 }
 
-@out = DXLog::print($from, $to, $main::systime, '^talk', $who);
+@out = DXLog::print($from, $to, $main::systime, 'talk', $who);
 return (1, @out);

diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm
index 58f18ffdd7604eae03239eb7fb48cbecbb793270..6d37cb415d16ddfba84d481aa69055e881f653d2 100644 (file)
--- a/perl/DXLogPrint.pm
+++ b/perl/DXLogPrint.pm
@@ -37,12 +37,10 @@ sub print
        my $count;
        my $hint = "";
            
-       $search = '1' unless $pattern || $who;
        if ($pattern) {
-               $search = "\$ref->[1] =~ m{$pattern}i";
+               $search = "\$ref->[1] =~ m{^$pattern}i";
                $hint = "m{$pattern}i";
        }
-
        if ($who) {
                if ($search) {
                        $search .= ' && ';
@@ -52,6 +50,7 @@ sub print
                $hint .= 'm{$who}i';
        }
        $hint = "next unless $hint" if $hint;
+       $search = "1" unless $search;
        
        $eval = qq(
                           \@in = ();