From 4e5b3de7a26563d94678fb790b8a1e2c4daaac8d Mon Sep 17 00:00:00 2001 From: minima Date: Sat, 19 Aug 2000 20:56:32 +0000 Subject: [PATCH] 1. Added an efficiency thing for AUTOLOADed accessors from OO Perl by Conway. 2. Fiddled with the rtty and digital bandplan frequencies. --- Changes | 5 ++++- data/bands.pl | 24 ++++++++++++++++-------- perl/Bands.pm | 3 +++ perl/DXChannel.pm | 7 ++++++- perl/DXCluster.pm | 3 +++ perl/DXDb.pm | 3 +++ perl/DXMsg.pm | 3 +++ perl/DXUser.pm | 3 +++ perl/Prefix.pm | 3 +++ perl/cluster.pl | 2 +- 10 files changed, 45 insertions(+), 11 deletions(-) diff --git a/Changes b/Changes index 44880fa9..6b16e194 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +19Aug00======================================================================= +1. Added an efficiency thing for AUTOLOADed accessors from OO Perl by Conway. +2. Fiddled with the rtty and digital bandplan frequencies. 18Aug00======================================================================= 1. added a couple of changes for perl 5.6.0 2. removed del_dup from DXUser for earlier versions of DB '1.85' (ie real ones @@ -12,7 +15,7 @@ not 2.x versions in 1.85 compatibility mode). 1. removed extra /60 in AnnTalk to make deduping of announces work a bit better for longer... 05Aug00======================================================================= -1. Fixed hax character problem put in somewhen in the C Client +1. Fixed hex character problem put in somewhen in the C Client 03Aug00======================================================================= 1. caught some more signals (are any of these causing the random stopping of the code? diff --git a/data/bands.pl b/data/bands.pl index bb361258..abc62e58 100644 --- a/data/bands.pl +++ b/data/bands.pl @@ -30,20 +30,23 @@ '80m' => bless( { band => [ 3500, 4000 ], cw => [ 3500, 3600 ], - data => [ 3590, 3600 ], + data => [ 3580, 3619 ], + rtty => [ 3580, 3619 ], sstv => [ 3730, 3740 ], ssb => [ 3601, 4000 ] }, 'Bands'), '40m' => bless( { band => [ 7000, 7400 ], - cw => [ 7000, 7050 ], - cw => [ 7000, 7050 ], + cw => [ 7000, 7034 ], + data => [ 7035, 7044], + rtty => [ 7035, 7044], ssb => [ 7051, 7400 ] }, 'Bands'), '30m' => bless( { band => [ 10100, 10150 ], cw => [ 10000, 10140 ], - data => [ 10141, 10150 ] + data => [ 10141, 10149 ] , + rtty => [ 10141, 10149 ] }, 'Bands'), '20m' => bless( { band => [ 14000, 14350 ], @@ -52,31 +55,36 @@ beacon => [ 14099, 14100 ], sstv => [ 14225, 14235 ], data => [ 14070, 14098, 14101, 14111 ], + rtty => [ 14070, 14098, 14101, 14111 ], }, 'Bands'), '17m' => bless( { band => [ 18068, 18168 ], cw => [ 18068, 18100 ], ssb => [ 18111, 18168 ], data => [ 18101, 18108], + rtty => [ 18101, 18108], beacon => [ 18109, 18110] }, 'Bands'), '15m' => bless( { band => [ 21000, 21450 ], cw => [ 21000, 21150 ], - data => [ 21100, 21120 ], + data => [ 21080, 21119 ], + rtty => [ 21080, 21119 ], ssb => [ 21151, 21450] }, 'Bands'), '12m' => bless( { band => [ 24890, 24990 ], cw => [ 24890, 24990 ], - ssb => [ 24920, 24930], - rtty => [ 24930, 24990], + ssb => [ 24931, 24990], + rtty => [ 24920, 24929], + data => [ 24920, 24929], }, 'Bands'), '10m' => bless( { band => [ 28000, 29700 ], cw => [ 28000, 28198 ], - data => [ 28120, 28150, 29200, 29300 ], + data => [ 28050, 28149, 29200, 29299 ], + rtty => [ 28050, 28149 ], space => [ 29200, 29300 ], ssb => [ 28201, 29299, 29550, 29700] }, 'Bands'), diff --git a/perl/Bands.pm b/perl/Bands.pm index 16a992ed..d40d4c82 100644 --- a/perl/Bands.pm +++ b/perl/Bands.pm @@ -139,6 +139,9 @@ sub AUTOLOAD return if $name =~ /::DESTROY$/; $name =~ s/.*:://o; + # 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} ; } diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index b7d32c44..7a27a8f2 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -466,8 +466,13 @@ sub AUTOLOAD $name =~ s/.*:://o; confess "Non-existant field '$AUTOLOAD'" if !$valid{$name}; - @_ ? $self->{$name} = shift : $self->{$name} ; + + # 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} ; } + 1; __END__; diff --git a/perl/DXCluster.pm b/perl/DXCluster.pm index 5d35e4a3..21608465 100644 --- a/perl/DXCluster.pm +++ b/perl/DXCluster.pm @@ -153,6 +153,9 @@ sub AUTOLOAD $name =~ s/.*:://o; confess "Non-existant field '$AUTOLOAD'" if !$valid{$name}; + # 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} ; } diff --git a/perl/DXDb.pm b/perl/DXDb.pm index a7f31acc..0f30e5b0 100644 --- a/perl/DXDb.pm +++ b/perl/DXDb.pm @@ -347,6 +347,9 @@ sub AUTOLOAD $name =~ s/.*:://o; confess "Non-existant field '$AUTOLOAD'" if !$valid{$name}; + # 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} ; } diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm index 85c9e68e..5c990177 100644 --- a/perl/DXMsg.pm +++ b/perl/DXMsg.pm @@ -1235,6 +1235,9 @@ sub AUTOLOAD $name =~ s/.*:://o; confess "Non-existant field '$AUTOLOAD'" if !$valid{$name}; + # 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} ; } diff --git a/perl/DXUser.pm b/perl/DXUser.pm index 0785d16b..fa9e109f 100644 --- a/perl/DXUser.pm +++ b/perl/DXUser.pm @@ -77,6 +77,9 @@ sub AUTOLOAD $name =~ s/.*:://o; confess "Non-existant field '$AUTOLOAD'" if !$valid{$name}; + # 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}} ; if (@_) { $self->{$name} = shift; } diff --git a/perl/Prefix.pm b/perl/Prefix.pm index 41a95db8..263f5f82 100644 --- a/perl/Prefix.pm +++ b/perl/Prefix.pm @@ -200,6 +200,9 @@ sub AUTOLOAD $name =~ s/.*:://o; confess "Non-existant field '$AUTOLOAD'" if !$valid{$name}; + # 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}} ; if (@_) { $self->{$name} = shift; } diff --git a/perl/cluster.pl b/perl/cluster.pl index 6f82b0d0..1ecbc094 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -340,7 +340,7 @@ $SIG{KILL} = 'DEFAULT'; # as if it matters.... # catch the rest with a hopeful message for (keys %SIG) { if (!$SIG{$_}) { - dbg('chan', "Catching SIG $_"); +# dbg('chan', "Catching SIG $_"); $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); }; } } -- 2.43.0