From f61fe3405f9cca29a7499709ed08aa66ee04be9a Mon Sep 17 00:00:00 2001 From: minima Date: Sun, 8 Apr 2007 17:45:53 +0000 Subject: [PATCH] add the latest CTY data change the way deletions are done in dupefile --- Changes | 3 +++ data/cty.dat | 33 +++++++++++++++++---------------- data/prefix_data.pl | 10 +++++++++- perl/DXDupe.pm | 4 +++- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Changes b/Changes index b1407c9d..371f056b 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +08Apr07======================================================================= +1. add CTY-1703 cty.dat +2. alter the way the dupefile deletion is done. 18Mar07======================================================================= 1. change URL in show/425. 04Mar07======================================================================= diff --git a/data/cty.dat b/data/cty.dat index c375be62..14414d7d 100644 --- a/data/cty.dat +++ b/data/cty.dat @@ -302,8 +302,9 @@ Isle of Man: 14: 27: EU: 54.30: 4.50: 0.0: GD: GB4WXM/P,GB50UN,GB5MOB,GB6SPC; Northern Ireland: 14: 27: EU: 54.60: 5.90: 0.0: GI: 2I,2N,GI,GN,MI,MN,GB0BTC,GB0BVC,GB0CI,GB0CSC,GB0DDF,GB0GPF,GB0MFD,GB0PSM, - GB0REL,GB0SHC,GB0SIC,GB0SPD,GB0TCH,GB0WOA,GB2IL,GB2LL,GB2MRI,GB2NIC, - GB2NTU,GB2TCA,GB3MNI,GB4CSC,GB4ES,GB4SPD,GB5BIG,GB5BL,GB5SPD,GB90SOM; + GB0REL,GB0SHC,GB0SIC,GB0SPD,GB0TCH,GB0WOA,GB1SPD,GB2IL,GB2LL,GB2MGY, + GB2MRI,GB2NIC,GB2NTU,GB2TCA,GB3MNI,GB4CSC,GB4ES,GB4SPD,GB5BIG,GB5BL, + GB5SPD,GB90SOM; Jersey: 14: 27: EU: 49.30: 2.20: 0.0: GJ: 2H,2J,GH,GJ,MH,MJ,GB0CLR,GB0GUD,GB0JSA,GB0SHL,GB2BYL,GB2JSA,GB4BHF, GJ3DVC/L; @@ -312,16 +313,16 @@ Scotland: 14: 27: EU: 55.80: 4.30: 0.0: GM: GB0GHD,GB0GKR,GB0GNE,GB0HHW,GB0KGS,GB0KTC,GB0LCS,GB0MLM,GB0NHL,GB0OS, GB0OYT,GB0PPE,GB0QWM,GB0RBS,GB0SHP,GB0SK,GB0SKY,GB0SS,GB0SSF,GB100MAS, GB125BRC,GB150NRL,GB1FVT,GB2AGG,GB2AST,GB2AYR,GB2CHG,GB2DHS,GB2ELH,GB2FBM, - GB2FIO,GB2FSM,GB2GNL,GB2GTM,GB2HI,GB2HRH,GB2HST,GB2HSW,GB2IAS,GB2IGS, - GB2IOC,GB2IOG,GB2IOT,GB2JUNO,GB2KDS,GB2KHL,GB2LAY,GB2LBN,GB2LCL,GB2LCP, - GB2LGB,GB2LMG,GB2LNM,GB2LO,GB2LP,GB2LS,GB2LSS,GB2LT,GB2LTN,GB2MAS,GB2MOD, - GB2MOF,GB2MSL,GB2MUL,GB2NAG,GB2NBC,GB2NCL,GB2NEF,GB2NL,GB2NTS,GB2OWM, - GB2OYC,GB2PS,GB2RB,GB2RRL,GB2SKG,GB2SLH,GB2SSF,GB2STB,GB2TDS,GB2TI,GB2WBB, - GB3GM,GB400CA,GB4AAS,GB4CGW,GB4DAS,GB4GM,GB4LNM,GB4NFE,GB4PMS,GB4RAF, - GB4SLH,GB4TSR,GB4ZBS,GB50ATC,GB50SWL,GB5AST,GB5CO,GB5FHC,GB5OL,GB5RO, - GB5SI,GB5TI,GB60BBC,GB60CRB,GB60NTS,GB6MI,GB6SA,GB6SM,GB6TAA,GB6WW, - GB700BSB,GB75GD,GB75SCP,GB75STT,GB8AYR,GB8CA,GB8CF,GB8CI,GB8CM,GB8CN, - GB8CO,GB8CY,GB8FF,GB8OO,GB8RU,GB93AM,MM/DL6MHW; + GB2FIO,GB2FSM,GB2GNL,GB2GTM,GB2HI,GB2HRH,GB2HST,GB2HSW,GB2IAS,GB2IGB, + GB2IGS,GB2IOC,GB2IOG,GB2IOT,GB2JUNO,GB2KDS,GB2KHL,GB2LAY,GB2LBN,GB2LCL, + GB2LCP,GB2LGB,GB2LMG,GB2LNM,GB2LO,GB2LP,GB2LS,GB2LSS,GB2LT,GB2LTN,GB2MAS, + GB2MOD,GB2MOF,GB2MSL,GB2MUL,GB2NAG,GB2NBC,GB2NCL,GB2NEF,GB2NL,GB2NTS, + GB2OWM,GB2OYC,GB2PBF,GB2PS,GB2RB,GB2RRL,GB2SKG,GB2SLH,GB2SPD,GB2SSF, + GB2STB,GB2TDS,GB2TI,GB2WBB,GB3GM,GB400CA,GB4AAS,GB4CGW,GB4DAS,GB4GM, + GB4LNM,GB4NFE,GB4PMS,GB4RAF,GB4SLH,GB4TSR,GB4ZBS,GB50ATC,GB50SWL,GB5AST, + GB5CO,GB5FHC,GB5OL,GB5RO,GB5SI,GB5TI,GB60BBC,GB60CRB,GB60NTS,GB6MI,GB6SA, + GB6SM,GB6TAA,GB6WW,GB700BSB,GB75GD,GB75SCP,GB75STT,GB8AYR,GB8CA,GB8CF, + GB8CI,GB8CM,GB8CN,GB8CO,GB8CY,GB8FF,GB8OO,GB8RU,GB93AM,MM/DL6MHW; Shetlands: 14: 27: EU: 60.40: 1.50: 0.0: *GM/s: GZ,MZ,2M1ANT,2M1ASQ,2M1ODL,GM0DJI,GM0EKM,GM0ILB,GM0MZD,GM0VFA,GM1CBQ, GM1KKI,GM1ZNR,GM3KLA,GM3STU,GM3WCH,GM3WHT,GM3XPQ,GM3ZET,GM3ZNM,GM3ZXH, @@ -486,7 +487,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: AH8,KH8,NH8,WH8; Swains Island: 32: 62: OC: -11.05: 171.25: 11.0: KH8/s: - KH8SI; + KH8SI,N8S; Wake I.: 31: 65: OC: 19.30: -166.60: -12.0: KH9: AH9,KH9,NH9,WH9; Alaska: 01: 01: NA: 61.20: 150.00: 9.0: KL: @@ -537,7 +538,7 @@ Peru: 10: 12: SA: -12.10: 77.10: 5.0: OA: Lebanon: 20: 39: AS: 33.90: -35.50: -2.0: OD: OD; Austria: 15: 28: EU: 48.20: -16.30: -1.0: OE: - OE,4U1VIC,OE3XHA/SH75; + OE,SH75,4U1VIC; Finland: 15: 18: EU: 60.20: -25.00: -2.0: OH: OF,OG,OH,OI,OJ; Aland Is.: 15: 18: EU: 60.20: -20.00: -2.0: OH0: @@ -713,7 +714,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), UH9S(16),UH9T(16),UH9W(16),UI0,UI7,UI8,UI8T(18)[32],UI8V(18)[33],UI9, UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),UI9W(16),R270A,R270E,R375I,R3F/9, - R9HQ(17)[30],UE105SBM(18)[32]; + R9HQ(17)[30],UE105SBM(18)[32],UE15UWC(18)[32]; Uzbekistan: 17: 30: AS: 41.20: -69.30: -5.0: UK: UJ,UK,UL,UM; Kazakhstan: 17: 30: AS: 43.30: -76.90: -5.0: UN: @@ -880,7 +881,7 @@ New Zealand: 32: 60: OC: -36.90: -174.80: -12.0: ZL: Chatham Is.: 32: 60: OC: -44.00: 176.50: -12.75: ZL7: ZL7,ZM7; Kermadec Is.: 32: 60: OC: -30.00: 177.90: -12.0: ZL8: - ZL8,ZM8; + ZL1GO/8,ZL8,ZM8; Auckland & Campbell: 32: 60: OC: -50.70: -166.50: -12.0: ZL9: ZL9,ZM9; Paraguay: 11: 14: SA: -25.30: 57.70: 4.0: ZP: diff --git a/data/prefix_data.pl b/data/prefix_data.pl index 1f368c17..4ebb4951 100644 --- a/data/prefix_data.pl +++ b/data/prefix_data.pl @@ -976,6 +976,7 @@ 'GB1CCC' => '66', 'GB1FVT' => '64,351', 'GB1LSG' => '66', + 'GB1SPD' => '62', 'GB1SSL' => '66', 'GB1TDS' => '66', 'GB2000SET' => '66', @@ -1007,6 +1008,7 @@ 'GB2HST' => '64,351', 'GB2HSW' => '64,351', 'GB2IAS' => '64,351', + 'GB2IGB' => '64,351', 'GB2IGS' => '64,351', 'GB2IL' => '62', 'GB2IMD' => '66', @@ -1035,6 +1037,7 @@ 'GB2LT' => '64,351', 'GB2LTN' => '64,351', 'GB2MAS' => '64,351', + 'GB2MGY' => '62', 'GB2MIL' => '66', 'GB2MLM' => '66', 'GB2MOD' => '64,351', @@ -1053,6 +1056,7 @@ 'GB2NTU' => '62', 'GB2OWM' => '64,351', 'GB2OYC' => '64,351', + 'GB2PBF' => '64,351', 'GB2PS' => '64,351', 'GB2RB' => '64,351', 'GB2RFS' => '66', @@ -1063,6 +1067,7 @@ 'GB2SIP' => '66', 'GB2SKG' => '64,351', 'GB2SLH' => '64,351', + 'GB2SPD' => '64,351', 'GB2SSF' => '64,351', 'GB2STB' => '64,351', 'GB2TCA' => '62', @@ -2060,6 +2065,7 @@ 'N8NA' => '220', 'N8PR' => '220', 'N8RA' => '220', + 'N8S' => '333', 'N8WXQ' => '220', 'N9' => '475,476,509', 'N9ADG' => '220', @@ -2335,7 +2341,6 @@ 'OC' => '122', 'OD' => '123', 'OE' => '124', - 'OE3XHA/SH75' => '124', 'OF' => '125', 'OF0' => '126', 'OG' => '125', @@ -2943,6 +2948,7 @@ 'SF' => '146', 'SG' => '146', 'SH' => '146', + 'SH75' => '124', 'SI' => '146', 'SJ' => '146', 'SK' => '146', @@ -3170,6 +3176,7 @@ 'UE0' => '422,424,428', 'UE1' => '418', 'UE105SBM' => '176,425,430', + 'UE15UWC' => '176,425,430', 'UE2' => '175', 'UE200TARS' => '173,418,419,420,421', 'UE3' => '419', @@ -4052,6 +4059,7 @@ 'ZL' => '253,518,519,520,521', 'ZL0' => '367', 'ZL1' => '518', + 'ZL1GO/8' => '255', 'ZL2' => '519', 'ZL3' => '520', 'ZL4' => '521', diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm index 6595ef87..1dd7c700 100644 --- a/perl/DXDupe.pm +++ b/perl/DXDupe.pm @@ -74,9 +74,11 @@ sub process { # once an hour if ($main::systime - $lasttime >= 3600) { + my @del; while (($k, $v) = each %d) { - delete $d{$k} if $main::systime >= $v; + push @del, $k if $main::systime >= $v; } + delete $d{$_} for @del; $lasttime = $main::systime; } } -- 2.34.1