X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=03dd1f43776a4ceba321740f1c5247a89f036532;hb=9311d6940faf0e9952d6d65d9ead572b06a52434;hp=019ba1e3c68f1355f6f7f1c223e0754733f49075;hpb=eb2a2eb1aa8e7c743c23ec5e0dc5aa40a8708e79;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index 019ba1e3..03dd1f43 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -60,7 +60,9 @@ $filterdef = bless ([ sub new { - my ($pkg, $call) = @_; + my $pkg = shift; + my $call = shift; + $pkg = ref $pkg if ref $pkg; my $self = bless {call => $call}, $pkg; @@ -70,7 +72,7 @@ sub new ($self->{dxcc}, $self->{itu}, $self->{cq}, $self->{state}, $self->{city}) = Prefix::cty_data($call); - $self->{flags} = here(1); + $self->{flags} = 1; return $self; } @@ -134,13 +136,6 @@ sub is_empty return @{$self->{$_[0]}} == 0; } -sub is_aranea -{ - my $self = shift; - $self->{aranea} = shift if @_; - return $self->{aranea}; -} - # # flag field constructors/enquirers # @@ -156,21 +151,15 @@ sub is_aranea sub here { my $self = shift; - my $r = shift; - return $self ? 1 : 0 unless ref $self; - return ($self->{flags} & 1) ? 1 : 0 unless defined $r; - $self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0)); - return $r ? 1 : 0; + $self->{flags} = shift if @_; + return $self->{flags}; } +# conferencing in the ak1a sense is not supported sub conf { my $self = shift; - my $r = shift; - return $self ? 2 : 0 unless ref $self; - return ($self->{flags} & 2) ? 2 : 0 unless defined $r; - $self->{flags} = (($self->{flags} & ~2) | ($r ? 2 : 0)); - return $r ? 2 : 0; + return 0; } sub parents