remove duplicate fields in DXUser to match DXuser

[spider.git] / perl / Prot.pm

diff --git a/perl/Prot.pm b/perl/Prot.pm
index 67741752c0b495f094bc7a5dbf898857cb0136f4..89847c482916e503c452525a91dad0b0634d8ac4 100644 (file)
--- a/perl/Prot.pm
+++ b/perl/Prot.pm
@@ -6,33 +6,34 @@ package Prot;
 
 use strict;
 
+
 use DXUtil;
 use DXDebug;
 use vars qw(%valid);
 
 %valid = (
-                 fromnode => '0,From Node',
-                 tonode => '0,To Node',
-                 vianode => '0,Via Node',
-                 origin => '0,Original Node',
-                 tocall => '0,To Callsign',
-                 fromcall => '0,From Callsign',
-                 hops => '0,No. of hops',
-                 text => '0,Text',
+                 bellflag => '0,Bell?',
                  datetime => '0,Date/Time,atime',
-                 freq => '0,Frequency',
                  dxcall => '0,DX Callsign',
-                 sort => '0,Sort',
+                 dxcount => '0,DX Count',
+                 freq => '0,Frequency',
+                 fromcall => '0,From Callsign',
+                 fromnode => '0,From Node',
                  hereflag => '0,Here?,yesno',
-                 talkflag => '0,Talk mode',
-                 bellflag => '0,Bell?',
+                 hops => '0,No. of hops',
+                 nodelist => '0,Node List,parray',
+                 origin => '0,Original Node',
                  privflag => '0,Private?,yesno',
                  rrflag => '0,RR Req.?,yesno',
+                 sort => '0,Sort',
                  sysopflag => '0,Sysop flag',
-                 dxcount => '0,DX Count',
-                 wwvcount => '0,WWV Count',
+                 talkflag => '0,Talk mode',
+                 text => '0,Text',
+                 tocall => '0,To Callsign',
+                 tonode => '0,To Node',
                  version => '0,Node Version',
-                 nodelist => '0,Node List,parray',
+                 vianode => '0,Via Node',
+                 wwvcount => '0,WWV Count',
                 );
 
 
@@ -46,15 +47,14 @@ sub new
 
 sub AUTOLOAD
 {
-       no strict "refs";
-       my $self = shift;
+       no strict;
        my $name = $AUTOLOAD;
        return if $name =~ /::DESTROY$/;
-       $name =~ s/.*:://o;
+       $name =~ s/^.*:://o;
   
        confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
-       *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
-    @_ ? $self->{$name} = shift : $self->{$name} ;
+       *$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+       goto &$AUTOLOAD;
 }
 
 1;