X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FDx.pm;h=38fb2d2d31fd5f109e486b3e4caba8aefc0a9edf;hb=5764cc1c0f79b56fdf5389d2b0dcb2ab7e54723d;hp=9b7a181becf7da0cfceece21e28600f1c0935ee9;hpb=5b3c2c5e342c23fbab96b7573c5963344617878f;p=spider.git

diff --git a/perl/Thingy/Dx.pm b/perl/Thingy/Dx.pm
index 9b7a181b..38fb2d2d 100644
--- a/perl/Thingy/Dx.pm
+++ b/perl/Thingy/Dx.pm
@@ -12,7 +12,7 @@ package Thingy::Dx;
 
 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));
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -86,7 +86,7 @@ sub gen_DXCommandmode
 	if ($dxchan->{ve7cc}) {
 		$buf = VE7CC::dx_spot($dxchan, $thing->{spotdata});
 	} else {
-		$buf = $dxchan->format_dx_spot($thing->{spotdata});
+		$buf = Spot::format_dx_spot($dxchan, $thing->{spotdata});
 		$buf .= "\a\a" if $dxchan->{beep};
 		$buf =~ s/\%5E/^/g;
 	}
@@ -143,10 +143,10 @@ sub out_filter
 	my $dxchan = shift;
 	
 	# global spot filtering on INPUT
-	if ($dxchan->{inspotsfilter}) {
-		my ($filter, $hops) = $dxchan->{inspotsfilter}->it($thing->{spotdata});
+	if ($dxchan->{spotsfilter}) {
+		my ($filter, $hops) = $dxchan->{spotsfilter}->it($thing->{spotdata});
 		unless ($filter) {
-			dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr');
+			dbg("PCPROT: Rejected by output spot filter") if isdbg('chanerr');
 			return;
 		}
 		$thing->{hops} = $hops if $hops;