/[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.16 by wakaba, Sat Aug 30 05:32:51 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          $out->end_tag ('code');
182        } elsif ($opt{value_mark_end}) {
183          $out->start_tag ('code');
184          $out->text ($opt{value});
185          $out->start_tag ('mark');
186          $out->end_tag ('mark');
187          $out->end_tag ('code');
188        } elsif (defined $opt{value_mark}) {
189          $out->start_tag ('code');
190          for (split /($opt{value_mark})/, $opt{value}) {
191            if (/$opt{value_mark}/) {
192              $out->start_tag ('mark');
193              $out->text ($_);
194              $out->end_tag ('mark');
195            } else {
196              $out->text ($_);
197            }
198          }
199          $out->end_tag ('code');
200        } else {
201          $out->code ($opt{value});
202        }
203      $has_location = 1;      $has_location = 1;
204    }    }
205    
# Line 185  sub add_error ($%) { Line 214  sub add_error ($%) {
214        } elsif (defined $opt{input}->{request_uri}) {        } elsif (defined $opt{input}->{request_uri}) {
215          $out->url ($opt{input}->{request_uri});          $out->url ($opt{input}->{request_uri});
216          $has_location = 1;          $has_location = 1;
217        } elsif (defined $opt{input}->{uri}) {        } elsif (defined $opt{input}->url) {
218          $out->url ($opt{input}->{uri});          $out->url ($opt{input}->url);
219          $has_location = 1;          $has_location = 1;
220        }        }
221      }      }
# Line 206  sub add_error ($%) { Line 235  sub add_error ($%) {
235    my $error_type_text = $opt{type};    my $error_type_text = $opt{type};
236    $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text},    $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text},
237                   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>)');  
   }  
238        
239    ## Link to a long description    ## Link to a long description
240    
# Line 220  sub add_error ($%) { Line 242  sub add_error ($%) {
242    $fragment =~ tr/ /-/;    $fragment =~ tr/ /-/;
243    $fragment = $out->encode_url_component ($fragment);    $fragment = $out->encode_url_component ($fragment);
244    $out->text (' [');    $out->text (' [');
245    $out->link ('Description', url => '../error-description#' . $fragment,    $out->start_tag ('a', href => '../error-description#' . $fragment,
246                rel => 'help');                     rel => 'help');
247      $out->nl_text ('Description');
248      $out->end_tag ('a');
249    $out->text (']');    $out->text (']');
250    
251    if ($error_level eq 'm') {    if ($error_level eq 'm') {
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.16
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24