--- test/html-webhacc/cc.cgi 2008/02/10 02:30:14 1.32 +++ test/html-webhacc/cc.cgi 2008/02/10 02:42:01 1.33 @@ -184,9 +184,15 @@ my $elements = print_structure_error_dom_section ($input, $doc, $el, $result); print_table_section ($input, $elements->{table}) if @{$elements->{table}}; - print_id_section ($input, $elements->{id}) if keys %{$elements->{id}}; - print_term_section ($input, $elements->{term}) if keys %{$elements->{term}}; - print_class_section ($input, $elements->{class}) if keys %{$elements->{class}}; + print_listing_section ({ + id => 'identifiers', label => 'IDs', heading => 'Identifiers', + }, $input, $elements->{id}) if keys %{$elements->{id}}; + print_listing_section ({ + id => 'terms', label => 'Terms', heading => 'Terms', + }, $input, $elements->{term}) if keys %{$elements->{term}}; + print_listing_section ({ + id => 'classes', label => 'Classes', heading => 'Classes', + }, $input, $elements->{class}) if keys %{$elements->{class}}; } elsif (defined $manifest) { print_structure_dump_manifest_section ($input, $manifest); print_structure_error_manifest_section ($input, $manifest, $result); @@ -651,13 +657,13 @@ print STDOUT qq[]; } # print_table_section -sub print_id_section ($$) { - my ($input, $ids) = @_; +sub print_listing_section ($$$) { + my ($opt, $input, $ids) = @_; - push @nav, ['#identifiers' => 'IDs'] unless $input->{nested}; + push @nav, ['#' . $opt->{id} => $opt->{label}] unless $input->{nested}; print STDOUT qq[ -
-

Identifiers

+
+

$opt->{heading}

]; @@ -668,45 +674,7 @@ } } print STDOUT qq[
]; -} # print_id_section - -sub print_term_section ($$) { - my ($input, $terms) = @_; - - push @nav, ['#terms' => 'Terms'] unless $input->{nested}; - print STDOUT qq[ -
-

Terms

- -
-]; - for my $term (sort {$a cmp $b} keys %$terms) { - print STDOUT qq[
@{[htescape $term]}
]; - for (@{$terms->{$term}}) { - print STDOUT qq[
].get_node_link ($input, $_).qq[
]; - } - } - print STDOUT qq[
]; -} # print_term_section - -sub print_class_section ($$) { - my ($input, $classes) = @_; - - push @nav, ['#classes' => 'Classes'] unless $input->{nested}; - print STDOUT qq[ -
-

Classes

- -
-]; - for my $class (sort {$a cmp $b} keys %$classes) { - print STDOUT qq[
@{[htescape $class]}
]; - for (@{$classes->{$class}}) { - print STDOUT qq[
].get_node_link ($input, $_).qq[
]; - } - } - print STDOUT qq[
]; -} # print_class_section +} # print_listing_section sub print_result_section ($) { my $result = shift; @@ -1163,4 +1131,4 @@ =cut -## $Date: 2008/02/10 02:30:14 $ +## $Date: 2008/02/10 02:42:01 $