X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=9c75a048465badb106299e9ea326bc3665ea4bf1;hb=e9953f82126e4afe7bcaf48388d2ef13654d08c9;hp=f4a1b7aba0e66dd6818d288e1e229b90d03a30b3;hpb=cbf3c0cd90df4c4df05dae6a00d03f7f9482d631;p=spider.git diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm index f4a1b7ab..9c75a048 100644 --- a/perl/DXMsg.pm +++ b/perl/DXMsg.pm @@ -4,7 +4,7 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ +# # # # Notes for implementors:- @@ -32,12 +32,6 @@ eval { use strict; -use vars qw($VERSION $BRANCH); -$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(%work @msg $msgdir %valid %busy $maxage $last_clean $residencetime @badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime $email_server $email_prog $email_from @@ -355,13 +349,12 @@ sub handle_32 push @words, [$_, @bad] if @bad; } if (@words) { - dbg("$ref->{from} swore: $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $dxchan->call) if isdbg('msg'); - Log('msg',"$ref->{from} swore: $ref->{to} origin: $ref->{origin} via " . $dxchan->call); - dbg("subject: $ref->{subject}"); - Log('msg',"subject: $ref->{subject}"); + LogDbg('msg',"$ref->{from} swore: $ref->{to} origin: $ref->{origin} via " . $dxchan->call); + LogDbg('msg',"subject: $ref->{subject}"); for (@words) { - dbg("line: $_->[0] (using words: ". join(',',@{$_->[1]}).")"); - Log('msg', "line: $_->[0] (using words: ". join(',',@{$_->[1]}).")"); + my $r = $_; + my $line = shift @$r; + LogDbg('msg', "line: $line (using words: ". join(',', @$r).")"); } $ref->stop_msg($fromnode); return; @@ -1114,7 +1107,7 @@ sub do_send_stuff $ref->notify; } } else { - Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED"); + LogDbg('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED"); } delete $loc->{lines};