Add some more files and directories to .gitignore

[deb/packages.git] / lib / Packages / DoShow.pm

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index d6502ab7c318519d5b397a82324b10cb8d6ddc65..cfe7a90f783ff8486ae74f909dc1b6ed06c6de36 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -119,8 +119,24 @@ sub do_show {
                        debug( "Data search and merging took ".timestr($std) ) if DEBUG;
 
                        my $did = $page->get_newest( 'description' );
-                       my @tags = split(/, /, $page->get_newest( 'tag' ));
+                       my @complete_tags = split(/, /, $page->get_newest( 'tag' ));
+                       my @tags;
+                       foreach (@complete_tags) {
+                           my ($facet, $tag) = split( /::/, $_, 2);
+                           # handle tags like devel::{lang:c,lang:c++}
+                           if ($tag =~ s/^\{(.+)\}$/$1/) {
+                               foreach (split( /,/, $tag )) {
+                                   next if $tag =~ /^special:/;
+                                   push @tags, [ $facet, $_ ];
+                               }
+                           } else {
+                               next if $tag =~ /^special:/;
+                               push @tags, [ $facet, $tag ];
+                           }
+                       }
+
                        $contents{tags} = \@tags;
+                       $contents{debtags_voc} = \%debtags;
 
                        $section = $page->get_newest( 'section' );
                        $contents{section} = $section;
@@ -139,7 +155,7 @@ sub do_show {
                        $short_desc = encode_entities( $1, "<>&\"" )
                            if $desc =~ s/^(.*)$//m;
                        my $long_desc = encode_entities( $desc, "<>&\"" );
-                       
+
                        $long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go; # syntax highlighting -> '];
                        $long_desc =~ s/\A //o;
                        $long_desc =~ s/\n /\n/sgo;
@@ -162,6 +178,9 @@ sub do_show {
                        #
                        # display dependencies
                        #
+                       build_deps( \%packages, $opts, $pkg,
+                                   $page->get_dep_field('pre-depends'),
+                                   'depends', \%contents );
                        build_deps( \%packages, $opts, $pkg,
                                    $page->get_dep_field('depends'),
                                    'depends', \%contents );