/[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.12 by wakaba, Fri Aug 15 12:11:56 2008 UTC revision 1.20 by wakaba, Sun Sep 14 06:33:27 2008 UTC
# Line 117  sub add_error ($%) { Line 117  sub add_error ($%) {
117        $column = $opt{column};        $column = $opt{column};
118      }      }
119    }    }
120      $line += $opt{line_diff} || 0 if defined $line;
121      $column += $opt{column_diff} || 0 if defined $column;
122    $line = $line - 1 || 1    $line = $line - 1 || 1
123        if defined $line and not (defined $column and $column > 0);        if defined $line and not (defined $column and $column > 0);
124    
# Line 170  sub add_error ($%) { Line 172  sub add_error ($%) {
172    
173    if (defined $opt{value}) {    if (defined $opt{value}) {
174      $out->html (' ');      $out->html (' ');
175      $out->code ($opt{value});      if (defined $opt{pos_start}) {
176          $out->start_tag ('code');
177          $out->text (substr $opt{value}, 0, $opt{pos_start});
178          $out->start_tag ('mark');
179          $out->text (substr $opt{value}, $opt{pos_start},
180                          $opt{pos_end} - $opt{pos_start} + 1);
181          $out->end_tag ('mark');
182          $out->text (substr $opt{value}, $opt{pos_end} + 1)
183              if $opt{pos_end} < length $opt{value};
184          $out->end_tag ('code');
185        } elsif ($opt{value_mark_end}) {
186          $out->start_tag ('code');
187          $out->text ($opt{value});
188          $out->start_tag ('mark');
189          $out->end_tag ('mark');
190          $out->end_tag ('code');
191        } elsif (defined $opt{value_mark}) {
192          $out->start_tag ('code');
193          for (split /($opt{value_mark})/, $opt{value}) {
194            if (/$opt{value_mark}/) {
195              $out->start_tag ('mark');
196              $out->text ($_);
197              $out->end_tag ('mark');
198            } else {
199              $out->text ($_);
200            }
201          }
202          $out->end_tag ('code');
203        } else {
204          $out->code ($opt{value});
205        }
206      $has_location = 1;      $has_location = 1;
207    }    }
208    
# Line 185  sub add_error ($%) { Line 217  sub add_error ($%) {
217        } elsif (defined $opt{input}->{request_uri}) {        } elsif (defined $opt{input}->{request_uri}) {
218          $out->url ($opt{input}->{request_uri});          $out->url ($opt{input}->{request_uri});
219          $has_location = 1;          $has_location = 1;
220        } elsif (defined $opt{input}->{uri}) {        } elsif (defined $opt{input}->url) {
221          $out->url ($opt{input}->{uri});          $out->url ($opt{input}->url);
222          $has_location = 1;          $has_location = 1;
223        }        }
224      }      }
# Line 204  sub add_error ($%) { Line 236  sub add_error ($%) {
236        
237    ## Error message    ## Error message
238    my $error_type_text = $opt{type};    my $error_type_text = $opt{type};
239    $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text});    $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text},
240                     value => $opt{value}, char => $opt{char},
241    ## Additional error description                   octets => $opt{octets});
   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>)');  
   }  
242        
243    ## Link to a long description    ## Link to a long description
244    
# Line 219  sub add_error ($%) { Line 246  sub add_error ($%) {
246    $fragment =~ tr/ /-/;    $fragment =~ tr/ /-/;
247    $fragment = $out->encode_url_component ($fragment);    $fragment = $out->encode_url_component ($fragment);
248    $out->text (' [');    $out->text (' [');
249    $out->link ('Description', url => '../error-description#' . $fragment,    $out->start_tag ('a', href => '../error-description#' . $fragment,
250                rel => 'help');                     rel => 'help');
251      $out->nl_text ('Description');
252      $out->end_tag ('a');
253    $out->text (']');    $out->text (']');
254    
255    if ($error_level eq 'm') {    if ($error_level eq 'm') {
# Line 294  sub generate_result_section ($) { Line 323  sub generate_result_section ($) {
323         target => 'parse-errors', score_base => 10,         target => 'parse-errors', score_base => 10,
324         parent_status => $maindoc_status},         parent_status => $maindoc_status},
325        {label => 'Char L.', status => $self->{layers}->{charset},        {label => 'Char L.', status => $self->{layers}->{charset},
326         score_base => 10,         target => 'parse-errors', score_base => 10,
327         parent_status => $maindoc_status},         parent_status => $maindoc_status},
328          ## TODO: char semantics layer
329        {label => 'Syntax L.', status => $self->{layers}->{syntax},        {label => 'Syntax L.', status => $self->{layers}->{syntax},
330         target => 'parse-errors', score_base => 20,         target => 'parse-errors', score_base => 20,
331         parent_status => $maindoc_status},         parent_status => $maindoc_status},
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.20
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24