X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FBands.pm;h=cc67dc234da5b5ed13331143d26e039b39be993f;hb=refs%2Fheads%2Fnew-spawn;hp=65849c9a5d0c3e732420e44eb175f7951930625b;hpb=8178d787d7cc8040fa8958197582bba5c80e6f59;p=spider.git diff --git a/perl/Bands.pm b/perl/Bands.pm index 65849c9a..cc67dc23 100644 --- a/perl/Bands.pm +++ b/perl/Bands.pm @@ -3,7 +3,7 @@ # # Copyright (c) 1998 - Dirk Koopman G1TLH # -# $Id$ +# # package Bands; @@ -18,7 +18,7 @@ use vars qw(%bands %regions %aliases $bandsfn %valid); %bands = (); # the 'raw' band data %regions = (); # list of regions for shortcuts eg vhf ssb %aliases = (); # list of aliases -$bandsfn = "$main::data/bands.pl"; +$bandsfn = localdata("bands.pl"); %valid = ( cw => '0,CW,parraypairs', @@ -35,12 +35,6 @@ $bandsfn = "$main::data/bands.pl"; band => '0,BAND,parraypairs', ); -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; - # load the band data sub load { @@ -141,7 +135,6 @@ sub field_prompt sub AUTOLOAD { no strict; - my $self = shift; my $name = $AUTOLOAD; return if $name =~ /::DESTROY$/; $name =~ s/^.*:://o; @@ -149,9 +142,7 @@ sub AUTOLOAD # this clever line of code creates a subroutine which takes over from autoload # from OO Perl - Conway *$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}}; - &$AUTOLOAD($self, @_); -# *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ; -# @_ ? $self->{$name} = shift : $self->{$name} ; + goto &$AUTOLOAD; } 1;