mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2025-03-23 18:51:52 +00:00
[svn r5789] Actually, formatting will be the death of me, not $marking
This commit is contained in:
parent
e3c4135c65
commit
057227d738
@ -3,7 +3,7 @@ use strict;
|
|||||||
use File::Path;
|
use File::Path;
|
||||||
use Getopt::Long;
|
use Getopt::Long;
|
||||||
|
|
||||||
# no_info col is redundant. FIXME
|
# no_info col is currently unused
|
||||||
|
|
||||||
((my $progname = $0) =~ s/^.*(\/|\\)//ig); # basename $0
|
((my $progname = $0) =~ s/^.*(\/|\\)//ig); # basename $0
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ if ($usage) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
unless ($ARGV[0]) {
|
unless ($ARGV[0]) {
|
||||||
print "Specify a CSV file name as the program's argument(e.g. CAVETAB2.CSV)\n";
|
print STDERR "Specify a CSV file name as the program's argument(e.g. CAVETAB2.CSV)\n";
|
||||||
usage();
|
usage();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ END
|
|||||||
<CSV>; # starting to read in csv file, eat header line
|
<CSV>; # starting to read in csv file, eat header line
|
||||||
|
|
||||||
# Read in pos file to @pos now rather than later so we don't repeat it n times
|
# Read in pos file to @pos now rather than later so we don't repeat it n times
|
||||||
open INPUT2, "< all.pos" or print "Could not find all.pos in the current directory\n" and die $!;
|
open INPUT2, "< all.pos" or print STDERR "Could not find all.pos in the current directory\n" and die $!;
|
||||||
my @pos = <INPUT2>;
|
my @pos = <INPUT2>;
|
||||||
close INPUT2;
|
close INPUT2;
|
||||||
|
|
||||||
@ -236,11 +236,17 @@ END
|
|||||||
print FILE " - $ents";
|
print FILE " - $ents";
|
||||||
}
|
}
|
||||||
if ($other_number) {
|
if ($other_number) {
|
||||||
print FILE "<br />$other_number";
|
if ($kat_num) {
|
||||||
|
print FILE "<br />";
|
||||||
|
}
|
||||||
|
print FILE " $other_number";
|
||||||
}
|
}
|
||||||
print FILE "</th><th id=\"name\">$name";
|
print FILE "</th><th id=\"name\">$name";
|
||||||
if ($unofficial_name) {
|
if ($unofficial_name) {
|
||||||
print FILE "<br />($unofficial_name)";
|
if ($name) {
|
||||||
|
print FILE "<br />";
|
||||||
|
}
|
||||||
|
print FILE " ($unofficial_name)";
|
||||||
}
|
}
|
||||||
print FILE "</th>";
|
print FILE "</th>";
|
||||||
if ($kat_status) {
|
if ($kat_status) {
|
||||||
@ -507,7 +513,7 @@ sub do_ent {
|
|||||||
print FILE "<b>N</b>$calc_northing ";
|
print FILE "<b>N</b>$calc_northing ";
|
||||||
print FILE "<b>E</b>$calc_easting ";
|
print FILE "<b>E</b>$calc_easting ";
|
||||||
} else
|
} else
|
||||||
{ print "Warning: Lookup point for $desc data not found: $punkt\n"; }
|
{ print STDERR "Warning: Lookup point for $desc data not found: $punkt\n"; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user