fix 3 digit longitudes

diff --git a/Changes b/Changes
index 62800dd033de06af5b7509f69483d19a80738017..ed309c2cc9af9a9f2449cfa8d00f1367e5ac7054 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+07Nov02=======================================================================
+1. allow three digit longitudes
 29Oct02=======================================================================
 1. make sh/log et al a bit more efficient.
 2. fix dupe message in dx.

diff --git a/perl/DXBearing.pm b/perl/DXBearing.pm
index 066826d6983e52cc9d3836c5d3353c8a3fda33de..b7101a53ce627ad1f535a413784ff98e6021a2a4 100644 (file)
--- a/perl/DXBearing.pm
+++ b/perl/DXBearing.pm
@@ -110,7 +110,7 @@ sub bdist
 # turn a lat long string into floating point lat and long
 sub stoll
 {
-       my ($latd, $latm, $latl, $longd, $longm, $longl) = $_[0] =~ /(\d{1,2})\s+(\d{1,2})\s*([NnSs])\s+(\d{1,2})\s+(\d{1,2})\s*([EeWw])/;
+       my ($latd, $latm, $latl, $longd, $longm, $longl) = $_[0] =~ /(\d{1,2})\s+(\d{1,2})\s*([NnSs])\s+(\d{1,3})\s+(\d{1,2})\s*([EeWw])/;
        
        $longd += ($longm/60);
        $longd = 0-$longd if (uc $longl) eq 'W'; 

diff --git a/perl/QXProt.pm b/perl/QXProt.pm
index 8ab1f4c66ff091e67c8fa9d3a9d06eab317b74d4..82cb2075d8f8196edf32524b048b96dbc7ca445c 100644 (file)
--- a/perl/QXProt.pm
+++ b/perl/QXProt.pm
@@ -134,15 +134,6 @@ sub disconnect
        $self->DXProt::disconnect(@_);
 }
 
-sub sendallnodes
-{
-}
-
-sub sendallusers
-{
-
-}
-
 my $msgid = 1;
 
 sub frame
@@ -162,21 +153,21 @@ sub handleI
 {
        my $self = shift;
        
-       my @f = split /\^/, $_[2];
-       my $inv = Verify->new($f[8]);
-       unless ($inv->verify($f[9], $main::me->user->passphrase, $main::mycall, $self->call)) {
+       my @f = split /\^/, $_[3];
+       my $inv = Verify->new($f[7]);
+       unless ($inv->verify($f[8], $main::me->user->passphrase, $main::mycall, $self->call)) {
                $self->sendnow('D','Sorry...');
                $self->disconnect;
        }
        if ($self->{outbound}) {
                $self->send($self->genI);
        } 
-       if ($self->{sort} ne 'S' && $f[5] eq 'DXSpider') {
+       if ($self->{sort} ne 'S' && $f[4] eq 'DXSpider') {
                $self->{user}->{sort} = $self->{sort} = 'S';
                $self->{user}->{priv} = $self->{priv} = 1 unless $self->{priv};
        }
-       $self->{version} = $f[6];
-       $self->{build} = $f[7];
+       $self->{version} = $f[5];
+       $self->{build} = $f[6];
        $self->state('init1');
        $self->{lastping} = 0;
 }
@@ -185,15 +176,15 @@ sub genI
 {
        my $self = shift;
        my $inp = Verify->new;
-       return frame('I', $self->call, 1, "DXSpider", ($main::version + 53) * 100, $main::build, $inp->challenge, $inp->response($self->user->passphrase, $self->call, $main::mycall));
+       return frame('I', $self->call, "DXSpider", ($main::version + 53) * 100, $main::build, $inp->challenge, $inp->response($self->user->passphrase, $self->call, $main::mycall));
 }
 
-sub handleB
+sub handleR
 {
 
 }
 
-sub genB
+sub genR
 {
 
 }