mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2025-03-21 09:42:02 +00:00
[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.
This commit is contained in:
dave
parent
d2d287175e
commit
565248b3b3
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -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
|
||||
|
||||
BIN
smkridge/215/elev.png
Executable file
BIN
smkridge/215/elev.png
Executable file
Binary file not shown.
|
After 
(image error) Size: 130 KiB |
BIN
smkridge/215/plan.png
Executable file
BIN
smkridge/215/plan.png
Executable file
Binary file not shown.
|
After 
(image error) Size: 212 KiB |
@ -28,6 +28,11 @@ href="../../smkridge/2002-X18/2002-X18.html">2002-X18</a>: Entrances noted and
|
||||
GPSsed by Dunks in 2002, on a single long circular prospecting walk round the
|
||||
back of the Nieder Augst-Eck. Most of these are untagged, and have been given
|
||||
provisional numbers (indicated by the X prefix).</li>
|
||||
<li>Not to be outdone, Earl and Becka went for a walk with Martin's GPS in 2003
|
||||
and found eight more holes which promptly got forgotten about. At least they
|
||||
explored most of these at the time but <a
|
||||
href="../smkridge/2003-X12/2003-X12.html">2003-X12</a> and <a
|
||||
href="../smkridge/2003-X17/2003-X17.html">2003-X17</a> are undescended.</li>
|
||||
<li><a href="../../smkridge/2004-10/2004-10.html">2004-10</a>: discovered by
|
||||
Becka and Nial, lying just north of <a
|
||||
href="../../smkridge/2004-11/2004-11.html">2004-11</a> (In Your Face).</li>
|
||||
@ -82,6 +87,9 @@ href="../../smkridge/2002-08/2002-08.html">2002-08</a> and <a
|
||||
href="../../smkridge/2002-XX/2002-XX.html">2002-XX</a>): revisit in
|
||||
consultation with Frank and determine if they go anywhere, and if there is a
|
||||
link to 204c (as has been suggested).</li>
|
||||
<li>Huge bag of caves 2003-X11 to 2003-X18 GPSsed by Earl + Becka in 2003 and
|
||||
promptly forgotten about; need re-finding, marking, and surveying where
|
||||
appropriate (they vary from the done to the completely undescended).</p>
|
||||
<li>161G + H: currently numbered as 2003-06 and 2004-12 respectively; to be
|
||||
tagged with new numbers.</li>
|
||||
<li><a href="../../smkridge/2002-01/2002-01.html">2002-01</a>, <a
|
||||
@ -95,6 +103,8 @@ kataster numbers when these have been allocated.</li>
|
||||
<li><a href="../../smkridge/2003-07/2003-07.html">2003-07</a>: it is not clear
|
||||
if this cave really exists! A walk over that way to determine which tags were
|
||||
actually placed where is in order.</li>
|
||||
<li>The rest of Earl + Becka's 2003-Xnn caves, at least two of which probably
|
||||
need a proper survey, and all of them need to be re-found and re-marked.</li>
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user