X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2Fcreate_prefix.pl;h=daf4a09e409171cb1433b068aa9aa9a8c1d218c6;hb=c94ff1bf2cbe16ed59c5b273c7f6730fd7314cab;hp=a2b3c374210cccde478f048baa421e5ea2f24270;hpb=70dbd742db4241e97496db69e89160ec573a5949;p=spider.git

diff --git a/perl/create_prefix.pl b/perl/create_prefix.pl
index a2b3c374..daf4a09e 100755
--- a/perl/create_prefix.pl
+++ b/perl/create_prefix.pl
@@ -1,9 +1,9 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # a program to create a prefix file from a wpxloc.raw file
 #
 # Copyright (c) - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 require 5.004;
@@ -13,13 +13,18 @@ BEGIN {
 	# root of directory tree for this system
 	$root = "/spider"; 
 	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
-	
+
+	mkdir "$root/local_data", 02777 unless -d "$root/local_data";
+
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
 }
 
-use DXVars;
+use SysVar;
+
 use Data::Dumper;
+use DXUtil;
+
 use strict;
 
 my %loc = ();						# the location unique hash
@@ -28,9 +33,17 @@ my %locn = ();						# the inverse of the above
 my %pre = ();						# the prefix hash
 my %pren = ();						# the inverse
 
+if (@ARGV && $ARVG[0] =~ /^--system$/) {
+	$prefix = $main::data;
+	shift;
+} else {
+	$prefix = $main:local_data;
+}
+
 # open the input file
 my $ifn = $ARGV[0] if $ARGV[0];
-$ifn = "$main::data/wpxloc.raw" if !$ifn;
+
+$ifn = "$prefix/wpxloc.raw" if !$ifn;
 open (IN, $ifn) or die "can't open $ifn ($!)";
 
 # first pass, find all the 'master' location records
@@ -90,38 +103,11 @@ close(IN);
 
 #print Data::Dumper->Dump([\%pre, \%locn], [qw(pre locn)]);
 
-# now open the rsgb.cty file and process that again the prefix file we have
-open(IN, "$main::data/rsgb.cty") or die "Can't open $main::data/rsgb.cty ($!)";
-$line = 0;
-while (<IN>) {
-	$line++;
-	next if /^\s*#/;
-	next if /^\s*$/;
-	my $l = $_;
-	chomp;
-	my @f = split /:\s+|;/;
-	my $p = uc $f[4];
-	my $ref = $pre{$p};
-	if ($ref) {
-		# split up the alias string
-		my @alias = split /=/, $f[5];
-		my $a;
-		foreach $a (@alias) {
-			next if $a eq $p;	# ignore if we have it already
-			my $nref = $pre{$a};
-			$pre{$a} = $ref if !$nref; # copy the original ref if new 
-		}
-	} else {
-		print "line $line: unknown prefix '$p' on $l in rsgb.cty\n";
-	}
-}
-close IN;
-
 # now open the cty.dat file if it is there
 my @f;
 my @a;
 $line = 0;
-if (open(IN, "$main::data/cty.dat")) {
+if (open(IN, "$prefix/cty.dat")) {
 	my $state = 0;
 	while (<IN>) {
 		$line++;
@@ -140,7 +126,7 @@ if (open(IN, "$main::data/cty.dat")) {
 				$state = 0;
 				s/[,;]$//;
 				push @a, split /\s*,/;
-				next if $f[7] =~ /^\*/;   # ignore callsigns starting '*'
+				$f[7] =~ s/^\*\s*//;   # remove any preceeding '*' before a callsign
 				ct($_, uc $f[7], @a) if @a;
 			} else {
 				s/,$//;
@@ -152,7 +138,7 @@ if (open(IN, "$main::data/cty.dat")) {
 close IN;
 
 
-open(OUT, ">$main::data/prefix_data.pl") or die "Can't open $main::data/prefix_data.pl ($!)";
+open(OUT, ">$prefix/prefix_data.pl") or die "Can't open $prefix/prefix_data.pl ($!)";
 
 print OUT "\%pre = (\n";
 foreach my $k (sort keys %pre) {
@@ -218,6 +204,7 @@ sub ct
 			my ($itu) = $a =~ /(\(\d+\))/; $a =~ s/(\(\d+\))//g;
 			my ($cq) = $a =~ /(\[\d+\])/; $a =~ s/(\[\d+\])//g;
 			my ($lat, $long) = $a =~ m{(<[-+\d.]+/[-+\d.]+>)}; $a =~ s{(<[-+\d.]+/[-+\d.]+>)}{}g;
+			my ($cont) = $a =~ /(\{[A-Z]{2}\})/; $a =~ s/(\{[A-Z]{2}\})//g;
 
 			unless ($a) {
 				print "line $line: blank prefix on $l in cty.dat\n";