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

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

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

revision 1.18 by wakaba, Fri Aug 15 12:11:56 2008 UTC revision 1.21 by wakaba, Sat Aug 16 08:37:12 2008 UTC
# Line 181  sub start_section ($%) { Line 181  sub start_section ($%) {
181      if ($self->{section_rank} == 2 or length $opt{parent_id}) {      if ($self->{section_rank} == 2 or length $opt{parent_id}) {
182        my $st = $opt{short_title} || $opt{title};        my $st = $opt{short_title} || $opt{title};
183        push @{$self->{nav}},        push @{$self->{nav}},
184            [$id => $st => $opt{text}];            [$id => $st => $opt{text}] if $self->{section_rank} == 2;
185                
186        $self->start_tag ('script');        $self->start_tag ('script');
187        $self->html (qq[ addSectionLink ('$id', ']);        $self->html (qq[ addSectionLink ('$id', ']);
# Line 341  sub xref ($$%) { Line 341  sub xref ($$%) {
341    $self->html ('</a>');    $self->html ('</a>');
342  } # xref  } # xref
343    
344    sub xref_text ($$%) {
345      my ($self, $content, %opt) = @_;
346      $self->html ('<a href="#' . $htescape->($self->input->id_prefix . $opt{target}) . '">');
347      $self->text ($content);
348      $self->html ('</a>');
349    } # xref
350    
351  sub link_to_webhacc ($$%) {  sub link_to_webhacc ($$%) {
352    my ($self, $content, %opt) = @_;    my ($self, $content, %opt) = @_;
353    $opt{url} = './?uri=' . $self->encode_url_component ($opt{url});    $opt{url} = './?uri=' . $self->encode_url_component ($opt{url});
# Line 394  my $get_object_path = sub ($) { Line 401  my $get_object_path = sub ($) {
401  sub node_link ($$) {  sub node_link ($$) {
402    my ($self, $node) = @_;    my ($self, $node) = @_;
403    if ($node->isa ('Message::IF::Node')) {    if ($node->isa ('Message::IF::Node')) {
404      $self->xref ($get_node_path->($node), target => 'node-' . refaddr $node);      $self->xref_text ($get_node_path->($node),
405                          target => 'node-' . refaddr $node);
406    } else {    } else {
407      $self->html ($get_object_path->($node));      $self->html ($get_object_path->($node));
408    }    }
# Line 425  sub nl_text ($$;%) { Line 433  sub nl_text ($$;%) {
433    my ($self, $type, %opt) = @_;    my ($self, $type, %opt) = @_;
434    my $node = $opt{node};    my $node = $opt{node};
435    
436    my @arg;    if (defined $Msg->{$type}) {
437    {      my $msg = $Msg->{$type}->[1];
438      if (defined $Msg->{$type}) {      if ($msg =~ /<var>/) {
439        my $msg = $Msg->{$type}->[1];        $msg =~ s{<var>{\@([A-Za-z0-9:_.-]+)}</var>}{
440        if ($msg =~ /<var>/) {          UNIVERSAL::can ($node, 'get_attribute_ns')
441          $msg =~ s{<var>\$([0-9]+)</var>}{              ? $htescape->($node->get_attribute_ns (undef, $1)) : ''
442            defined $arg[$1] ? $htescape->($arg[$1]) : '(undef)';        }ge;
443          }ge;        $msg =~ s{<var>{\@}</var>}{
444          $msg =~ s{<var>{\@([A-Za-z0-9:_.-]+)}</var>}{          UNIVERSAL::can ($node, 'value') ? $htescape->($node->value) : ''
445            UNIVERSAL::can ($node, 'get_attribute_ns')        }ge;
446                ? $htescape->($node->get_attribute_ns (undef, $1)) : ''        $msg =~ s{<var>{text}</var>}{
447          }ge;          defined $opt{text} ? $htescape->($opt{text}) : ''
448          $msg =~ s{<var>{\@}</var>}{        }ge;
449            UNIVERSAL::can ($node, 'value') ? $htescape->($node->value) : ''        $msg =~ s{<var>{value}</var>}{
450          }ge;          defined $opt{value} ? $htescape->($opt{value}) : ''
451          $msg =~ s{<var>{text}</var>}{        }ge;
452            defined $opt{text} ? $htescape->($opt{text}) : ''        $msg =~ s{<var>{local-name}</var>}{
453          }ge;          UNIVERSAL::can ($node, 'manakai_local_name')
         $msg =~ s{<var>{value}</var>}{  
           defined $opt{value} ? $htescape->($opt{value}) : ''  
         }ge;  
         $msg =~ s{<var>{local-name}</var>}{  
           UNIVERSAL::can ($node, 'manakai_local_name')  
454              ? $htescape->($node->manakai_local_name) : ''              ? $htescape->($node->manakai_local_name) : ''
455          }ge;        }ge;
456          $msg =~ s{<var>{element-local-name}</var>}{        $msg =~ s{<var>{element-local-name}</var>}{
457            (UNIVERSAL::can ($node, 'owner_element') and          (UNIVERSAL::can ($node, 'owner_element') and $node->owner_element)
            $node->owner_element)  
458              ? $htescape->($node->owner_element->manakai_local_name) : ''              ? $htescape->($node->owner_element->manakai_local_name) : ''
459          }ge;        }ge;
       }  
       $self->html ($msg);  
       return;  
     } elsif ($type =~ s/:([^:]*)$//) {  
       unshift @arg, $1;  
       redo;  
460      }      }
461        $self->html ($msg);
462      } else {
463        $self->text ($type);
464    }    }
   $self->text ($type);  
465  } # nl_text  } # nl_text
466    
467  }  }
Legend:
Removed from v.1.18  
changed lines
  Added in v.1.21
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24