change build number calculation to be more accurate

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 69da308538b3114a36a9f91e88be334f487adee0..954490fcf41e2798ad39ba6c6951b89002922dd5 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -15,6 +15,13 @@ use Data::Dumper;
 use DXDebug;
 
 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($db  %prefix_loc %pre);
 
 $db = undef;                                   # the DB_File handle
@@ -152,9 +159,9 @@ sub extract
                $p = $parts[0];
                shift @parts if $p =~ /^(WEB|NET)$/o;
                $p = $parts[$#parts];
-               pop @parts if $p =~ /^(\d+|[JPABM]|AM|MM|BCN|SIX|WEB|NET|Q\w+)$/o;
+               pop @parts if $p =~ /^(\d+|[JPABM]|AM|MM|BCN|JOTA|SIX|WEB|NET|Q\w+)$/o;
                $p = $parts[$#parts];
-               pop @parts if $p =~ /^(\d+|[JPABM]|AM|MM|BCN|SIX|WEB|NET|Q\w+)$/o;
+               pop @parts if $p =~ /^(\d+|[JPABM]|AM|MM|BCN|JOTA|SIX|WEB|NET|Q\w+)$/o;
   
                # can we resolve them by direct lookup
                foreach $p (@parts) {
@@ -188,6 +195,7 @@ my %valid = (
                         itu => '0,ITU',
                         cq => '0,CQ',
                         utcoff => '0,UTC offset',
+                        cont => '0,Continent',
                        );
 
 no strict;