change build number calculation to be more accurate

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4b96fe9608fad9b2eeebbf143c27e302cb654b82..310a3e87b94b61ecc17c43cb32d13123ca570b6a 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -34,6 +34,13 @@ use Route;
 use Route::Node;
 
 use strict;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($me $pc11_max_age $pc23_max_age
                        $last_hour $last10 %eph  %pings %rcmds
                        %nodehops $baddx $badspotter $badnode $censorpc
@@ -858,7 +865,7 @@ sub normal
                                return;
                        }
 
-                       Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]");
+                       Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[2]");
                        
                        # spots
                        if ($field[3] > 0) {