Ship.pm (interchange-5.8.2) | : | Ship.pm (interchange-5.10.0) | ||
---|---|---|---|---|
skipping to change at line 981 | skipping to change at line 981 | |||
#::logDebug("labeling, subst=" . ::uneval(\%subst)); | #::logDebug("labeling, subst=" . ::uneval(\%subst)); | |||
$subst{D} = errmsg($subst{D}); | $subst{D} = errmsg($subst{D}); | |||
if($opt->{output_options}) { | if($opt->{output_options}) { | |||
for(qw/ D E F f /) { | for(qw/ D E F f /) { | |||
next unless $subst{$_}; | next unless $subst{$_}; | |||
$subst{$_} =~ s/,/,/g; | $subst{$_} =~ s/,/,/g; | |||
} | } | |||
} | } | |||
$label =~ s/(%(.))/exists $subst{$2} ? $subst{$2} : $1/eg; | $label =~ s/(%(.))/exists $subst{$2} ? $subst{$2} : $1/eg; | |||
#::logDebug("label intermediate: $label"); | #::logDebug("label intermediate: $label"); | |||
$label =~ s/(\$O{(.*?)})/$o->{$2}/eg; | $label =~ s/(\$O\{(.*?)\})/$o->{$2}/eg; | |||
#::logDebug("label returning: $label"); | #::logDebug("label returning: $label"); | |||
return $label; | return $label; | |||
} | } | |||
# If we got here, the mode and quantity fit was not found | # If we got here, the mode and quantity fit was not found | |||
$Vend::Session->{ship_message} ||= ''; | $Vend::Session->{ship_message} ||= ''; | |||
my $fmt = "No match found for mode '%s', quantity '%s', "; | my $fmt = "No match found for mode '%s', quantity '%s', "; | |||
$fmt .= "qualifier '%s', " if $qual; | $fmt .= "qualifier '%s', " if $qual; | |||
$fmt .= "returning 0."; | $fmt .= "returning 0."; | |||
$Vend::Session->{ship_message} .= errmsg($fmt, $mode, $total, $qual); | $Vend::Session->{ship_message} .= errmsg($fmt, $mode, $total, $qual); | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |