projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'mojo' and 'test' of ssh://server/scm/spider into test
[spider.git]
/
perl
/
Bands.pm
diff --git
a/perl/Bands.pm
b/perl/Bands.pm
index 6384887d998c7a08e7bb82c504cd7f16fa21d38d..e3b014b51942663783c97232d67eb560ab278f41 100644
(file)
--- a/
perl/Bands.pm
+++ b/
perl/Bands.pm
@@
-3,7
+3,7
@@
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
-#
$Id$
+#
#
package Bands;
#
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
%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 = (
%valid = (
+ band => '0,BAND,parraypairs',
+ beacon => '0,BEACON,parraypairs',
cw => '0,CW,parraypairs',
cw => '0,CW,parraypairs',
- ssb => '0,SSB,parraypairs',
data => '0,DATA,parraypairs',
data => '0,DATA,parraypairs',
-
sstv => '0,SSTV
,parraypairs',
+
fax => '0,FAX
,parraypairs',
fstv => '0,FSTV,parraypairs',
fstv => '0,FSTV,parraypairs',
- rtty => '0,RTTY,parraypairs',
- pactor => '0,PACTOR,parraypairs',
packet => '0,PACKET,parraypairs',
packet => '0,PACKET,parraypairs',
+ pactor => '0,PACTOR,parraypairs',
repeater => '0,REPEATER,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;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
# load the band data
sub load
{
# load the band data
sub load
{
@@
-137,18
+132,18
@@
sub field_prompt
return $valid{$ele};
}
return $valid{$ele};
}
-no strict;
+
#
no strict;
sub AUTOLOAD
{
sub AUTOLOAD
{
-
my $self = shif
t;
+
no stric
t;
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
- $name =~ s/.*:://o;
+ $name =~ s/
^
.*:://o;
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
# 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}}
;
-
@_ ? $self->{$name} = shift : $self->{$name}
;
+ *
$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}}
;
+
goto &$AUTOLOAD
;
}
1;
}
1;