[svn r5958] Updated to accomodate "No Info" column disappearing

This commit is contained in:
sb476 2004-05-06 23:09:03 +02:00
parent 27f72659a3
commit 95f0cad7c7

View File

@ -3,8 +3,7 @@ use strict;
use File::Path; use File::Path;
use Getopt::Long; use Getopt::Long;
# no_info col is currently unused # header column never has any info...
# also, header never has any info...
((my $progname = $0) =~ s/^.*(\/|\\)//ig); # basename $0 ((my $progname = $0) =~ s/^.*(\/|\\)//ig); # basename $0
@ -25,7 +24,7 @@ unless ($ARGV[0]) {
usage(); usage();
} }
open (CSV, "< $ARGV[0]"); open (CSV, "< $ARGV[0]") or print STDERR "That filename could not be opened. Exiting.\n" and die $!;
# Start writing index file # Start writing index file
open INDXAL, ">..\/indxal.htm" or die $!; open INDXAL, ">..\/indxal.htm" or die $!;
@ -108,7 +107,7 @@ print "Information: Done\n";
# Returns nothing # Returns nothing
sub do_this_line { sub do_this_line {
# Split single line into all the fields # Split single line into all the fields
my ($kat_num, $kat_status, $ents, $other_number, $mult_ents, $file, $linkfile, $name, $unofficial_name, $comment, $area, $no_info, $explorers, $u_description, $equipment, $qmlist, $katstatus, $references, $u_centre_line, $u_drawn_survey, $survex_file, $length, $depth, $extent, $header, $footer, $notes, $ent_name, $tag_punkt, $other_punkt, $desc_other_punkt, $exact_punkt, $fix_type, $gpspresa, $gpspostsa, $northing, $easting, $altitude, $bearings, $map, $location, $approach, $ent_desc, $ent_photo, $marking) = &parse_csv($_[0]); my ($kat_num, $kat_status, $ents, $other_number, $mult_ents, $file, $linkfile, $name, $unofficial_name, $comment, $area, $explorers, $u_description, $equipment, $qmlist, $katstatus, $references, $u_centre_line, $u_drawn_survey, $survex_file, $length, $depth, $extent, $header, $footer, $notes, $ent_name, $tag_punkt, $other_punkt, $desc_other_punkt, $exact_punkt, $fix_type, $gpspresa, $gpspostsa, $northing, $easting, $altitude, $bearings, $map, $location, $approach, $ent_desc, $ent_photo, $marking) = &parse_csv($_[0]);
# If we have been called to process an entrance, we may have been given the cave's Kataster number or Other number # If we have been called to process an entrance, we may have been given the cave's Kataster number or Other number
if ($_[2] and ! $kat_num) { if ($_[2] and ! $kat_num) {
@ -541,7 +540,7 @@ sub multi_ents {
my $e = <CSV>; my $e = <CSV>;
chomp; chomp;
my ($ekat_num, undef, $eents, $eother_number, $emult_ents, $efile, $elinkfile, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, $eent_name, $etag_punkt, $eother_punkt, $edesc_other_punkt, $eexact_punkt, $efix_type, $egpspresa, $egpspostsa, $enorthing, $eeasting, $ealtitude) = &parse_csv($e); my ($ekat_num, undef, $eents, $eother_number, $emult_ents, $efile, $elinkfile, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, $eent_name, $etag_punkt, $eother_punkt, $edesc_other_punkt, $eexact_punkt, $efix_type, $egpspresa, $egpspostsa, $enorthing, $eeasting, $ealtitude) = &parse_csv($e);
if ($eother_number) { if ($eother_number) {
$eother_number = "($eother_number)"; # wrap it in brackets, so it doesn't appear to be official $eother_number = "($eother_number)"; # wrap it in brackets, so it doesn't appear to be official