[svn r6777] Edited so as not to produce strange dangling hyphens for caves with multiple entrances and only a provisional number ("2004-19 a b" not " - a b 2004-19")

This commit is contained in:
dave 2005-05-11 18:46:18 +02:00
parent 6ee66dd2a6
commit b3f3eccbc5

@ -29,7 +29,7 @@ unless ($ARGV[0]) {
usage(); usage();
} }
# One day this may be proofed against this problem, but another command line parameter (location of expoweb) is enevitable, and unappealing # One day this may be proofed against this problem, but another command line parameter (location of expoweb) is inevitable, and unappealing
($_ = cwd()) =~ s/^.*\///ig; ($_ = cwd()) =~ s/^.*\///ig;
if ($_ ne "noinfo") { if ($_ ne "noinfo") {
print STDERR "This program expects to be run from a CWD of noinfo!\n\n"; print STDERR "This program expects to be run from a CWD of noinfo!\n\n";
@ -335,16 +335,11 @@ END
} }
print FILE "<table id=\"cavepage\">\n"; print FILE "<table id=\"cavepage\">\n";
print FILE "<tr><th id=\"kat_no\">$kat_num"; # if no $kat_num, no problem print FILE "<tr><th id=\"kat_no\">";
if ($ents) { if ($kat_num) {print FILE "$kat_num"} else {print FILE "$other_number"}
print FILE " - $ents"; if ($ents) { print FILE " - $ents" }
} if ($other_number && $kat_num) { print FILE "<br />$other_number" }
if ($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) {
if ($name) { if ($name) {