X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPackages%2FDoShow.pm;h=5b22552f348a79906045128eb63ab589df46c331;hb=411dd86a5f305fcce69912b47f84dc16914d2da1;hp=c9940a16bfc980af9a75cca6852a7108b90b4b94;hpb=ace28538cff532f8c5ee31b2cadaf577c0ced079;p=deb%2Fpackages.git
diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index c9940a1..5b22552 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -1,6 +1,7 @@
package Packages::DoShow;
use strict;
+use warnings;
use POSIX;
use URI::Escape;
@@ -69,7 +70,7 @@ sub do_show {
unless (@results || @non_results ) {
fatal_error( _g( "No such package." )."
".
- sprintf( _g( 'Search for the package' ), "$SEARCH_URL/$pkg" ) );
+ sprintf( _g( 'Search for the package' ), make_search_url('','keywords='.uri_escape($pkg)) ) );
} else {
my %all_suites;
foreach (@results, @non_results) {
@@ -81,7 +82,7 @@ sub do_show {
if ($suite eq $_) {
$$menu .= "[ $_ ] ";
} else {
- $$menu .= "[ $_ ] ";
+ $$menu .= "[ $_})."\">$_ ] ";
}
}
$$menu .= '
';
@@ -100,7 +101,8 @@ sub do_show {
$data{package} = $pkg;
$data{architecture} = $arch;
$data{version} = $version;
- $page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 ) if DEBUG;
+ $page->merge_package(\%data)
+ or debug( "Merging $pkg $arch $version FAILED", 2 ) if DEBUG;
} else {
$page->add_provided_by([split /\s+/, $provided_by]);
}
@@ -120,6 +122,7 @@ 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' ));
$section = $page->get_newest( 'section' );
$subsection = $page->get_newest( 'subsection' );
my $filenames = $page->get_arch_field( 'filename' );
@@ -142,18 +145,19 @@ sub do_show {
$long_desc =~ s/\n /\n/sgo;
$long_desc =~ s/\n.\n/\n
\n/go; $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n
$1\n<\/pre>/sgo; -# $long_desc = conv_desc( $lang, $long_desc ); -# $short_desc = conv_desc( $lang, $short_desc ); - - $$menu .= simple_menu( [ _g( "Distribution:" ), - _g( "Overview over this suite" ), - "$ROOT/$suite/", - $suite ], - [ _g( "Section:" ), - _g( "All packages in this section" ), - "$ROOT/$suite/$subsection/", - $subsection ], - ); + my @menu = ( [ _g( "Distribution:" ), + _g( "Overview over this suite" ), + make_url("/",''), + $suite ], + [ _g( "Section:" ), + _g( "All packages in this section" ), + make_url("$subsection/",''), + $subsection ], ); + push @menu, [ _g( "Source:" ), + _g( "Source package building this package" ), + make_url($source,'',{source=>'source'}), + $source ] if $source; + $$menu .= simple_menu( @menu ); my $v_str = $version; my $multiple_versions = grep { $_ ne $version } values %$versions; @@ -166,7 +170,7 @@ sub do_show { $package_page .= title( $title ); if (my $provided_by = $page->{provided_by}) { - note( _g( "This is also a virtual package provided by ").join( ', ', map { "$_" } @$provided_by) ); + note( _g( "This is also a virtual package provided by ").join( ', ', map { "$_" } @$provided_by) ); } if ($suite eq "experimental") { @@ -180,6 +184,7 @@ sub do_show { ); } $package_page .= pdesc( $short_desc, $long_desc ); + $package_page .= ptags( $pkg, @tags ) if @tags; # # display dependencies @@ -198,9 +203,6 @@ sub do_show { if ( $dep_list ) { $package_page .= "\n"; $package_page .= sprintf( ""._g( "Other Packages Related to %s" )."
\n", $pkg ); - if ($suite eq "experimental") { - note( sprintf( _g( 'Note that the experimental distribution is not self-contained; missing dependencies are likely found in the unstable distribution.' ), "$ROOT/unstable/" ) ); - } $package_page .= pdeplegend( [ 'dep', _g( 'depends' ) ], [ 'rec', _g( 'recommends' ) ], @@ -226,18 +228,23 @@ sub do_show { $package_page .= ""._g( "Package Size")." "._g("Installed Size")." "._g("Files")." \n"; foreach my $a ( @archs ) { $package_page .= "\n"; - $package_page .= " $a \n"; $package_page .= "".$versions->{$a}." " if $multiple_versions; + $package_page .= ''; + # package size + $package_page .= sprintf(_g('%.1f kB'), + floor(($sizes_deb->{$a}/102.4)+0.5)/10); $package_page .= ' '; - $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10 . " kB"; - $package_page .= ' '; - $package_page .= $sizes_inst->{$a} . " kB"; + # installed size + $package_page .= sprintf(_g('%d kB'), + $sizes_inst->{$a}); $package_page .= " \n"; - if ( $suite ne "experimental" ) { + if ( ($suite ne "experimental") + && ($subsection ne 'debian-installer')) { $package_page .= sprintf( "["._g( "list of files" )."]\n", - "$ROOT/$suite/$encodedpkg/$a/filelist", $pkg ); + make_url("$encodedpkg/$a/filelist",''), $pkg ); } else { $package_page .= _g( "no current information" ); } @@ -260,11 +267,11 @@ sub do_show { $$menu .= simple_menu( [ _g( "Distribution:" ), _g( "Overview over this distribution" ), - "$ROOT/", + make_url('/',''), $suite ], [ _g( "Section:" ), _g( "All packages in this section" ), - "$ROOT/$suite/virtual/", + make_url("virtual/",''), 'virtual' ], ); @@ -302,11 +309,11 @@ sub do_show { $$menu .= simple_menu( [ _g( "Distribution:" ), _g( "Overview over this suite" ), - "/$suite/", + make_url('/',''), $suite ], [ _g( "Section:" ), _g( "All packages in this section" ), - "/$suite/$subsection/", + make_url("$subsection/",''), $subsection ], ); @@ -351,10 +358,6 @@ sub do_show { if ( $dep_list ) { $package_page .= " \n"; $package_page .= sprintf( ""._g( "Other Packages Related to %s" )."
\n", $pkg ); - if ($suite eq "experimental") { - note( sprintf( _g( 'Note that the experimental distribution is not self-contained; missing dependencies are likely found in the unstable distribution.' ), "$ROOT/unstable/" ) ); - - } $package_page .= pdeplegend( [ 'adep', _g( 'build-depends' ) ], [ 'idep', _g( 'build-depends-indep' ) ], @@ -382,19 +385,9 @@ sub do_show { foreach( @$source_files ) { my ($src_file_md5, $src_file_size, $src_file_name) = split /\s+/, $_; - my $src_url; - for ($archive) { - /security/o && do { - $src_url = $FTP_SITES{security}; last }; - /volatile/o && do { - $src_url = $FTP_SITES{volatile}; last }; - /backports/o && do { - - $src_url = $FTP_SITES{backports}; last }; - /non-us/io && do { - $src_url = $FTP_SITES{'non-US'}; last }; - $src_url = $FTP_SITES{us}; - } + (my $server = lc $archive) =~ s/-//go; # non-US hack + my $src_url = $FTP_SITES{$server} + || $FTP_SITES{us}; $src_url .= "/$source_dir/$src_file_name"; $package_page .= "$src_file_name \n"