From 01c7ebc6ec371bc6e075a599dad1d5f3fd1b776a Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Mon, 17 Nov 2008 00:09:29 +0000 Subject: [PATCH] fix sh/425 to point to new server unfortunately this is http/1.1 only which causes problems with detecting the EOF ('cos there ain't one). So it is slower than it was. Add CTY-1814 prefixes 'Kingman Reef' --- Changes | 3 ++ cmd/show/425.pl | 14 ++++--- data/cty.dat | 89 +++++++++++++++++++++++---------------------- data/prefix_data.pl | 14 +++++-- perl/Version.pm | 2 +- 5 files changed, 69 insertions(+), 53 deletions(-) diff --git a/Changes b/Changes index 8d460ba1..1fa4c86b 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +17Nov08======================================================================= +1. Fix sh/425 to work with new server +2. add CTY-1814 prefixes 21Oct08======================================================================= 1. Add CTY-1811 prefixes 04Oct08======================================================================= diff --git a/cmd/show/425.pl b/cmd/show/425.pl index 353f2b9d..4328e3ac 100644 --- a/cmd/show/425.pl +++ b/cmd/show/425.pl @@ -14,9 +14,9 @@ my @out; return (1, $self->msg('e24')) unless $Internet::allow; return (1, "SHOW/425 \nSHOW/425 CAL\nSHOW/425 BULL \n e.g. SH/425 IQ5BL, SH/425 CAL, SH/425 BUL 779\n") unless @list; -my $target = "www.ari.it"; +my $target = "www.ariscandicci.it"; my $port = 80; -my $url = "http://www.ari.it"; +my $url = "http://www.ariscandicci.it"; use Net::Telnet; my $t = new Net::Telnet; @@ -38,19 +38,23 @@ if (!$t || $@) { else { $op="op=search&query=".$list[0]; } - my $s = "GET $url/hf/dx-news/spider.php?$op HTTP/1.0\n" - ."User-Agent:DxSpider;$main::version;$main::build;$^O;$main::mycall;$call;$list[0]\n\n"; + my $s = "GET /425dxn/spider.php?$op HTTP/1.1\n" + ."User-Agent:DxSpider;$main::version;$main::build;$^O;$main::mycall;$call;$list[0]\nHost: $target\n\n"; dbg($s) if isdbg('425'); $t->print($s); Log('call', "$call: show/425 \U$op"); my $state = "blank"; my $count = 1; - while (my $result = eval { $t->getline(Timeout => 30) } || $@) { + my @timeout = qw(Timeout 30); + while (my $result = eval { $t->getline(@timeout) } || $@) { dbg($result) if isdbg('425') && $result; + dbg($@) if isdbg('425') && $@; ++$count; if ($count > 9) { + last if $@; push @out, $result; } + @timeout = qw(Timeout 2); } $t->close; push @out, $self->msg('e3', 'Search(ARI.org)', uc $op) unless @out; diff --git a/data/cty.dat b/data/cty.dat index 1f50c0ad..bed61f10 100644 --- a/data/cty.dat +++ b/data/cty.dat @@ -189,8 +189,8 @@ Antarctica: 13: 74: SA: -65.00: 64.00: -4.0: CE9: VM0(39)[69],VN0(39)[69],VZ0(39)[69],ZL0(30)[71],ZL5(30)[71],ZM5(30)[71], ZS7(38)[67],=8J1RF(39)[67],=8J1RL(39)[67],=DP0GVN(38)[67], =KC4/K2ARB(30)[71],=KC4AAA(39),=KC4AAC[73],=KC4USB(12)[72], - =KC4USV(30)[71],=LU4ZS[73],=OP0LE(38)[67],=VP8DJB[73],=VP8DKF(30)[71], - =VP8DLJ[73],=VP8PJ[73],=VP8ROT[73]; + =KC4USV(30)[71],=LU4ZS[73],=OP0LE(38)[67],=OP0OL(38)[67],=VP8DJB[73], + =VP8DKF(30)[71],=VP8DLJ[73],=VP8PJ[73],=VP8ROT[73]; Cuba: 08: 11: NA: 23.10: 82.40: 5.0: CM: CL,CM,CO,T4; Morocco: 33: 37: AF: 33.60: 7.50: 0.0: CN: @@ -224,7 +224,7 @@ Eritrea: 37: 48: AF: 15.30: -38.90: -3.0: E3: Palestine: 20: 39: AS: 31.40: -35.10: -2.0: E4: E4; North Cook Is.: 32: 62: OC: -10.40: 161.00: 10.0: E5/n: - =E51WL; + =E51QQQ,=E51WL; South Cook Is.: 32: 62: OC: -21.20: 159.80: 10.0: E5/s: E5; Bosnia-Herzegovina: 15: 28: EU: 43.50: -18.30: -1.0: E7: @@ -262,8 +262,8 @@ Turkmenistan: 17: 30: AS: 38.00: -58.40: -5.0: EZ: France: 14: 27: EU: 48.80: -2.30: -1.0: F: F,HW,HX,HY,TH,TM,TP,TQ,TV,TW; Guadeloupe: 08: 11: NA: 16.00: 61.70: 4.0: FG: - FG,=TO1T,=TO1USB,=TO2ANT,=TO2FG,=TO4T,=TO5BG,=TO5C,=TO5G,=TO5GI,=TO5S, - =TO6T,=TO7T,=TO8RR,=TO8S,=TO9T; + FG,=TO1T,=TO1USB,=TO2ANT,=TO2FG,=TO2HI,=TO4T,=TO5BG,=TO5C,=TO5G,=TO5GI, + =TO5S,=TO6T,=TO7T,=TO8RR,=TO8S,=TO9T; Mayotte: 39: 53: AF: -13.00: -45.30: -3.0: FH: FH,=TX7LX; St. Barthelemy: 08: 11: NA: 17.90: 62.90: 4.0: FJ: @@ -287,7 +287,7 @@ Marquesas Is.: 31: 63: OC: -9.00: 139.50: 10.0: FO/m: St. Pierre & Miquelon: 05: 09: NA: 46.70: 56.00: 3.0: FP: FP; Reunion: 39: 53: AF: -21.10: -55.60: -4.0: FR: - FR; + FR,=TO3R; Glorioso: 39: 53: AF: -11.50: -47.30: -4.0: FR/g: =TO4G; Juan de Nova & Europa: 39: 53: AF: -19.60: -41.60: -3.0: FR/j: @@ -324,7 +324,7 @@ Scotland: 14: 27: EU: 55.80: 4.30: 0.0: GM: =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,=GB1FVT,=GB1OL,=GB2AGG,=GB2AST,=GB2AYR, + =GB125BRC,=GB150NRL,=GB1EPC,=GB1FS,=GB1FVT,=GB1OL,=GB2AGG,=GB2AST,=GB2AYR, =GB2CHG,=GB2DHS,=GB2DTM,=GB2FBM,=GB2FIO,=GB2FSM,=GB2GEO,=GB2GNL,=GB2GTM, =GB2HI,=GB2HRH,=GB2HST,=GB2HSW,=GB2IAS,=GB2IGB,=GB2IGS,=GB2IMM,=GB2IOC, =GB2IOG,=GB2IOT,=GB2JUNO,=GB2KDS,=GB2KHL,=GB2LAY,=GB2LBN,=GB2LCL,=GB2LCP, @@ -334,10 +334,10 @@ Scotland: 14: 27: EU: 55.80: 4.30: 0.0: GM: =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,=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; + =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, @@ -474,7 +474,7 @@ United States: 05: 08: NA: 43.00: 87.90: 5.0: K: =N4SL(3)[6],=N4TN(4),=N4TZ(4),=N4UC(4),=N4VN(4),=N4VV(4),=N4XM(4), =N4ZI(4),=N4ZZ(4),=N5RA(3)[6],=N5VI(5)[8],=N6AR(5)[8],=N6CY(5)[8], =N6DT(4)[7],=N6RFM(5)[8],=N6ZO(5)[8],=N7DF(4)[7],=N7IV(4)[7],=N7KA(4)[7], - =N7NG(4)[7],=N7VR(4)[6],=N8GZ(3)[6],=N8II(5),=N8NA(5),=N8PR(5),=N8RA(5), + =N7NG(4)[6],=N7VR(4)[6],=N8GZ(3)[6],=N8II(5),=N8NA(5),=N8PR(5),=N8RA(5), =N8RR(5),=N8WXQ(5),=N9ADG(3)[6],=N9JRZ(5),=NA4C(4),=NA4K(4),=NA4M(4)[7], =NB7V(4)[6],=ND2T(3)[6],=NE4M(4),=NE8J(5),=NH0Y(3)[6],=NH6CN(4)[8], =NI9K(5),=NJ2P(3)[6],=NJ4I(4),=NL7FK(4)[8],=NN7A(4)[7],=NO9E(5), @@ -512,7 +512,7 @@ Mariana Is.: 27: 64: OC: 15.20: -145.80: -10.0: KH0: Baker & Howland Is.: 31: 61: OC: 0.50: 176.00: 11.0: KH1: AH1,KH1,NH1,WH1; Guam: 27: 64: OC: 13.50: -144.80: -10.0: KH2: - AH2,KH2,NH2,WH2,=K6Y,=KG6ASO,=KG6DX; + AH2,KH2,NH2,WH2,=KG6ASO,=KG6DX; Johnston I.: 31: 61: OC: 16.80: 169.50: 10.0: KH3: AH3,KH3,NH3,WH3,=KJ6BZ; Midway I.: 31: 61: OC: 28.20: 177.40: 11.0: KH4: @@ -520,7 +520,7 @@ Midway I.: 31: 61: OC: 28.20: 177.40: 11.0: KH4: Palmyra & Jarvis Is.: 31: 61: OC: 5.90: 162.10: 10.0: KH5: AH5,KH5,NH5,WH5; Kingman Reef: 31: 61: OC: 7.50: 162.80: 10.0: KH5K: - AH5K,KH5K,NH5K,WH5K; + AH5K,KH5K,NH5K,WH5K,=VERSION; Hawaii: 31: 61: OC: 21.30: 157.90: 10.0: KH6: AH6,AH7,KH6,KH7,N6KB,NH6,NH7,WH6,WH7; Kure I.: 31: 61: OC: 28.40: 178.40: 11.0: KH7K: @@ -532,7 +532,7 @@ Swains Island: 32: 62: OC: -11.05: 171.25: 11.0: KH8/s: 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: - AL,KL,NL,WL,=KW1W; + AL,KL,NL,WL,=AH0AH,=KW1W; Navassa I.: 08: 11: NA: 18.40: 75.00: 5.0: KP1: KP1,NP1,WP1; Virgin Is.: 08: 11: NA: 18.30: 64.90: 5.0: KP2: @@ -554,32 +554,33 @@ Argentina: 13: 14: SA: -34.60: 58.40: 3.0: LU: =LU2DT/LH,=LU2DVI/H,=LU2EE/D,=LU2EE/E,=LU2EJB/X,=LU2VC/D,=LU2VDV/D, =LU2WV/O,=LU2XX/X,=LU3CQ/D,=LU3DC/D,=LU3DJI/D,=LU3DJI/W,=LU3DOC/D, =LU3DR/D,=LU3DR/V,=LU3DXG/D,=LU3DZO/D,=LU3EOU/D,=LU3ES/D,=LU3ES/V, - =LU3ES/W,=LU3HKA/D,=LU4AAO/D,=LU4DA/D,=LU4DBP/D,=LU4DBT/D,=LU4DQ/D, - =LU4DRC/Y,=LU4DRH/D,=LU4DRH/E,=LU4EHP/V,=LU4EJ/D,=LU4ELE/D,=LU4ESP/D, - =LU4ETN/D,=LU4ETN/W,=LU4EV/Q,=LU4UZW/D,=LU4WG/W,=LU5BE/D,=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,=LU5VAT/D,=LU5XC/X,=LU6DBL/D,=LU6DBL/W,=LU6DKT/D, - =LU6DRD/D,=LU6DRD/E,=LU6DRN/D,=LU6DRR/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,=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,=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,=LU9DKX/X,=LU9DPD/XA, - =LU9EI/F,=LU9EJS/E,=LU9ESD/D,=LU9ESD/F,=LU9ESD/V,=LU9ESD/W,=LU9ESD/Y, - =LU9EV/LH,=LU9JMG/J,=LW1DAL/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,=LW4EM/E,=LW4EM/LH,=LW5DR/LH,=LW5DWX/D,=LW5EE/D,=LW5EE/V, - =LW5EOL/D,=LW6DTM/D,=LW7DAF/D,=LW7DAF/W,=LW7DLY/D,=LW7DNS/E,=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; + =LU3ES/W,=LU3HKA/D,=LU3HKA/H,=LU4AAO/D,=LU4DA/D,=LU4DBP/D,=LU4DBT/D, + =LU4DQ/D,=LU4DRC/Y,=LU4DRH/D,=LU4DRH/E,=LU4EHP/V,=LU4EJ/D,=LU4ELE/D, + =LU4ESP/D,=LU4ETN/D,=LU4ETN/W,=LU4EV/Q,=LU4UZW/D,=LU4WG/W,=LU5BE/D, + =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,=LU5VAT/D,=LU5XC/X,=LU6DBL/D,=LU6DBL/W, + =LU6DKT/D,=LU6DRD/D,=LU6DRD/E,=LU6DRN/D,=LU6DRR/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,=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,=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,=LU9DKX/X, + =LU9DPD/XA,=LU9EI/F,=LU9EJS/E,=LU9ESD/D,=LU9ESD/F,=LU9ESD/V,=LU9ESD/W, + =LU9ESD/Y,=LU9EV/LH,=LU9JMG/J,=LW1DAL/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,=LW4EM/E,=LW4EM/LH,=LW5DR/LH,=LW5DWX/D,=LW5EE/D, + =LW5EE/V,=LW5EOL/D,=LW6DTM/D,=LW7DAF/D,=LW7DAF/W,=LW7DLY/D,=LW7DNS/E, + =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: @@ -773,7 +774,7 @@ 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),=R150C(19)[33],=R35NP,=R3F/9, + UI9P(18)[31],UI9S(16),UI9T(16),UI9W(16),=R35NP,=R3F/9,=R70B(18)[31], =R9HQ(17)[30]; Uzbekistan: 17: 30: AS: 41.20: -69.30: -5.0: UK: UJ,UK,UL,UM; @@ -812,7 +813,7 @@ Canada: 05: 09: NA: 45.00: 80.00: 4.0: VE: =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), - =VER20081021,=VY0AA(4)[3],=VY0PW(4)[3],=VY2MGY/3(4)[4]; + =VER20081114,=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: @@ -850,7 +851,7 @@ 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: - =DT8A,=ED3RKL,=HF0POL,=HL8KSJ,=LU1ZC,=LZ0A,=R1ANF,=VP8/LZ1UQ,=VP8DJK; + CE9,=DT8A,=ED3RKL,=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: diff --git a/data/prefix_data.pl b/data/prefix_data.pl index c7ffaf00..8a970e11 100644 --- a/data/prefix_data.pl +++ b/data/prefix_data.pl @@ -308,6 +308,7 @@ '=AF3X' => '220', '=AG3V' => '220', '=AG4W' => '220', + '=AH0AH' => '394', '=AJ4F' => '220', '=AK4Z' => '220', '=AL4T' => '220', @@ -321,6 +322,7 @@ '=DJ4SN/LU/X' => '119,398,399', '=DP0GVN' => '99,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386', '=DT8A' => '208', + '=E51QQQ' => '249', '=E51WL' => '249', '=ED3RKL' => '208', '=FO/DJ7RJ' => '328', @@ -420,6 +422,7 @@ '=GB1AFP' => '62', '=GB1CCC' => '66', '=GB1EPC' => '64,353', + '=GB1FS' => '64,353', '=GB1FVT' => '64,353', '=GB1LSG' => '66', '=GB1OL' => '64,353', @@ -598,6 +601,7 @@ '=GB5CO' => '64,353', '=GB5FHC' => '64,353', '=GB5FI' => '66', + '=GB5JS' => '64,353', '=GB5MOB' => '61', '=GB5OL' => '64,353', '=GB5RO' => '64,353', @@ -762,7 +766,6 @@ '=K6MJ' => '220', '=K6VWE' => '220', '=K6XT' => '220', - '=K6Y' => '102', '=K7ABV' => '220', '=K7BG' => '220', '=K7CMZ' => '220', @@ -921,6 +924,7 @@ '=LU3ES/V' => '119,398,399', '=LU3ES/W' => '119,398,399', '=LU3HKA/D' => '119,398,399', + '=LU3HKA/H' => '119,398,399', '=LU4AAO/D' => '119,398,399', '=LU4DA/D' => '119,398,399', '=LU4DBP/D' => '119,398,399', @@ -1214,10 +1218,11 @@ '=NX9T' => '220', '=NY4N' => '220', '=OP0LE' => '99,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386', - '=R150C' => '176,427,432', + '=OP0OL' => '99,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386', '=R1ANF' => '208', '=R35NP' => '176,427,432', '=R3F/9' => '176,427,432', + '=R70B' => '176,427,432', '=R7C' => '173,420,421,422,423', '=R7C/1' => '173,420,421,422,423', '=R7C/3' => '173,420,421,422,423', @@ -1236,7 +1241,9 @@ '=TO2ANT' => '43', '=TO2DX' => '46', '=TO2FG' => '43', + '=TO2HI' => '43', '=TO3M' => '46', + '=TO3R' => '50,51,52,53', '=TO3T' => '46', '=TO3W' => '46', '=TO4A' => '46', @@ -1354,7 +1361,8 @@ '=VE8AJ' => '191', '=VE8PW' => '191', '=VE8RCS' => '191', - '=VER20081021' => '191', + '=VER20081114' => '191', + '=VERSION' => '106', '=VK0HI' => '199', '=VK0IR' => '199', '=VK9AA' => '195', diff --git a/perl/Version.pm b/perl/Version.pm index 64a276cc..8a4fab3e 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -11,6 +11,6 @@ use vars qw($version $subversion $build); $version = '1.55'; $subversion = '0'; -$build = '32'; +$build = '33'; 1; -- 2.34.1