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

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index e3dc111..3af5e3e 100644
--- 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;
 
@@ -186,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;
@@ -319,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;