/[suikacvs]/test/html-webhacc/WebHACC/Result.pm
Suika

Diff of /test/html-webhacc/WebHACC/Result.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.13 by wakaba, Fri Aug 15 16:03:46 2008 UTC revision 1.17 by wakaba, Sat Aug 30 10:27:47 2008 UTC
# Line 170  sub add_error ($%) { Line 170  sub add_error ($%) {
170    
171    if (defined $opt{value}) {    if (defined $opt{value}) {
172      $out->html (' ');      $out->html (' ');
173      $out->code ($opt{value});      if (defined $opt{pos_start}) {
174          $out->start_tag ('code');
175          $out->text (substr $opt{value}, 0, $opt{pos_start});
176          $out->start_tag ('mark');
177          $out->text (substr $opt{value}, $opt{pos_start},
178                          $opt{pos_end} - $opt{pos_start} + 1);
179          $out->end_tag ('mark');
180          $out->text (substr $opt{value}, $opt{pos_end} + 1)
181              if $opt{pos_end} < length $opt{value};
182          $out->end_tag ('code');
183        } elsif ($opt{value_mark_end}) {
184          $out->start_tag ('code');
185          $out->text ($opt{value});
186          $out->start_tag ('mark');
187          $out->end_tag ('mark');
188          $out->end_tag ('code');
189        } elsif (defined $opt{value_mark}) {
190          $out->start_tag ('code');
191          for (split /($opt{value_mark})/, $opt{value}) {
192            if (/$opt{value_mark}/) {
193              $out->start_tag ('mark');
194              $out->text ($_);
195              $out->end_tag ('mark');
196            } else {
197              $out->text ($_);
198            }
199          }
200          $out->end_tag ('code');
201        } else {
202          $out->code ($opt{value});
203        }
204      $has_location = 1;      $has_location = 1;
205    }    }
206    
# Line 185  sub add_error ($%) { Line 215  sub add_error ($%) {
215        } elsif (defined $opt{input}->{request_uri}) {        } elsif (defined $opt{input}->{request_uri}) {
216          $out->url ($opt{input}->{request_uri});          $out->url ($opt{input}->{request_uri});
217          $has_location = 1;          $has_location = 1;
218        } elsif (defined $opt{input}->{uri}) {        } elsif (defined $opt{input}->url) {
219          $out->url ($opt{input}->{uri});          $out->url ($opt{input}->url);
220          $has_location = 1;          $has_location = 1;
221        }        }
222      }      }
# Line 206  sub add_error ($%) { Line 236  sub add_error ($%) {
236    my $error_type_text = $opt{type};    my $error_type_text = $opt{type};
237    $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text},    $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text},
238                   value => $opt{value});                   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>)');  
   }  
239        
240    ## Link to a long description    ## Link to a long description
241    
# Line 220  sub add_error ($%) { Line 243  sub add_error ($%) {
243    $fragment =~ tr/ /-/;    $fragment =~ tr/ /-/;
244    $fragment = $out->encode_url_component ($fragment);    $fragment = $out->encode_url_component ($fragment);
245    $out->text (' [');    $out->text (' [');
246    $out->link ('Description', url => '../error-description#' . $fragment,    $out->start_tag ('a', href => '../error-description#' . $fragment,
247                rel => 'help');                     rel => 'help');
248      $out->nl_text ('Description');
249      $out->end_tag ('a');
250    $out->text (']');    $out->text (']');
251    
252    if ($error_level eq 'm') {    if ($error_level eq 'm') {
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.17
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24