Fix showdx, is_ipaddr, create_master_badip_files.pl

[spider.git] / perl / Bands.pm

diff --git a/perl/Bands.pm b/perl/Bands.pm
index 65849c9a5d0c3e732420e44eb175f7951930625b..e3b014b51942663783c97232d67eb560ab278f41 100644 (file)
--- a/perl/Bands.pm
+++ b/perl/Bands.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package Bands;
@@ -18,29 +18,24 @@ 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 = (
+                 band => '0,BAND,parraypairs',
+                 beacon => '0,BEACON,parraypairs',
                  cw => '0,CW,parraypairs',
-                 ssb => '0,SSB,parraypairs',
                  data => '0,DATA,parraypairs',
-                 sstv => '0,SSTV,parraypairs',
+                 fax => '0,FAX,parraypairs',
                  fstv => '0,FSTV,parraypairs',
-                 rtty => '0,RTTY,parraypairs',
-                 pactor => '0,PACTOR,parraypairs',
                  packet => '0,PACKET,parraypairs',
+                 pactor => '0,PACTOR,parraypairs',
                  repeater => '0,REPEATER,parraypairs',
-                 fax => '0,FAX,parraypairs',
-                 beacon => '0,BEACON,parraypairs',
-                 band => '0,BAND,parraypairs',
+                 rtty => '0,RTTY,parraypairs',
+                 ssb => '0,SSB,parraypairs',
+                 sstv => '0,SSTV,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 +136,6 @@ sub field_prompt
 sub AUTOLOAD
 {
        no strict;
-       my $self = shift;
        my $name = $AUTOLOAD;
        return if $name =~ /::DESTROY$/;
        $name =~ s/^.*:://o;
@@ -149,9 +143,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;