add 1704 cty.dat data

diff --git a/data/cty.dat b/data/cty.dat
index 14414d7df0c6e4d1743463bf4cb54868c2f77671..72a6e891fabd6c047682ca99e7f3a8c606ebb718 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -1,7 +1,7 @@
 Sov Mil Order of Malta:   15:  28:  EU:   41.90:   -12.40:    -1.0:  1A:\r
     1A;\r
 Spratly Is.:              26:  50:  AS:    8.80:  -111.90:    -8.0:  1S:\r
-    1S,9M0,BV9S,9M4SDX,DU0K,DX0JP,DX0K;\r
+    1S,9M0,BV9S,9M2/PG5M,9M4SDX,DU0K,DX0JP,DX0K;\r
 Monaco:                   14:  27:  EU:   43.70:    -7.40:    -1.0:  3A:\r
     3A;\r
 Agalega & St. Brandon:    39:  53:  AF:  -10.40:   -56.60:    -4.0:  3B6:\r
@@ -36,6 +36,8 @@ Azerbaijan:               21:  29:  AS:   40.40:   -49.90:    -4.0:  4J:
     4J,4K;\r
 Georgia:                  21:  29:  AS:   41.70:   -44.80:    -4.0:  4L:\r
     4L;\r
+Montenegro:               15:  28:  EU:   42.50:   -19.30:    -1.0:  4O:\r
+    4O;\r
 Sri Lanka:                22:  41:  AS:    7.00:   -79.90:    -5.5:  4S:\r
     4P,4Q,4R,4S;\r
 ITU HQ Geneva:            14:  28:  EU:   46.20:    -6.20:    -1.0:  4U1I:\r
@@ -298,8 +300,8 @@ French Guiana:            09:  12:  SA:    4.90:    52.30:     3.0:  FY:
 England:                  14:  27:  EU:   51.50:     0.10:     0.0:  G:\r
     2E,G,M;\r
 Isle of Man:              14:  27:  EU:   54.30:     4.50:     0.0:  GD:\r
-    2D,GD,GT,MD,MT,GB0MST,GB0WCY,GB100MER,GB125SR,GB2IOM,GB2WB,GB3GD,GB4IOM,\r
-    GB4WXM/P,GB50UN,GB5MOB,GB6SPC;\r
+    2D,GD,GT,MD,MT,GB0MST,GB0WCY,GB100MER,GB100TT,GB125SR,GB2IOM,GB2WB,GB3GD,\r
+    GB4IOM,GB4WXM/P,GB50UN,GB5MOB,GB6SPC;\r
 Northern Ireland:         14:  27:  EU:   54.60:     5.90:     0.0:  GI:\r
     2I,2N,GI,GN,MI,MN,GB0BTC,GB0BVC,GB0CI,GB0CSC,GB0DDF,GB0GPF,GB0MFD,GB0PSM,\r
     GB0REL,GB0SHC,GB0SIC,GB0SPD,GB0TCH,GB0WOA,GB1SPD,GB2IL,GB2LL,GB2MGY,\r
@@ -334,12 +336,13 @@ Guernsey:                 14:  27:  EU:   49.50:     2.70:     0.0:  GU:
 Wales:                    14:  27:  EU:   51.50:     3.20:     0.0:  GW:\r
     2C,2W,2X,2Y,GC,GW,MC,MW,GB0CCE,GB0CLC,GB0CVA,GB0GCR,GB0GIW,GB0GLV,GB0HEL,\r
     GB0HMT,GB0ML,GB0MPA,GB0MWL,GB0NEW,GB0PSG,GB0RPO,GB0RSC,GB0SDD,GB0SH,\r
-    GB0SOA,GB0SPS,GB0SRH,GB0TD,GB0WRC,GB100BD,GB100FI,GB100LP,GB1CCC,GB1LSG,\r
-    GB1SSL,GB1TDS,GB2000SET,GB200HNT,GB2ANG,GB2CPC,GB2GGM,GB2GLS,GB2GOL,\r
-    GB2GSG,GB2GSS,GB2HDG,GB2IMD,GB2LNP,GB2LSA,GB2MIL,GB2MLM,GB2MOP,GB2RFS,\r
-    GB2RSC,GB2RTB,GB2SDD,GB2SIP,GB2TD,GB2TTA,GB2VK,GB2WDS,GB2WFF,GB2WHO,\r
-    GB2WSF,GB4BPL,GB4CI,GB4DPS,GB4HMD,GB4HMM,GB4LSG,GB4MD,GB4MDI,GB4NDG,GB4SA,\r
-    GB4SMM,GB4SNF,GB4XXX,GB5BS/J,GB5FI,GB5SIP,GB60VLY,GB6AR,GB750CC,GB8OQE;\r
+    GB0SOA,GB0SPS,GB0SRH,GB0TD,GB0TTT,GB0WRC,GB100BD,GB100FI,GB100LP,GB1CCC,\r
+    GB1LSG,GB1SSL,GB1TDS,GB2000SET,GB200HNT,GB2ANG,GB2CPC,GB2GGM,GB2GLS,\r
+    GB2GOL,GB2GSG,GB2GSS,GB2HDG,GB2IMD,GB2LNP,GB2LSA,GB2MIL,GB2MLM,GB2MOP,\r
+    GB2RFS,GB2RSC,GB2RTB,GB2SDD,GB2SIP,GB2TD,GB2TTA,GB2VK,GB2WDS,GB2WFF,\r
+    GB2WHO,GB2WSF,GB4BPL,GB4CI,GB4DPS,GB4HMD,GB4HMM,GB4LSG,GB4MD,GB4MDI,\r
+    GB4NDG,GB4SA,GB4SMM,GB4SNF,GB4XXX,GB5BS/J,GB5FI,GB5SIP,GB60VLY,GB6AR,\r
+    GB750CC,GB8OQE;\r
 Solomon Islands:          28:  51:  OC:   -9.40:  -160.00:   -11.0:  H4:\r
     H4;\r
 Temotu:                   32:  51:  OC:  -10.70:  -165.80:   -11.0:  H40:\r
