allow 4 letter callsigns, add git id sh/version

diff --git a/Changes b/Changes
index 077acc7cfde0956bd36b8674d82b80f816ab1452..41da77a8d5044a3163fc5e81e781fe989a3892ef 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 17Jun10=======================================================================
-1. Add ip address to dxspots and default to PC61 output to dxspider nodes
+1. Add ip address to dxspots and default to PC61 output to dxspider nodes.
+2. Allow 4 letter callsign portions again.
 16Jun10=======================================================================
 1. Increase default ephemeral dupe time for PC41 and such like lines.
 2. Include CTY-2004 updates.

diff --git a/cmd/show/version.pl b/cmd/show/version.pl
index 661b0f27a97212a22946abbbb7ab3cbc105bc511..7107570d969c0e5108b57bb48508b89c81285351 100644 (file)
--- a/cmd/show/version.pl
+++ b/cmd/show/version.pl
@@ -9,7 +9,7 @@
 my @out;
 my ($year) = (gmtime($main::systime))[5];
 $year += 1900;
-push @out, "DX Spider Cluster version $main::version (build $main::subversion.$main::build) on \u$^O";
+push @out, "DX Spider Cluster version $main::version (build $main::subversion.$main::build git: $main::gitversion) on \u$^O";
 push @out, "Copyright (c) 1998-$year Dirk Koopman G1TLH";
 
 return (1, @out);

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index ba3013389b8f13b26dc6acf7f900621734498e9c..fc116f8e7ed3c191b7c538c7b8f87c176351d4ec 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -130,7 +130,7 @@ sub pc17
 sub pc18
 {
        my $flags = shift;
-       return "PC18^DXSpider Version: $main::version Build: $main::subversion.$main::build$flags^$DXProt::myprot_version^";
+       return "PC18^DXSpider Version: $main::version Build: $main::subversion.$main::build Git: $main::gitversion$flags^$DXProt::myprot_version^";
 }
 
 #

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 49cba9e972ad55fab0d4300c5d4eb72103254382..14819ad1b146446d6bbe5ca36088bbfc4728cf6d 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -376,7 +376,7 @@ sub is_callsign
 {
        return $_[0] =~ m!^(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+)        # basic prefix
                        (?:/(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+))?  # / another one (possibly)
-                                          [A-Z]{1,3}                                 # callsign letters
+                                          [A-Z]{1,4}                                 # callsign letters
                                           (?:/(?:[A-Z]{1,2}\d+ | \d[A-Z]{1,2}\d+))?  # / another prefix possibly
                        (?:/[0-9A-Z]{1,2})?                        # /0-9A-Z+ possibly
                                           (?:-\d{1,2})?                              # - nn possibly

diff --git a/perl/Version.pm b/perl/Version.pm
index 143e0055a84c2052f68a70c575709f5c26399f18..1ef3cd1e8af96f65390e86dc01637a4cf394ff91 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -7,10 +7,11 @@
 
 package main;
 
-use vars qw($version $subversion $build);
+use vars qw($version $subversion $build $gitversion);
 
 $version = '1.55';
 $subversion = '0';
-$build = '70';
+$build = '71';
+$gitversion = 'cd5b993';
 
 1;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 059a24a929997f5ca5c8cb150490803d823b605d..a33e6da5f1a8e76b2907cf8547791702a146cdd9 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -297,7 +297,7 @@ sub cease
                $l->close_server;
        }
 
-       LogDbg('cluster', "DXSpider V$version, build $subversion.$build ended");
+       LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitversion) ended");
        dbgclose();
        Logclose();
 
@@ -386,7 +386,7 @@ DXXml::init();
 # banner
 my ($year) = (gmtime)[5];
 $year += 1900;
-LogDbg('cluster', "DXSpider V$version, build $subversion.$build started");
+LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitversion) started");
 dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
 
 # load Prefixes

diff --git a/perl/issue.pl b/perl/issue.pl
index f7345c8ef50cac93321d067acdd9ac34a05961b0..065c9abdc1971546d8e198d009c9b7e84ba5e13f 100755 (executable)
--- a/perl/issue.pl
+++ b/perl/issue.pl
@@ -19,7 +19,7 @@ use strict;
 use vars qw($root);
 my $fn = "$root/perl/Version.pm";
 my $desc = `git describe --long`;
-my ($v, $s, $b) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-/;
+my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
 $s ||= '0';            # account for missing subversion
 $b++;                  # to account for the commit that is about to happen
 
@@ -33,11 +33,12 @@ print F qq(#
 
 package main;
 
-use vars qw(\$version \$subversion \$build);
+use vars qw(\$version \$subversion \$build \$gitversion);
 
 \$version = '$v';
 \$subversion = '$s';
 \$build = '$b';
+\$gitversion = '$g';
 
 1;
 );