From 2926213cad1fdefa202b3e50c3387a69ae5f76af Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Fri, 15 May 2009 21:50:12 +0100 Subject: [PATCH] add CTY1904 prefixes --- Changes | 2 + data/cty.dat | 163 ++++++++++++++++++++++---------------------- data/prefix_data.pl | 31 ++++++--- perl/Version.pm | 4 +- perl/cluster.pl | 2 +- 5 files changed, 109 insertions(+), 93 deletions(-) diff --git a/Changes b/Changes index ad7c2936..ed47a75f 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +15May09======================================================================= +1. Add CTY-1904 prefixes 29Dec08======================================================================= 1. Add show/motd command as requested by Ian G0VGS. 2. add CTY-1817 prefixes diff --git a/data/cty.dat b/data/cty.dat index a76982e8..1bf010d6 100644 --- a/data/cty.dat +++ b/data/cty.dat @@ -96,7 +96,7 @@ Croatia: 15: 28: EU: 45.50: -15.60: -1.0: 9A: Ghana: 35: 46: AF: 5.50: 0.20: 0.0: 9G: 9G; Malta: 15: 28: EU: 36.00: -14.40: -1.0: 9H: - 9H; + 9H,=9H1VC/KHS; Zambia: 36: 53: AF: -15.40: -28.30: -2.0: 9J: 9I,9J; Kuwait: 21: 39: AS: 29.50: -47.80: -3.0: 9K: @@ -189,10 +189,10 @@ Antarctica: 13: 74: SA: -65.00: 64.00: -4.0: CE9: VM0(39)[69],VN0(39)[69],VZ0(39)[69],ZL5(30)[71],ZM5(30)[71],ZS7(38)[67], =8J1RF(39)[67],=8J1RL(39)[67],=CE9/K2ARB(30)[71],=CE9XX[73], =DP0GVN(38)[67],=DP1POL(38)[67],=KC4/K2ARB(30)[71],=KC4AAA(39), - =KC4AAC[73],=KC4USB(12)[72],=KC4USV(30)[71],=LU/FT5YJ[73],=LU4ZS[73], - =OP0LE(38)[67],=OP0OL(38)[67],=OR3AX(30)[70],=OR4AX(30)[70], - =R1ANR(38)[67],=VP8DJB[73],=VP8DKF(30)[71],=VP8DLJ[73],=VP8DLM[73], - =VP8PJ[73],=VP8ROT[73]; + =KC4AAC[73],=KC4USB(12)[72],=KC4USV(30)[71],=LU4ZS[73],=OP0LE(38)[67], + =OP0OL(38)[67],=OR3AX(30)[70],=OR4AX(30)[70],=R1ANR(38)[67], + =SM/OH2FFP(38)[67],=VP8DJB[73],=VP8DKF(30)[71],=VP8DLJ[73],=VP8PJ[73], + =VP8ROT[73]; Cuba: 08: 11: NA: 21.50: 80.00: 5.0: CM: CL,CM,CO,T4; Morocco: 33: 37: AF: 32.00: 5.00: 0.0: CN: @@ -271,7 +271,7 @@ Mayotte: 39: 53: AF: -13.00: -45.30: -3.0: FH: St. Barthelemy: 08: 11: NA: 17.90: 62.90: 4.0: FJ: FJ,=TO5DX,=TO5E,=TO5FJ,=TO5RZ; New Caledonia: 32: 56: OC: -21.50: -165.50: -11.0: FK: - FK,TX8,=TX1A,=TX3SAM,=TX5CW; + FK,TX8,=TX1A; Chesterfield Is.: 30: 56: OC: -19.90: -158.30: -11.0: FK/c: =TX0AT,=TX0C,=TX0DX,=TX9; Martinique: 08: 11: NA: 14.60: 61.00: 4.0: FM: @@ -291,11 +291,11 @@ St. Pierre & Miquelon: 05: 09: NA: 46.70: 56.00: 3.0: FP: Reunion: 39: 53: AF: -21.10: -55.60: -4.0: FR: FR,=TO3R; Glorioso: 39: 53: AF: -11.50: -47.30: -4.0: FR/g: - =TO4G; + FT5G,=TO4G; Juan de Nova & Europa: 39: 53: AF: -19.60: -41.60: -3.0: FR/j: - =TO4E; + FT5E,FT5J,=TO4E; Tromelin: 39: 53: AF: -15.90: -54.40: -4.0: FR/t: - =FR5ZU/T; + FT5T,=FR5ZU/T; French St. Martin: 08: 11: NA: 18.10: 63.10: 4.0: FS: FS,=TO4X,=TO5D; Crozet: 39: 68: AF: -46.00: -52.00: -5.0: FT5W: @@ -311,8 +311,9 @@ French Guiana: 09: 12: SA: 4.90: 52.30: 3.0: FY: England: 14: 27: EU: 51.50: 0.10: 0.0: G: 2E,G,M,=M/N2WKS; Isle of Man: 14: 27: EU: 54.30: 4.50: 0.0: GD: - 2D,2T,GD,GT,MD,MT,=GB0MST,=GB0WCY,=GB100MER,=GB100TT,=GB125SR,=GB2IOM, - =GB2MAD,=GB2WB,=GB3GD,=GB4IOM,=GB4MNH,=GB4WXM/P,=GB50UN,=GB5MOB,=GB6SPC; + 2D,2T,GD,GT,MD,MT,=GB0AOA,=GB0MST,=GB0WCY,=GB100MER,=GB100TT,=GB125SR, + =GB2IOM,=GB2MAD,=GB2WB,=GB3GD,=GB4IOM,=GB4MNH,=GB4WXM/P,=GB50UN,=GB5LB, + =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,=GB1AFP,=GB1SPD, @@ -326,20 +327,21 @@ Scotland: 14: 27: EU: 55.80: 4.30: 0.0: GM: =GB0FLA,=GB0GDS,=GB0GEI,=GB0GHD,=GB0GKR,=GB0GNE,=GB0HHW,=GB0KGS,=GB0KTC, =GB0LCS,=GB0LTM,=GB0MFG,=GB0MLM,=GB0MOL,=GB0NHL,=GB0OS,=GB0OYT,=GB0PPE, =GB0QWM,=GB0RBS,=GB0SHP,=GB0SI,=GB0SK,=GB0SKY,=GB0SS,=GB0SSF,=GB0TI, - =GB100MAS,=GB125BRC,=GB150NRL,=GB1EPC,=GB1FS,=GB1FVT,=GB1OL,=GB250RB, - =GB2AGG,=GB2AST,=GB2AYR,=GB2CHG,=GB2DHS,=GB2DTM,=GB2FBM,=GB2FIO,=GB2FSM, - =GB2GEO,=GB2GNL,=GB2GTM,=GB2HI,=GB2HLB,=GB2HRH,=GB2HST,=GB2HSW,=GB2IAS, - =GB2IGB,=GB2IGS,=GB2IMM,=GB2IOC,=GB2IOG,=GB2IOT,=GB2JUNO,=GB2KDS,=GB2KHL, - =GB2LAY,=GB2LBN,=GB2LCL,=GB2LCP,=GB2LGB,=GB2LHI,=GB2LMG,=GB2LNM,=GB2LO, - =GB2LP,=GB2LS,=GB2LSS,=GB2LT,=GB2LTH,=GB2LTN,=GB2MAS,=GB2MDG,=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,=GB50JS,=GB50SWL,=GB5AST,=GB5BBS,=GB5CO,=GB5FHC,=GB5JS,=GB5OL, - =GB5RO,=GB5SI,=GB5TI,=GB60BBC,=GB60CRB,=GB60NTS,=GB6MI,=GB6SA,=GB6SM, - =GB6TAA,=GB6WW,=GB700BSB,=GB75GD,=GB75SCP,=GB75STT,=GB8AYR,=GB8CA,=GB8CF, - =GB8CI,=GB8CM,=GB8CN,=GB8CO,=GB8CSL,=GB8CY,=GB8FF,=GB8OO,=GB8RU,=GB93AM; + =GB100MAS,=GB10SP,=GB125BRC,=GB150NRL,=GB1EPC,=GB1FS,=GB1FVT,=GB1OL, + =GB250RB,=GB2AGG,=GB2AST,=GB2AYR,=GB2CHG,=GB2DHS,=GB2DTM,=GB2FBM,=GB2FIO, + =GB2FSM,=GB2GEO,=GB2GNL,=GB2GTM,=GB2HI,=GB2HLB,=GB2HRH,=GB2HST,=GB2HSW, + =GB2IAS,=GB2IGB,=GB2IGS,=GB2IMM,=GB2IOC,=GB2IOG,=GB2IOT,=GB2JUNO,=GB2KDS, + =GB2KHL,=GB2LAY,=GB2LBN,=GB2LCL,=GB2LCP,=GB2LGB,=GB2LHI,=GB2LMG,=GB2LNM, + =GB2LO,=GB2LP,=GB2LS,=GB2LSS,=GB2LT,=GB2LTH,=GB2LTN,=GB2MAS,=GB2MDG, + =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,=GB50JS,=GB50SWL,=GB5AST,=GB5BBS,=GB5CO,=GB5FHC,=GB5JS, + =GB5OL,=GB5RO,=GB5SI,=GB5TI,=GB60BBC,=GB60CRB,=GB60NTS,=GB6MI,=GB6SA, + =GB6SM,=GB6TAA,=GB6WW,=GB700BSB,=GB75GD,=GB75SCP,=GB75STT,=GB8AYR,=GB8CA, + =GB8CF,=GB8CI,=GB8CM,=GB8CN,=GB8CO,=GB8CSL,=GB8CY,=GB8FF,=GB8OO,=GB8RU, + =GB93AM; Shetland: 14: 27: EU: 60.40: 1.50: 0.0: *GM/s: GZ,MZ,=2M0BDR,=2M0BDT,=2M0ZET,=GB2ELH,=GM0AVR,=GM0CXQ,=GM0CYJ,=GM0DJI, =GM0EKM,=GM0ILB,=GM0ULK,=GM1KKI,=GM1ZNR,=GM3KLA,=GM3WHT,=GM3ZET,=GM3ZNM, @@ -352,16 +354,17 @@ Guernsey: 14: 27: EU: 49.50: 2.70: 0.0: GU: =GB50LIB; Wales: 14: 27: EU: 51.50: 3.20: 0.0: GW: 2C,2W,2X,2Y,GC,GW,MC,MW,=GB0CCE,=GB0CLC,=GB0CVA,=GB0GCR,=GB0GIW,=GB0GLV, - =GB0HEL,=GB0HMT,=GB0ML,=GB0MPA,=GB0MWL,=GB0NEW,=GB0PSG,=GB0RPO,=GB0RSC, - =GB0SDD,=GB0SH,=GB0SOA,=GB0SPS,=GB0SRH,=GB0TD,=GB0TTT,=GB0VK,=GB0WRC, - =GB100BD,=GB100FI,=GB100LP,=GB1CCC,=GB1LSG,=GB1SL,=GB1SSL,=GB1TDS, - =GB2000SET,=GB200A,=GB200HNT,=GB2ANG,=GB2CI,=GB2CPC,=GB2GGM,=GB2GLS, - =GB2GOL,=GB2GSG,=GB2GSS,=GB2HDG,=GB2IMD,=GB2LNP,=GB2LSA,=GB2MHL,=GB2MIL, - =GB2MLM,=GB2MOP,=GB2RFS,=GB2RSC,=GB2RTB,=GB2SAC,=GB2SDD,=GB2SIP,=GB2TD, - =GB2TTA,=GB2VK,=GB2WDS,=GB2WFF,=GB2WHO,=GB2WSF,=GB4BPL,=GB4CI,=GB4DPS, - =GB4HMD,=GB4HMM,=GB4LRG,=GB4LSG,=GB4MD,=GB4MDI,=GB4MUU,=GB4NDG,=GB4SA, - =GB4SDD,=GB4SMM,=GB4SNF,=GB4TMS,=GB4XXX,=GB5BS/J,=GB5FI,=GB5ONG,=GB5SIP, - =GB60VLY,=GB6AR,=GB6GW,=GB6OQA,=GB750CC,=GB8OQE; + =GB0GMD,=GB0HEL,=GB0HMT,=GB0ML,=GB0MPA,=GB0MWL,=GB0NEW,=GB0PSG,=GB0RPO, + =GB0RSC,=GB0SDD,=GB0SH,=GB0SOA,=GB0SPS,=GB0SRH,=GB0TD,=GB0TTT,=GB0VK, + =GB0WRC,=GB100BD,=GB100BP,=GB100FI,=GB100LP,=GB1CCC,=GB1LSG,=GB1SL, + =GB1SSL,=GB1TDS,=GB2000SET,=GB200A,=GB200HNT,=GB2ADU,=GB2ANG,=GB2CI, + =GB2CPC,=GB2GGM,=GB2GLS,=GB2GOL,=GB2GSG,=GB2GSS,=GB2HDG,=GB2IMD,=GB2LNP, + =GB2LSA,=GB2MHL,=GB2MIL,=GB2MLM,=GB2MOP,=GB2RFS,=GB2RSC,=GB2RTB,=GB2SAC, + =GB2SDD,=GB2SIP,=GB2TD,=GB2TTA,=GB2VK,=GB2WDS,=GB2WFF,=GB2WHO,=GB2WSF, + =GB4BPL,=GB4CI,=GB4DPS,=GB4HMD,=GB4HMM,=GB4LRG,=GB4LSG,=GB4MD,=GB4MDI, + =GB4MUU,=GB4NDG,=GB4SA,=GB4SDD,=GB4SMM,=GB4SNF,=GB4TMS,=GB4XXX,=GB5BS/J, + =GB5FI,=GB5ONG,=GB5SIP,=GB60BTF,=GB60VLY,=GB6AR,=GB6GW,=GB6OQA,=GB750CC, + =GB8OQE; Solomon Islands: 28: 51: OC: -9.40: -160.00: -11.0: H4: H4; Temotu: 32: 51: OC: -10.70: -165.80: -11.0: H40: @@ -544,7 +547,7 @@ Puerto Rico: 08: 11: NA: 18.50: 66.20: 4.0: KP4: Desecheo I.: 08: 11: NA: 18.30: 67.50: 4.0: KP5: KP5,NP5,WP5; Norway: 14: 18: EU: 60.00: -10.70: -1.0: LA: - LA,LB,LC,LD,LE,LF,LG,LH,LI,LJ,LK,LL,LM,LN; + LA,LB,LC,LD,LE,LF,LG,LH,LI,LJ,LK,LL,LM,LN,=VERSION; Argentina: 13: 14: SA: -34.60: 58.40: 3.0: LU: AY,AZ,L2,L3,L4,L5,L6,L7,L8,L9,LO,LP,LQ,LR,LS,LT,LU,LV,LW,=AY0N/X,=AY3DR/D, =AY4EJ/D,=AY5E/D,=AY7DSY/D,=DJ4SN/LU/X,=L20ARC/D,=L21ESC/LH,=L25E/D, @@ -553,39 +556,39 @@ Argentina: 13: 14: SA: -34.60: 58.40: 3.0: LU: =LU1DK/D,=LU1DMA/E,=LU1DZ/E,=LU1DZ/P,=LU1DZ/Q,=LU1DZ/R,=LU1DZ/S,=LU1DZ/X, =LU1EEZ/D,=LU1EJ/W,=LU1EQ/D,=LU1EUU/W,=LU1EYW/D,=LU1OFN/I,=LU1VOF/D, =LU1VZ/V,=LU1WCR/W,=LU1WF/W,=LU1WP/W,=LU1XAW/X,=LU1XWC/E,=LU1XY/X, - =LU1YU/D,=LU1YY/Y,=LU2AGQ/D,=LU2CRM/XA,=LU2DT/D,=LU2DT/LH,=LU2DVI/H, - =LU2EE/D,=LU2EE/E,=LU2EJB/X,=LU2VC/D,=LU2VCD/V,=LU2VDV/D,=LU2WV/O, - =LU2XBI/XA,=LU2XX/X,=LU3CQ/D,=LU3DC/D,=LU3DJI/D,=LU3DJI/W,=LU3DOC/D, - =LU3DR/D,=LU3DR/V,=LU3DXG/D,=LU3DXG/W,=LU3DZO/D,=LU3EOU/D,=LU3ES/D, - =LU3ES/V,=LU3ES/W,=LU3HKA/D,=LU3HKA/H,=LU4AAO/D,=LU4DA/D,=LU4DBP/D, - =LU4DBT/D,=LU4DDL/V,=LU4DQ/D,=LU4DRC/Y,=LU4DRH/D,=LU4DRH/E,=LU4EHP/V, - =LU4EJ/D,=LU4ELE/D,=LU4ESP/D,=LU4ETN/D,=LU4ETN/W,=LU4EV/Q,=LU4UWZ/D, - =LU4UZW/D,=LU4WG/W,=LU5BE/D,=LU5BE/XA,=LU5BOJ/O,=LU5DEM/D,=LU5DEM/V, - =LU5DEM/W,=LU5DIT/D,=LU5DIT/V,=LU5DIT/W,=LU5DRV/D,=LU5DRV/V,=LU5DT/D, - =LU5DV/D,=LU5DWS/D,=LU5EAO/D,=LU5EFX/Y,=LU5EJL/D,=LU5EWO/D,=LU5FZ/D, - =LU5VAS/D,=LU5VAT/D,=LU5XC/X,=LU6DBL/D,=LU6DBL/W,=LU6DDC/D,=LU6DG/D, - =LU6DKT/D,=LU6DRD/D,=LU6DRD/E,=LU6DRN/D,=LU6DRR/D,=LU6DTB/D,=LU6EC/W, - =LU6EJJ/D,=LU6EPE/D,=LU6EPR/D,=LU6EPR/E,=LU6EU/D,=LU6EYK/X,=LU6JJ/D, - =LU6UAL/D,=LU6UO/D,=LU6UO/P,=LU6UO/Q,=LU6UO/R,=LU6UO/S,=LU6UO/X,=LU6WG/W, - =LU6XAH/X,=LU7AC/D,=LU7BTO/D,=LU7DBL/D,=LU7DID/V,=LU7DID/Y,=LU7DIR/D, - =LU7DJJ/W,=LU7DP/D,=LU7DR/D,=LU7DSY/D,=LU7DSY/V,=LU7DSY/W,=LU7DW/D, - =LU7DZL/D,=LU7DZL/E,=LU7EGH/V,=LU7EGY/D,=LU7EHL/D,=LU7EO/D,=LU7EPC/D, - =LU7EPC/W,=LU7HW/D,=LU7VCH/D,=LU7WFM/W,=LU7WW/W,=LU8ADX/D,=LU8DCH/D, - =LU8DCH/Q,=LU8DIP/D,=LU8DR/D,=LU8DRA/W,=LU8DRH/D,=LU8DSJ/D,=LU8DWR/D, - =LU8DWR/V,=LU8EBJ/D,=LU8EBJ/E,=LU8EBK/D,=LU8EBK/E,=LU8ECF/D,=LU8ECF/E, - =LU8EEM/D,=LU8EFF/D,=LU8EGS/D,=LU8EHQ/D,=LU8EHQ/E,=LU8EHQ/W,=LU8EHV/D, - =LU8EKB/W,=LU8EKC/D,=LU8EOT/X,=LU8EOT/Y,=LU8ERH/D,=LU8EXJ/D,=LU8EXN/D, - =LU8FOZ/V,=LU8VCC/D,=LU8WFT/Q,=LU8XC/X,=LU8XW/X,=LU8XW/XD,=LU9ARB/D, - =LU9AUC/D,=LU9DBK/X,=LU9DF/D,=LU9DKX/X,=LU9DO/D,=LU9DPD/XA,=LU9EI/D, - =LU9EI/F,=LU9EJS/E,=LU9ESD/D,=LU9ESD/F,=LU9ESD/V,=LU9ESD/W,=LU9ESD/Y, - =LU9EV/D,=LU9EV/LH,=LU9HVR/D,=LU9JMG/J,=LW1DAL/D,=LW1DE/D,=LW1EXU/D, - =LW1EXU/Y,=LW2DX/E,=LW2DX/P,=LW2DX/Q,=LW2DX/R,=LW2DX/S,=LW2DX/Y,=LW2EFS/D, - =LW2ENB/D,=LW3DKC/D,=LW3DKC/E,=LW3DKO/D,=LW3DKO/E,=LW3HAQ/D,=LW4DRH/D, - =LW4DRH/E,=LW4DRV/D,=LW4ECV/D,=LW4EIN/D,=LW4EM/E,=LW4EM/LH,=LW5DR/LH, - =LW5DWX/D,=LW5EE/D,=LW5EE/V,=LW5EOL/D,=LW6DTM/D,=LW7DAF/D,=LW7DAF/W, - =LW7DLY/D,=LW7DNS/E,=LW7EDH/D,=LW7EJV/D,=LW7WFM/W,=LW8DMK/D,=LW8DMK/W, - =LW8EAG/D,=LW8ECQ/D,=LW8EU/D,=LW8EXF/D,=LW9DCF/Y,=LW9DX/D,=LW9EAG/D, - =LW9EAG/V,=LW9EAG/W,=LW9EVA/D,=LW9EVA/E; + =LU1XZ/H,=LU1YU/D,=LU1YY/Y,=LU2AGQ/D,=LU2CRM/XA,=LU2DT/D,=LU2DT/LH, + =LU2DVI/H,=LU2EE/D,=LU2EE/E,=LU2EJB/X,=LU2VC/D,=LU2VCD/V,=LU2VDV/D, + =LU2WV/O,=LU2XBI/XA,=LU2XX/X,=LU3CQ/D,=LU3DC/D,=LU3DJI/D,=LU3DJI/W, + =LU3DOC/D,=LU3DR/D,=LU3DR/V,=LU3DXG/D,=LU3DXG/W,=LU3DZO/D,=LU3EOU/D, + =LU3ES/D,=LU3ES/V,=LU3ES/W,=LU3HKA/D,=LU3HKA/H,=LU4AAO/D,=LU4DA/D, + =LU4DBP/D,=LU4DBT/D,=LU4DDL/V,=LU4DQ/D,=LU4DRC/Y,=LU4DRH/D,=LU4DRH/E, + =LU4EHP/V,=LU4EJ/D,=LU4ELE/D,=LU4ESP/D,=LU4ETN/D,=LU4ETN/W,=LU4EV/Q, + =LU4UWZ/D,=LU4UZW/D,=LU4WG/W,=LU5BE/D,=LU5BE/XA,=LU5BOJ/O,=LU5DEM/D, + =LU5DEM/V,=LU5DEM/W,=LU5DIT/D,=LU5DIT/V,=LU5DIT/W,=LU5DRV/D,=LU5DRV/V, + =LU5DT/D,=LU5DV/D,=LU5DWS/D,=LU5EAO/D,=LU5EFX/Y,=LU5EJL/D,=LU5EWO/D, + =LU5FZ/D,=LU5VAS/D,=LU5VAT/D,=LU5XC/X,=LU6DBL/D,=LU6DBL/W,=LU6DDC/D, + =LU6DG/D,=LU6DKT/D,=LU6DRD/D,=LU6DRD/E,=LU6DRN/D,=LU6DRR/D,=LU6DTB/D, + =LU6EC/W,=LU6EJJ/D,=LU6EPE/D,=LU6EPR/D,=LU6EPR/E,=LU6EU/D,=LU6EYK/X, + =LU6JJ/D,=LU6UAL/D,=LU6UO/D,=LU6UO/P,=LU6UO/Q,=LU6UO/R,=LU6UO/S,=LU6UO/X, + =LU6WG/W,=LU6XAH/X,=LU7AC/D,=LU7BTO/D,=LU7DBL/D,=LU7DID/V,=LU7DID/Y, + =LU7DIR/D,=LU7DJJ/W,=LU7DP/D,=LU7DR/D,=LU7DSY/D,=LU7DSY/V,=LU7DSY/W, + =LU7DW/D,=LU7DZL/D,=LU7DZL/E,=LU7EGH/V,=LU7EGY/D,=LU7EHL/D,=LU7EO/D, + =LU7EPC/D,=LU7EPC/W,=LU7FJ/F,=LU7HW/D,=LU7VCH/D,=LU7WFM/W,=LU7WW/W, + =LU8ADX/D,=LU8DCH/D,=LU8DCH/Q,=LU8DIP/D,=LU8DR/D,=LU8DRA/W,=LU8DRH/D, + =LU8DSJ/D,=LU8DWR/D,=LU8DWR/V,=LU8EBJ/D,=LU8EBJ/E,=LU8EBK/D,=LU8EBK/E, + =LU8ECF/D,=LU8ECF/E,=LU8EEM/D,=LU8EFF/D,=LU8EGS/D,=LU8EHQ/D,=LU8EHQ/E, + =LU8EHQ/W,=LU8EHV/D,=LU8EKB/W,=LU8EKC/D,=LU8EOT/X,=LU8EOT/Y,=LU8ERH/D, + =LU8EXJ/D,=LU8EXN/D,=LU8FOZ/V,=LU8VCC/D,=LU8WFT/Q,=LU8XC/X,=LU8XW/X, + =LU8XW/XD,=LU9ARB/D,=LU9AUC/D,=LU9DBK/X,=LU9DF/D,=LU9DKX/X,=LU9DO/D, + =LU9DPD/XA,=LU9EI/D,=LU9EI/F,=LU9EJS/E,=LU9ESD/D,=LU9ESD/F,=LU9ESD/V, + =LU9ESD/W,=LU9ESD/Y,=LU9EV/D,=LU9EV/LH,=LU9HVR/D,=LU9JMG/J,=LW1DAL/D, + =LW1DE/D,=LW1EXU/D,=LW1EXU/Y,=LW2DX/E,=LW2DX/P,=LW2DX/Q,=LW2DX/R,=LW2DX/S, + =LW2DX/Y,=LW2EFS/D,=LW2ENB/D,=LW3DKC/D,=LW3DKC/E,=LW3DKO/D,=LW3DKO/E, + =LW3HAQ/D,=LW4DRH/D,=LW4DRH/E,=LW4DRV/D,=LW4ECV/D,=LW4EIN/D,=LW4EM/E, + =LW4EM/LH,=LW5DR/LH,=LW5DWX/D,=LW5EE/D,=LW5EE/V,=LW5EOL/D,=LW6DTM/D, + =LW7DAF/D,=LW7DAF/W,=LW7DLY/D,=LW7DNS/E,=LW7EDH/D,=LW7EJV/D,=LW7WFM/W, + =LW8DMK/D,=LW8DMK/W,=LW8EAG/D,=LW8ECQ/D,=LW8EU/D,=LW8EXF/D,=LW9DCF/Y, + =LW9DX/D,=LW9EAG/D,=LW9EAG/V,=LW9EAG/W,=LW9EVA/D,=LW9EVA/E; Luxembourg: 14: 27: EU: 49.60: -6.20: -1.0: LX: LX; Lithuania: 15: 29: EU: 54.50: -25.50: -2.0: LY: @@ -780,10 +783,10 @@ Asiatic Russia: 17: 30: AS: 55.00: -83.00: -7.0: UA9: UG9M(17),UG9P(18)[31],UG9S(16),UG9T(16),UG9W(16),UH0,UH7,UH8,UH8T(18)[32], UH8V(18)[33],UH9,UH9I(18)[31],UH9M(17),UH9P(18)[31],UH9S(16),UH9T(16),UH9W(16), UI0,UI7,UI8,UI8T(18)[32],UI8V(18)[33],UI9,UI9I(18)[31],UI9M(17), - UI9P(18)[31],UI9S(16),UI9T(16),UI9W(16),=R150DMP,=R35NP,=R3F/9,=R70B(18)[31], - =R9HQ(17)[30]; + UI9P(18)[31],UI9S(16),UI9T(16),UI9W(16),=R150DMP,=R150RP,=R35NP,=R3F/9, + =R70B(18)[31],=R9HQ(17)[30]; Uzbekistan: 17: 30: AS: 41.20: -69.30: -5.0: UK: - UJ,UK,UL,UM,=VERSION; + UJ,UK,UL,UM; Kazakhstan: 17: 30: AS: 43.30: -76.90: -5.0: UN: UN,UO,UP,UQ; Ukraine: 16: 29: EU: 50.40: -30.50: -2.0: UR: @@ -811,8 +814,8 @@ Canada: 05: 09: NA: 45.00: 80.00: 4.0: VE: XM,XN1(5)[9],XN2(2)[9],XO0(2)[4],XO1(1)[2],XO2(5)[9],=CY2ZT/2(5), =K3FMQ/VE2(2),=KD3RF/VE2(2),=KD3TB/VE2(2),=VA2BY(2),=VA2CT(2),=VA2DO(2), =VA2DXE(2),=VA2KCE(2),=VA2RHJ(2),=VA2UA(2),=VA2VFT(2),=VA2ZM(2), - =VA3NA/2(2),=VB2C(2),=VB2R(2),=VB2V(2),=VC2C(2),=VE2/K3FMQ(2),=VE2AE(2), - =VE2AG(2),=VE2AOF(2),=VE2AQS(2),=VE2AS(2),=VE2BQB(2),=VE2CSI(2), + =VA3NA/2(2),=VB2C(2),=VB2R(2),=VB2V(2),=VC2A(2),=VC2C(2),=VE2/K3FMQ(2), + =VE2AE(2),=VE2AG(2),=VE2AOF(2),=VE2AQS(2),=VE2AS(2),=VE2BQB(2),=VE2CSI(2), =VE2CVI(2),=VE2DMG(2),=VE2DS(2),=VE2DWU(2),=VE2DXY(2),=VE2DYW(2), =VE2DYX(2),=VE2EAK(2),=VE2EDL(2),=VE2EDX(2),=VE2ELL(2),=VE2ENB(2), =VE2END(2),=VE2ENR(2),=VE2ERU(2),=VE2FCV(2),=VE2GSA(2),=VE2GSO(2), @@ -820,7 +823,7 @@ Canada: 05: 09: NA: 45.00: 80.00: 4.0: VE: =VE2PR(2),=VE2QRZ(2),=VE2RB(2),=VE2TVU(2),=VE2UA(2),=VE2VH(2),=VE2WDX(2), =VE2WT(2),=VE2XAA/2(2),=VE2XY(2),=VE2YM(2),=VE2Z(2),=VE2ZC(5),=VE2ZM(5), =VE2ZV(5),=VE3EY/2(2),=VE3NE/2(2),=VE3RHJ/2(2),=VE8AJ(2),=VE8PW(2), - =VE8RCS(2),=VER20090303,=VY0AA(4)[3],=VY0PW(4)[3],=VY2MGY/3(4)[4]; + =VE8RCS(2),=VER20090515,=VY0AA(4)[3],=VY0PW(4)[3],=VY2MGY/3(4)[4]; Australia: 30: 59: OC: -22.00: -135.00: -10.0: VK: AX,VH,VI,VJ,VK,VL,VM,VN,VZ; Heard I.: 39: 68: AF: -53.00: -73.40: -5.0: VK0H: @@ -832,7 +835,7 @@ Cocos-Keeling: 29: 54: OC: -12.20: -96.80: -6.5: VK9C: VL9Y,VM9C,VM9Y,VN9C,VN9Y,VZ9C,VZ9Y,=VK9AA; Lord Howe I.: 30: 60: OC: -31.60: -159.10: -10.5: VK9L: AX9L,VH9L,VI9L,VJ9L,VK9AL,VK9CL,VK9FL,VK9GL,VK9KL,VK9L,VL9L,VM9L,VN9L, - VZ9L; + VZ9L,=VK3TKB/9,=VK3TKB/VK9; Mellish Reef: 30: 56: OC: -17.60: -155.80: -10.0: VK9M: AX9M,VH9M,VI9M,VJ9M,VK9FM,VK9KM,VK9M,VL9M,VM9M,VN9M,VZ9M,=VK9GMW; Norfolk I.: 32: 60: OC: -29.00: -168.00: -11.5: VK9N: @@ -840,7 +843,7 @@ Norfolk I.: 32: 60: OC: -29.00: -168.00: -11.5: VK9N: Willis I.: 30: 55: OC: -16.20: -150.00: -10.0: VK9W: AX9W,VH9W,VI9W,VJ9W,VK9FW,VK9KW,VK9W,VL9W,VM9W,VN9W,VZ9W,=VK9DWX; Christmas I.: 29: 54: OC: -10.50: -105.70: -7.0: VK9X: - AX9X,VH9X,VI9X,VJ9X,VK9FX,VK9KX,VK9X,VL9X,VM9X,VN9X,VZ9X,=JA1XGI/VK9; + AX9X,VH9X,VI9X,VJ9X,VK9FX,VK9KX,VK9X,VL9X,VM9X,VN9X,VZ9X; Anguilla: 08: 11: NA: 18.30: 63.00: 4.0: VP2E: VP2E; Montserrat: 08: 11: NA: 16.80: 62.20: 4.0: VP2M: @@ -858,12 +861,12 @@ Falkland Is.: 13: 16: SA: -51.70: 57.90: 4.0: VP8: South Georgia: 13: 73: SA: -54.30: 36.80: 2.0: VP8/g: =VP8DIF,=VP8SGK; South Shetland: 13: 73: SA: -62.00: 58.30: 4.0: VP8/h: - CE9,=DT8A,=ED3RKL,=HC0/FT5YJ,=HF0APAS,=HF0POL,=HL8KSJ,=LU1ZC,=LZ0A, - =OA0/FT5YJ,=R1ANF,=VP8/LZ1UQ,=VP8DJK; + CE9,=DT8A,=ED3RKL,=HF0APAS,=HF0POL,=HL8KSJ,=LU1ZC,=LZ0A,=R1ANF,=VP8/LZ1UQ, + =VP8DJK; South Orkney: 13: 73: SA: -60.00: 45.50: 3.0: VP8/o: =AY1ZA,=LU1ZA; South Sandwich: 13: 73: SA: -57.00: 26.70: 2.0: VP8/s: - =VP8SSI,=VP8THU; + =VP8THU; Bermuda: 05: 11: NA: 32.30: 64.70: 4.0: VP9: VP9; Chagos Is.: 39: 41: AF: -7.30: -72.40: -6.0: VQ9: diff --git a/data/prefix_data.pl b/data/prefix_data.pl index 148c4cca..738eb5f9 100644 --- a/data/prefix_data.pl +++ b/data/prefix_data.pl @@ -295,6 +295,7 @@ '=4U9ITU' => '262', '=8J1RF' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=8J1RL' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', + '=9H1VC/KHS' => '286', '=9M4SEA' => '291,653', '=9M4SMO' => '291,653', '=AA6DY' => '209', @@ -342,6 +343,7 @@ '=FO/DL9AWI' => '315', '=FR5ZU/T' => '53', '=GB0AC' => '64,379', + '=GB0AOA' => '61', '=GB0ATC' => '64,379', '=GB0BNC' => '64,379', '=GB0BTC' => '62', @@ -364,6 +366,7 @@ '=GB0GIW' => '66', '=GB0GKR' => '64,379', '=GB0GLV' => '66', + '=GB0GMD' => '66', '=GB0GNE' => '64,379', '=GB0GPF' => '62', '=GB0GUC' => '65', @@ -423,11 +426,13 @@ '=GB0WOA' => '62', '=GB0WRC' => '66', '=GB100BD' => '66', + '=GB100BP' => '66', '=GB100FI' => '66', '=GB100LP' => '66', '=GB100MAS' => '64,379', '=GB100MER' => '61', '=GB100TT' => '61', + '=GB10SP' => '64,379', '=GB125BRC' => '64,379', '=GB125SR' => '61', '=GB150NRL' => '64,379', @@ -447,6 +452,7 @@ '=GB200A' => '66', '=GB200HNT' => '66', '=GB250RB' => '64,379', + '=GB2ADU' => '66', '=GB2AGG' => '64,379', '=GB2ANG' => '66', '=GB2AST' => '64,379', @@ -616,6 +622,7 @@ '=GB5FHC' => '64,379', '=GB5FI' => '66', '=GB5JS' => '64,379', + '=GB5LB' => '61', '=GB5MOB' => '61', '=GB5OL' => '64,379', '=GB5ONG' => '66', @@ -625,6 +632,7 @@ '=GB5SPD' => '62', '=GB5TI' => '64,379', '=GB60BBC' => '64,379', + '=GB60BTF' => '66', '=GB60CRB' => '64,379', '=GB60NTS' => '64,379', '=GB60VLY' => '66', @@ -690,7 +698,6 @@ '=GM8LNH' => '379', '=GM8MMA' => '379', '=GM8YEC' => '379', - '=HC0/FT5YJ' => '338', '=HF0APAS' => '338', '=HF0POL' => '338', '=HK0TU' => '327', @@ -706,7 +713,6 @@ '=IQ0HO' => '84', '=IQ0QP' => '84', '=IQ0SS' => '84', - '=JA1XGI/VK9' => '331', '=JD1BME' => '328', '=JD1BMM' => '328', '=JD1BND' => '328', @@ -894,7 +900,6 @@ '=LO7E/D' => '117,425,426', '=LU/DH4PB/R' => '117,425,426', '=LU/DH4PB/S' => '117,425,426', - '=LU/FT5YJ' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=LU1AEE/D' => '117,425,426', '=LU1AF/D' => '117,425,426', '=LU1CDP/D' => '117,425,426', @@ -921,6 +926,7 @@ '=LU1XAW/X' => '117,425,426', '=LU1XWC/E' => '117,425,426', '=LU1XY/X' => '117,425,426', + '=LU1XZ/H' => '117,425,426', '=LU1YU/D' => '117,425,426', '=LU1YY/Y' => '117,425,426', '=LU1ZA' => '336', @@ -1045,6 +1051,7 @@ '=LU7EO/D' => '117,425,426', '=LU7EPC/D' => '117,425,426', '=LU7EPC/W' => '117,425,426', + '=LU7FJ/F' => '117,425,426', '=LU7HW/D' => '117,425,426', '=LU7VCH/D' => '117,425,426', '=LU7WFM/W' => '117,425,426', @@ -1265,7 +1272,6 @@ '=NW8U' => '209', '=NX9T' => '209', '=NY4N' => '209', - '=OA0/FT5YJ' => '338', '=OE3AGA/AAW' => '122', '=OE3AIS/AAW' => '122', '=OE3HM/AAW' => '122', @@ -1278,6 +1284,7 @@ '=OR3AX' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=OR4AX' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=R150DMP' => '174,525,530', + '=R150RP' => '174,525,530', '=R1ANF' => '338', '=R1ANR' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=R35NP' => '174,525,530', @@ -1288,6 +1295,7 @@ '=R7C/3' => '171,518,519,520,521', '=R7C/4' => '171,518,519,520,521', '=R9HQ' => '174,525,530', + '=SM/OH2FFP' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=SV0XAZ' => '150', '=SV0XBQ' => '150', '=SV2ASP/A' => '151', @@ -1347,10 +1355,8 @@ '=TX0C' => '318', '=TX0DX' => '318', '=TX1A' => '45,318', - '=TX3SAM' => '45,318', '=TX4B' => '46', '=TX5C' => '48', - '=TX5CW' => '45,318', '=TX7LX' => '44', '=TX9' => '318', '=UR2XO/WAP' => '175', @@ -1372,6 +1378,7 @@ '=VB2C' => '189,545,546,547,548,549,550,551,552,553', '=VB2R' => '189,545,546,547,548,549,550,551,552,553', '=VB2V' => '189,545,546,547,548,549,550,551,552,553', + '=VC2A' => '189,545,546,547,548,549,550,551,552,553', '=VC2C' => '189,545,546,547,548,549,550,551,552,553', '=VE2/K3FMQ' => '189,545,546,547,548,549,550,551,552,553', '=VE2AE' => '189,545,546,547,548,549,550,551,552,553', @@ -1427,10 +1434,12 @@ '=VE8AJ' => '189,545,546,547,548,549,550,551,552,553', '=VE8PW' => '189,545,546,547,548,549,550,551,552,553', '=VE8RCS' => '189,545,546,547,548,549,550,551,552,553', - '=VER20090303' => '189,545,546,547,548,549,550,551,552,553', - '=VERSION' => '181', + '=VER20090515' => '189,545,546,547,548,549,550,551,552,553', + '=VERSION' => '116,422,423,424', '=VK0HI' => '192', '=VK0IR' => '192', + '=VK3TKB/9' => '330', + '=VK3TKB/VK9' => '330', '=VK9AA' => '332', '=VK9DWX' => '334', '=VK9GMW' => '333', @@ -1441,11 +1450,9 @@ '=VP8DJK' => '338', '=VP8DKF' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=VP8DLJ' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', - '=VP8DLM' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=VP8PJ' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=VP8ROT' => '97,394,395,397,398,399,400,401,402,403,404,405,406,407,409,411', '=VP8SGK' => '335', - '=VP8SSI' => '337', '=VP8THU' => '337', '=VU3VPX' => '203', '=VU3VPY' => '203', @@ -2225,6 +2232,10 @@ 'FT4X' => '56', 'FT4Y' => '399', 'FT4Z' => '57', + 'FT5E' => '52', + 'FT5G' => '51', + 'FT5J' => '52', + 'FT5T' => '53', 'FT5W' => '55', 'FT5X' => '56', 'FT5Y' => '399', diff --git a/perl/Version.pm b/perl/Version.pm index 7c900dd3..55e38233 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -9,8 +9,8 @@ package main; use vars qw($version $subversion $build); -$version = '1.55'; +$version = ''; $subversion = '0'; -$build = '38'; +$build = '1'; 1; diff --git a/perl/cluster.pl b/perl/cluster.pl index 7b889fc4..bec09782 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -187,7 +187,7 @@ sub new_channel # (fairly) politely disconnect people that are connected to too many other places at once my $r = Route::get($call); - if ($conn->{sort} =~ /^I/ && $r && $user) { + if ($conn->{sort} && $conn->{sort} =~ /^I/ && $r && $user) { my @n = $r->parents; my $m = $r->isa('Route::Node') ? $maxconnect_node : $maxconnect_user; my $c = $user->maxconnect; -- 2.34.1