@@ -462,8 +465,8 @@ United States:            05:  08:  NA:   43.00:    87.90:     5.0:  K:
     W9IGJ(5),W9MAK(3)[6],W9NGA(3)[6],WA0KDS(3)[6],WA1FCN(4),WA1MKE(4),\r
     WA1UJU(4),WA2MNO(4)[7],WA4GLH(4),WA4JA(4),WA4OSD(4),WA5VGI(3)[6],WA8WV(5),\r
     WB2ORD(4),WB4YDL(4),WB4ZBI(4),WB6BWZ(5)[8],WB8YQJ(3)[6],WB8YYY(5),WD4K(4),\r
-    WD4OHD(4),WG7Y(4)[7],WH0AI(4)[8],WJ9B(5),WL7K(3)[6],WN4M(4),WO4O(4),\r
-    WO5D(5)[8],WP4JBG(4)[8],WS4Y(4)[7],WT5L(5)[8],WX4TM(4);\r
+    WD4OHD(4),WG7Y(4)[7],WH0AI(4)[8],WH6ASW/M(3)[6],WJ9B(5),WL7K(3)[6],\r
+    WN4M(4),WO4O(4),WO5D(5)[8],WP4JBG(4)[8],WS4Y(4)[7],WT5L(5)[8],WX4TM(4);\r
 Guantanamo Bay:           08:  11:  NA:   19.90:    75.20:     5.0:  KG4:\r
     KG4,KG44;\r
 Mariana Is.:              27:  64:  OC:   15.20:  -145.80:   -10.0:  KH0:\r
@@ -487,7 +490,7 @@ Kure I.:                  31:  61:  OC:   28.40:   178.40:    11.0:  KH7K:
 American Samoa:           32:  62:  OC:  -14.30:   170.80:    11.0:  KH8:\r
     AH8,KH8,NH8,WH8;\r
 Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:\r
-    KH8SI,N8S;\r
+    KH8S/K3UY,KH8SI,N8S;\r
 Wake I.:                  31:  65:  OC:   19.30:  -166.60:   -12.0:  KH9:\r
     AH9,KH9,NH9,WH9;\r
 Alaska:                   01:  01:  NA:   61.20:   150.00:     9.0:  KL:\r
@@ -540,7 +543,7 @@ Lebanon:                  20:  39:  AS:   33.90:   -35.50:    -2.0:  OD:
 Austria:                  15:  28:  EU:   48.20:   -16.30:    -1.0:  OE:\r
     OE,SH75,4U1VIC;\r
 Finland:                  15:  18:  EU:   60.20:   -25.00:    -2.0:  OH:\r
-    OF,OG,OH,OI,OJ;\r
+    OF,OG,OH,OI,OJ,OH0JJS/1;\r
 Aland Is.:                15:  18:  EU:   60.20:   -20.00:    -2.0:  OH0:\r
     OF0,OG0,OH0,OI0;\r
 Market Reef:              15:  18:  EU:   60.30:   -19.00:    -2.0:  OJ0:\r
@@ -552,11 +555,11 @@ Slovakia:                 15:  28:  EU:   48.10:   -17.10:    -1.0:  OM:
 Belgium:                  14:  27:  EU:   50.90:    -4.40:    -1.0:  ON:\r
     ON,OO,OP,OQ,OR,OS,OT;\r
 Greenland:                40:  05:  NA:   62.50:    45.00:     3.0:  OX:\r
-    OX;\r
+    OX,XP;\r
 Faroe Is.:                14:  18:  EU:   62.00:     6.80:     0.0:  OY:\r
     OW,OY;\r
 Denmark:                  14:  18:  EU:   55.70:   -12.60:    -1.0:  OZ:\r
-    5P,5Q,OU,OV,OZ,XP;\r
+    5P,5Q,OU,OV,OZ;\r
 Papua New Guinea:         28:  51:  OC:   -9.40:  -147.10:   -10.0:  P2:\r
     P2;\r
 Aruba:                    09:  11:  SA:   12.50:    70.00:     4.0:  P4:\r
