185 |
} elsif (defined $opt{input}->{request_uri}) { |
} elsif (defined $opt{input}->{request_uri}) { |
186 |
$out->url ($opt{input}->{request_uri}); |
$out->url ($opt{input}->{request_uri}); |
187 |
$has_location = 1; |
$has_location = 1; |
188 |
} elsif (defined $opt{input}->{uri}) { |
} elsif (defined $opt{input}->url) { |
189 |
$out->url ($opt{input}->{uri}); |
$out->url ($opt{input}->url); |
190 |
$has_location = 1; |
$has_location = 1; |
191 |
} |
} |
192 |
} |
} |
204 |
|
|
205 |
## Error message |
## Error message |
206 |
my $error_type_text = $opt{type}; |
my $error_type_text = $opt{type}; |
207 |
$out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text}); |
$out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text}, |
208 |
|
value => $opt{value}); |
|
## Additional error description |
|
|
if (defined $opt{text}) { ## TODO: Remove this block once all errors are put into the catalog. |
|
|
$out->html (' (<q>'); |
|
|
$out->text ($opt{text}); |
|
|
$out->html ('</q>)'); |
|
|
} |
|
209 |
|
|
210 |
## Link to a long description |
## Link to a long description |
211 |
|
|
213 |
$fragment =~ tr/ /-/; |
$fragment =~ tr/ /-/; |
214 |
$fragment = $out->encode_url_component ($fragment); |
$fragment = $out->encode_url_component ($fragment); |
215 |
$out->text (' ['); |
$out->text (' ['); |
216 |
$out->link ('Description', url => '../error-description#' . $fragment, |
$out->start_tag ('a', href => '../error-description#' . $fragment, |
217 |
rel => 'help'); |
rel => 'help'); |
218 |
|
$out->nl_text ('Description'); |
219 |
|
$out->end_tag ('a'); |
220 |
$out->text (']'); |
$out->text (']'); |
221 |
|
|
222 |
if ($error_level eq 'm') { |
if ($error_level eq 'm') { |