X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcreate_prefix.pl;h=60d7d2a1f462861d60868da871dacf37b6bdaaec;hb=4f1c00b0c181d994b13bb9b0ff9ea03ee0cf120c;hp=85919d5e5cf6bdb952734e737d1278206acc7257;hpb=6ceb5063f4f75171d4e4ab246ffbc22f604d0684;p=spider.git

diff --git a/perl/create_prefix.pl b/perl/create_prefix.pl
index 85919d5e..60d7d2a1 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,19 @@ 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,10 +34,22 @@ my %locn = ();						# the inverse of the above
 my %pre = ();						# the prefix hash
 my %pren = ();						# the inverse
 
-# open the input file
-my $ifn = $ARGV[0] if $ARGV[0];
-$ifn = "$main::data/wpxloc.raw" if !$ifn;
-open (IN, $ifn) or die "can't open $ifn ($!)";
+my $prefix;
+
+if (@ARGV && $ARGV[0] =~ /^--system$/) {
+	$prefix = $main::data;
+	shift;
+} else {
+	$prefix = $main::local_data;
+}
+
+my $ifn;
+
+$ifn = "$prefix/wpxloc.raw";
+unless (open (IN, $ifn)) {
+	$ifn = "$main::data/wpxloc.raw";
+	open(IN, $ifn) or die "can't open $ifn ($!)";
+}
 
 # first pass, find all the 'master' location records
 while (<IN>) {
@@ -91,10 +109,17 @@ close(IN);
 #print Data::Dumper->Dump([\%pre, \%locn], [qw(pre locn)]);
 
 # now open the cty.dat file if it is there
+my $r;
+$ifn = "$prefix/cty.dat";
+unless ($r = open (IN, $ifn)) {
+	$ifn = "$main::data/cty.dat";
+	$r = open(IN, $ifn);
+}
+
 my @f;
 my @a;
 $line = 0;
-if (open(IN, "$main::data/cty.dat")) {
+if ($r) {
 	my $state = 0;
 	while (<IN>) {
 		$line++;
@@ -125,7 +150,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) {