X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXBearing.pm;h=c977ae22b84c2bf24b7beacb17c3249875d30bff;hb=4327a846608d5828537a3c37f90848db0f10d06f;hp=b7101a53ce627ad1f535a413784ff98e6021a2a4;hpb=74803d3f4937220f536cd67b515faa15da6e0520;p=spider.git diff --git a/perl/DXBearing.pm b/perl/DXBearing.pm index b7101a53..c977ae22 100644 --- a/perl/DXBearing.pm +++ b/perl/DXBearing.pm @@ -23,7 +23,7 @@ $pi = 3.14159265358979; 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)); +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/,(0,0)); $main::build += $VERSION; $main::branch += $BRANCH; @@ -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,3})\s+(\d{1,2})\s*([EeWw])/; + my ($latd, $latm, $latl, $longd, $longm, $longl) = $_[0] =~ /(\d{1,2})\s+(\d{1,2})\s*([NnSs])\s+(1?\d{1,2})\s+(\d{1,2})\s*([EeWw])/; $longd += ($longm/60); $longd = 0-$longd if (uc $longl) eq 'W';