/[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.10 by wakaba, Fri Aug 15 05:53:23 2008 UTC revision 1.18 by wakaba, Wed Sep 10 10:23:00 2008 UTC
# Line 81  sub add_error ($%) { Line 81  sub add_error ($%) {
81      $error_layer = 'syntax'; ## NOTE: Unknown - an error of the implementation      $error_layer = 'syntax'; ## NOTE: Unknown - an error of the implementation
82    }    }
83    
   my $error_type_text = $opt{type};  
   
84    my $class = qq[level-$error_level layer-$error_layer];    my $class = qq[level-$error_level layer-$error_layer];
85    
86    ## Line & column numbers (prepare values)    ## Line & column numbers (prepare values)
# Line 172  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 187  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 205  sub add_error ($%) { Line 233  sub add_error ($%) {
233    $out->text (': ');    $out->text (': ');
234        
235    ## Error message    ## Error message
236    $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text});    my $error_type_text = $opt{type};
237      $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text},
238    ## Additional error description                   value => $opt{value}, char => $opt{char},
239    if (defined $opt{text}) {                   octets => $opt{octets});
     $out->html (' (<q>');  
     $out->text ($opt{text});  
     $out->html ('</q>)');  
   }  
240        
241    ## Link to a long description    ## Link to a long description
242    
# Line 220  sub add_error ($%) { Line 244  sub add_error ($%) {
244    $fragment =~ tr/ /-/;    $fragment =~ tr/ /-/;
245    $fragment = $out->encode_url_component ($fragment);    $fragment = $out->encode_url_component ($fragment);
246    $out->text (' [');    $out->text (' [');
247    $out->link ('Description', url => '../error-description#' . $fragment,    $out->start_tag ('a', href => '../error-description#' . $fragment,
248                rel => 'help');                     rel => 'help');
249      $out->nl_text ('Description');
250      $out->end_tag ('a');
251    $out->text (']');    $out->text (']');
252    
253    if ($error_level eq 'm') {    if ($error_level eq 'm') {
# Line 292  sub generate_result_section ($) { Line 318  sub generate_result_section ($) {
318         target => 'transfer-errors', score_base => 20,         target => 'transfer-errors', score_base => 20,
319         parent_status => $maindoc_status},         parent_status => $maindoc_status},
320        {label => 'Encode L.', status => $self->{layers}->{encode},        {label => 'Encode L.', status => $self->{layers}->{encode},
321         score_base => 10,         target => 'parse-errors', score_base => 10,
322         parent_status => $maindoc_status},         parent_status => $maindoc_status},
323        {label => 'Char L.', status => $self->{layers}->{charset},        {label => 'Char L.', status => $self->{layers}->{charset},
324         score_base => 10,         score_base => 10,
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.18
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24