lib/Packages/DoShow.pm: Don't shorten the dsc name

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

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 0f760858f76b291e78594ab7d5130af524a4bb9b..3af5e3e7c83056a118a40dcd6ac587677903752b 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -111,6 +111,8 @@ sub do_show {
 
                        debug( "find source package: source=$source", 1) if DEBUG;
                        my $src_data = $sources_all{"$archive $suite $source"};
+                       #FIXME: should be $main_archive or similar, not hardcoded "us"
+                       $src_data = $sources_all{"us $suite $source"} unless $src_data;
                        $page->add_src_data( $source, $src_data )
                            if $src_data;
 
@@ -119,7 +121,22 @@ sub do_show {
                        debug( "Data search and merging took ".timestr($std) ) if DEBUG;
 
                        my $did = $page->get_newest( 'description' );
-                       my @tags = map { [ split( /::/, $_) ] } 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;
 
@@ -140,7 +157,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;
@@ -163,6 +180,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 );
@@ -183,6 +203,7 @@ sub do_show {
                                      instsize => $sizes_inst->{$a}, );
 
                            $d{version} = $versions->{$a} if $multiple_versions;
+                           $d{archive} = $archives->{$a};
                            if ( ($suite ne "experimental")
                                 && ($subsection ne 'debian-installer')) {
                                $d{contents_avail} = 1;
@@ -316,17 +337,12 @@ sub moreinfo {
        if (defined($files) and @$files) {
            foreach( @$files ) {
                my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
-               my ($name, $server, $path);
+               my ($server, $path);
                # non-US hack
                ($server = lc $page->get_newest('archive')) =~ s/-//go;
                $server = $env->{$server}||$env->{us};
-               $path = "$src_dir/$src_file_name";
-               if ($src_file_name =~ /dsc$/) {
-                   $name = 'dsc'
-               } else {
-                   $name = $src_file_name;
-               }
-               push @downloads, { name => $name, server => $server, path => $path };
+               $path = "/$src_dir/$src_file_name";
+               push @downloads, { name => $src_file_name, server => $server, path => $path };
            }
        }
        $contents->{src}{downloads} = \@downloads;