X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=e1415886ae0e31b361a535d1d792aef5f2238a30;hb=bfdaecc4cb8124a653c5b4446799727d61246b3c;hp=e3dc1115eee9b8c2a83f51eedb39477886f6e9d3;hpb=7206cc1ddf92f2a9551567a1ba7b76eb206dacee;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index e3dc111..e141588 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -119,7 +119,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;
 
@@ -186,6 +201,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;
@@ -323,7 +339,7 @@ sub moreinfo {
 		# non-US hack
 		($server = lc $page->get_newest('archive')) =~ s/-//go;
 		$server = $env->{$server}||$env->{us};
-		$path = "$src_dir/$src_file_name";
+		$path = "/$src_dir/$src_file_name";
 		if ($src_file_name =~ /dsc$/) {
 		    $name = 'dsc'
 		} else {