X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=bd5fd95d84675c9c8e552d07b6bdbb97c3f2d15c;hb=393e17fd3a08dd94596f1c02d4d20f6f9a44954f;hp=eb20fcabed17aba45fa23eb176fe8d46a97d2e87;hpb=dcbafa96df9fbad90df86076b6ee9fa6a673a61c;p=spider.git diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm index eb20fcab..bd5fd95d 100644 --- a/perl/Thingy/Rt.pm +++ b/perl/Thingy/Rt.pm @@ -11,10 +11,8 @@ use strict; package Thingy::Rt; 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; + +main::mkver($VERSION = q$Revision$); use DXChannel; use DXDebug; @@ -91,9 +89,9 @@ sub handle_eau my $dxchan = shift; if (my $d = $thing->{d}) { + my $nref; for (split /:/, $d) { my ($type, $here, $call) = unpack "A1 A1 A*", $_; - my $nref; if ($type eq 'U') { unless ($nref) { dbg("Thingy::Rt::ea need a node before $call"); @@ -114,10 +112,6 @@ sub handle_eau dbg("Thingy::Rt::ea invalid type $type"); return; } - unless ($nref) { - dbg("Thingy::Rt::ea no node"); - return; - } } } return $thing; @@ -129,9 +123,9 @@ sub handle_edu my $dxchan = shift; if (my $d = $thing->{d}) { + my $nref; for (split /:/, $d) { my ($type, $here, $call) = unpack "A1 A1 A*", $_; - my $nref; if ($type eq 'U') { unless ($nref) { dbg("Thingy::Rt::ed need a node before $call"); @@ -150,10 +144,6 @@ sub handle_edu dbg("Thingy::Rt::ed invalid type $type"); return; } - unless ($nref) { - dbg("Thingy::Rt::ed no node"); - return; - } } } return $thing;