@@ -714,7 +717,7 @@ Asiatic Russia:           17:  30:  AS:   55.00:   -83.00:    -7.0:  UA9:
     UG9W(16),UH0,UH7,UH8,UH8T(18)[32],UH8V(18)[33],UH9,UH9I(18)[31],UH9M(17),\r
     UH9S(16),UH9T(16),UH9W(16),UI0,UI7,UI8,UI8T(18)[32],UI8V(18)[33],UI9,\r
     UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),UI9W(16),R270A,R270E,R375I,R3F/9,\r
-    R9HQ(17)[30],UE105SBM(18)[32],UE15UWC(18)[32];\r
+    R40WK,R9HQ(17)[30],UE105SBM(18)[32],UE15UWC(18)[32];\r
 Uzbekistan:               17:  30:  AS:   41.20:   -69.30:    -5.0:  UK:\r
     UJ,UK,UL,UM;\r
 Kazakhstan:               17:  30:  AS:   43.30:   -76.90:    -5.0:  UN:\r
@@ -843,7 +846,7 @@ Romania:                  20:  28:  EU:   44.40:   -26.10:    -2.0:  YO:
 El Salvador:              07:  11:  NA:   13.70:    89.20:     6.0:  YS:\r
     HU,YS;\r
 Serbia:                   15:  28:  EU:   44.90:   -20.50:    -1.0:  YU:\r
-    4N,4O,YT,YT60,YU,YU60,YZ,YZ60;\r
+    4N,YT,YT60,YU,YU60,YZ,YZ60;\r
 Venezuela:                09:  12:  SA:   10.50:    67.00:     4.0:  YV:\r
     4M,YV,YW,YX,YY;\r
 Aves I.:                  08:  11:  NA:   15.70:    63.70:     4.0:  YV0:\r
@@ -852,8 +855,6 @@ Zimbabwe:                 38:  53:  AF:  -17.80:   -31.00:    -2.0:  Z2:
     Z2;\r
 Macedonia:                15:  28:  EU:   41.80:   -21.40:    -1.0:  Z3:\r
     Z3;\r
-Montenegro:               15:  28:  EU:   42.50:   -19.30:    -1.0:  Z7:\r
-    4N3,4N6,4O3,4O6,YT3,YT6,YU3,YU6,YZ3,YZ6,Z7;\r
 Albania:                  15:  28:  EU:   41.30:   -19.80:    -1.0:  ZA:\r
     ZA;\r
 Gibraltar:                14:  37:  EU:   36.10:     5.40:    -1.0:  ZB:\r

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 4ebb495125c76c5b15a5461ed825a2e7eb559fdd..2bd4c84ad0f63028d7505d8f0c420e0d97d7325b 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -278,6 +278,7 @@
   '9L' => '301',
   '9M0' => '261',
   '9M2' => '302',
+  '9M2/PG5M' => '261',
   '9M4' => '302',
   '9M4SAB' => '303,527',
   '9M4SDX' => '261',
@@ -962,6 +963,7 @@
   'GB0SSF' => '64,351',
   'GB0TCH' => '62',
   'GB0TD' => '66',
+  'GB0TTT' => '66',
   'GB0WCY' => '61',
   'GB0WOA' => '62',
   'GB0WRC' => '66',
@@ -970,6 +972,7 @@
   'GB100LP' => '66',
   'GB100MAS' => '64,351',
   'GB100MER' => '61',
+  'GB100TT' => '61',
   'GB125BRC' => '64,351',
   'GB125SR' => '61',
   'GB150NRL' => '64,351',
@@ -1567,6 +1570,7 @@
   'KH7K' => '108',
   'KH8' => '109,333',
   'KH8/S' => '333',
+  'KH8S/K3UY' => '333',
   'KH8SI' => '333',
   'KH9' => '110',
   'KI0' => '467,473,477,484,485,489,490,502',
@@ -2347,6 +2351,7 @@
   'OG0' => '126',
   'OH' => '125,399',
   'OH0' => '126',
+  'OH0JJS/1' => '125,399',
   'OH0M' => '127',
   'OI' => '125',
   'OI0' => '126',
@@ -2497,6 +2502,7 @@
   'R375I' => '176,425,430',
   'R3F/9' => '176,425,430',
   'R4' => '420',
+  'R40WK' => '176,425,430',
   'R6' => '421',
   'R60A' => '175',
   'R60F' => '175',
@@ -3758,6 +3764,7 @@
   'WH5' => '105',
   'WH5K' => '106',
   'WH6' => '387,388',
+  'WH6ASW/M' => '220',
   'WH7' => '387,388',
   'WH7K' => '108',
   'WH8' => '109',

diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm
index 1dd7c700ff9fdbc0fc40202e6c6a7df328a79d0a..a5bb8a1b9cd762f9d4bdd0e1e2208f07743ba244 100644 (file)
--- a/perl/DXDupe.pm
+++ b/perl/DXDupe.pm
@@ -20,10 +20,7 @@ $lasttime = 0;
 $fn = "$main::data/dupefile";
 
 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));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 sub init
 {