mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2025-03-26 04:01:54 +00:00
[svn r7958] This version doesn't have the wrapping problem in do_link_ent .
This commit is contained in:
parent
14cfa4ef90
commit
a6afc16e6f
@ -517,11 +517,8 @@ sub do_link_ent {
|
|||||||
while ((&parse_csv($_))[2] ne $linkent) {
|
while ((&parse_csv($_))[2] ne $linkent) {
|
||||||
$_ = <CSV>;
|
$_ = <CSV>;
|
||||||
chomp;
|
chomp;
|
||||||
if ((&parse_csv($_))[4] eq
|
if ((&parse_csv($_))[4] eq "last entrance" && (&parse_csv($_))[2] ne $linkent) {
|
||||||
"last entrance" && (&parse_csv($_))[2] ne $linkent) {
|
print STDERR "Warning: Link entrance for $linkname not found, please specify Link Entrance\n\n";
|
||||||
print STDERR "Warning:
|
|
||||||
Link entrance for $linkname not found, please specify Link
|
|
||||||
Entrance\n\n";
|
|
||||||
$warnings = 1;
|
$warnings = 1;
|
||||||
seek(CSV, $storedoffset, 0);
|
seek(CSV, $storedoffset, 0);
|
||||||
return;
|
return;
|
||||||
@ -529,16 +526,8 @@ Entrance\n\n";
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
my (undef, undef, undef, undef, undef, undef,
|
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, undef, undef, undef, undef, undef, undef, $lmarking) = &parse_csv($_);
|
||||||
undef, undef, undef, undef, undef, undef, undef, undef, undef, undef,
|
do_ent($ltag_punkt,$lother_punkt,$lexact_punkt,$lgpspostsa,$lgpspresa,$leasting,$lnorthing,$laltitude,$lent_name,$lfix_type,$ldesc_other_punkt, $lmarking);
|
||||||
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, undef, undef, undef, undef, undef, undef,
|
|
||||||
$lmarking) = &parse_csv($_);
|
|
||||||
|
|
||||||
do_ent($ltag_punkt,$lother_punkt,$lexact_punkt,$lgpspostsa,$lgpspresa,$leasting,$lnorthing,$laltitude,$lent_name,$lfix_type,$ldesc_other_punkt,
|
|
||||||
$lmarking);
|
|
||||||
seek(CSV, $storedoffset, 0);
|
seek(CSV, $storedoffset, 0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user