X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=92b69e59718be617d87373983f9d9248edcc8b92;hb=00d2959ac17d719af9cce1c320092e2fbed182a7;hp=419c59799ca7feba0b3bc8eecc36396a8001de7d;hpb=49052885778c856da9b93a5f2f9e8877a827c3c5;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 419c597..92b69e5 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -14,7 +14,7 @@ use Deb::Versions;
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @SECTIONS
 			 @ARCHITECTURES %FTP_SITES @DDTP_LANGUAGES);
 use Packages::I18N::Locale;
-use Packages::CGI qw( :DEFAULT make_url make_search_url note );
+use Packages::CGI qw( :DEFAULT make_url make_search_url );
 use Packages::DB;
 use Packages::Search qw( :all );
 use Packages::Page ();
@@ -68,8 +68,8 @@ sub do_show {
 	}
 
 	unless (@results || @non_results ) {
-	    fatal_error( _g( "No such package." )."<br>".
-			 sprintf( _g( '<a href="%s">Search for the package</a>' ), make_search_url('','keywords='.uri_escape($pkg)) ) );
+	    fatal_error( _g( "No such package.") );
+	    #sprintf( _g( '<a href="%s">Search for the package</a>' ), make_search_url('','keywords='.uri_escape($pkg)) ) );
 	} else {
 	    my %all_suites;
 	    foreach (@results, @non_results) {
@@ -120,9 +120,13 @@ sub do_show {
 			my $std = timediff($st1, $st0);
 			debug( "Data search and merging took ".timestr($std) ) if DEBUG;
 
+			my @similar = find_similar( $pkg, "$DBDIR/xapian/",
+						    \%did2pkg );
+			$contents{similar} = \@similar;
+
 			my $did = $page->get_newest( 'description' );
 			my $desc_md5 = $page->get_newest( 'description-md5' );
-			my @complete_tags = split(/, /, $page->get_newest( 'tag' ));
+			my @complete_tags = split(/, /, $page->get_newest( 'tag' )||'' );
 			my @tags;
 			foreach (@complete_tags) {
 			    my ($facet, $tag) = split( /::/, $_, 2);
@@ -175,6 +179,7 @@ sub do_show {
 			my $trans_desc = $desctrans{$desc_md5};
 			if ($trans_desc) {
 			    my %trans_desc = split /\000|\001/, $trans_desc;
+			    $contents{used_langs} = ['en', sort keys %trans_desc];
 			    debug( "TRANSLATIONS: ".join(" ",keys %trans_desc), 2)
 				if DEBUG;
 			    while (my ($l, $d) = each %trans_desc) {
@@ -217,7 +222,7 @@ sub do_show {
 			my @downloads;
 			foreach my $a ( @archs ) {
 			    my %d = ( arch => $a,
-				      pkgsize => sprintf( '%.1f', floor(($sizes_deb->{$a}/102.4)+0.5)/10 ),
+				      pkgsize => floor(($sizes_deb->{$a}/102.4)+0.5)/10,
 				      instsize => $sizes_inst->{$a}, );
 
 			    $d{version} = $versions->{$a} if $multiple_versions;
@@ -301,13 +306,12 @@ sub do_show {
 		    foreach( @$source_files ) {
 			my ($src_file_md5, $src_file_size, $src_file_name)
 			    = split /\s+/, $_;
-			(my $server = lc $archive) =~ s/-//go; # non-US hack
-			$server = $FTP_SITES{$server}
+			my $server = $FTP_SITES{lc $archive}
 			    || $FTP_SITES{us};
 			my $path = "/$source_dir/$src_file_name";
 
 			push @{$contents{srcfiles}}, { server => $server, path => $path, filename => $src_file_name,
-						       size => sprintf("%.1f", (floor(($src_file_size/102.4)+0.5)/10)),
+						       size => floor(($src_file_size/102.4)+0.5)/10,
 						       md5sum => $src_file_md5 };
 		    }
 
@@ -356,9 +360,7 @@ sub moreinfo {
 	    foreach( @$files ) {
 		my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
 		my ($server, $path);
-		# non-US hack
-		($server = lc $page->get_newest('archive')) =~ s/-//go;
-		$server = $env->{$server}||$env->{us};
+		$server = $env->{lc $page->get_newest('archive')}||$env->{us};
 		$path = "/$src_dir/$src_file_name";
 		push @downloads, { name => $src_file_name, server => $server, path => $path };
 	    }
@@ -371,7 +373,6 @@ sub moreinfo {
 	    (my $src_basename = $source_version) =~ s,^\d+:,,; # strip epoche
 	    $src_basename = "${source}_$src_basename";
 	    $src_dir =~ s,pool/updates,pool,o;
-	    $src_dir =~ s,pool/non-US,pool,o;
 
 	    $contents->{files}{changelog}{path} = "$src_dir/$src_basename/changelog";
 	    $contents->{files}{copyright}{path} = "$src_dir/$src_basename/".( $is_source ? 'copyright' : "$name.copyright" );
@@ -421,7 +422,7 @@ sub build_deps {
 
 	    if ($arch_str ||= '') {
 		if ($arch_neg) {
-		    $arch_str = _g("not")." $arch_str";
+		    $arch_str = sprintf( _g("not %s"), "$arch_str" );
 		} else {
 		    $arch_str = $arch_str;
 		}