expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2026-02-26 06:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[svn r6850] A hard day's night of updates. Prospecting guide data is now in cavetab2 but make-indxal doesn't know about it yet.

Browse Source
This commit is contained in:
dave
2005-05-28 01:13:40 +02:00
parent d2d287175e
commit 565248b3b3
6 changed files with 437 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

835
noinfo/CAVETAB2.CSV
View File

File diff suppressed because one or more lines are too long

BIN
noinfo/CAVETAB2.sxc
View File

Binary file not shown.

16
noinfo/make-indxal4.pl
View File

@@ -170,7 +170,7 @@ sub notincurrentcvs {
# Returns nothing
sub do_this_line {
# Split single line into all the fields
my ($kat_num, $kat_status, $ents, $other_number, $mult_ents, $file, $linkfile, undef, $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]);
my ($kat_num, $kat_status, $ents, $other_number, $mult_ents, $file, $linkfile, undef, $name, $unofficial_name, $comment, $area, $explorers, $u_description, $equipment, $qmlist, $katstatus, $references, $u_centre_line, $u_drawn_survey, $survex_file, $length, $depth, $extent, $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 $parents_name;
# If we have been called to process an entrance, we may have been given the cave's Kataster number or Other number
@@ -189,7 +189,7 @@ sub do_this_line {
print STDERR "Warning: both a file ($file) and a linkfile ($linkfile) specified. This makes no sense.\n\n";
$warnings = 1;
}
if ($linkfile && ($kat_status || $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 and $marking ne "\r" and $marking ne "\r\n" and $marking ne "\n"))) {
if ($linkfile && ($kat_status || $name || $unofficial_name || $comment || $area || $explorers || $u_description || $equipment || $qmlist || $katstatus || $references || $u_centre_line || $u_drawn_survey || $survex_file || $length || $depth || $extent || $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 and $marking ne "\r" and $marking ne "\r\n" and $marking ne "\n"))) {
print STDERR "Warning: In the link cave $kat_num($ents) -> $other_number there is extraneous information provided that will not be used. Please merge it into the description of the cave to which it links. The only information allowed in a link file is Kataster Number,\nEntrances, Other Number, Multiple Entrances, and the name of the linkfile\n\n";
$warnings = 1;
}
@@ -333,10 +333,6 @@ END
END
if ($header) {
print FILE "$header\n\n";
}
print FILE "<table id=\"cavepage\">\n";
print FILE "<tr><th id=\"kat_no\">";
if ($kat_num) {print FILE "$kat_num"} else {print FILE "$other_number"}
@@ -446,10 +442,6 @@ END
print FILE "\n\n<p><b>Survex file:</b> $survex_file</p>";
}
if ($footer) {
print FILE "\n\n<p>$footer</p>";
}
print FILE "\n\n<!-- LINKS -->\n<hr /><ul>\n";
# Count how many times the filename for FILE is in the CSV
@@ -553,7 +545,7 @@ sub do_link_ent {
}
}
my (undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, $lent_name, $ltag_punkt, $lother_punkt, $ldesc_other_punkt, $lexact_punkt, $lfix_type, $lgpspresa, $lgpspostsa, $lnorthing, $leasting, $laltitude) = &parse_csv($_);
my (undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, $lent_name, $ltag_punkt, $lother_punkt, $ldesc_other_punkt, $lexact_punkt, $lfix_type, $lgpspresa, $lgpspostsa, $lnorthing, $leasting, $laltitude) = &parse_csv($_);
do_ent($ltag_punkt,$lother_punkt,$lexact_punkt,$lgpspostsa,$lgpspresa,$leasting,$lnorthing,$laltitude,$lent_name,$lfix_type,$ldesc_other_punkt);
seek(CSV, $storedoffset, 0);
return;
@@ -679,7 +671,7 @@ sub multi_ents {
my $e = <CSV>;
chomp($e);
my ($ekat_num, undef, $eents, $eother_number, $emult_ents, $efile, $elinkfile, $elinkent, 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, $elinkent, 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) {
$eother_number = "($eother_number)"; # wrap it in brackets, so it doesn't appear to be official