X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=e0814a715ca0d099956074fd314af418f5e9a9e5;hb=76d4bed915a4df2f6d1897cf0e2f4ce775922a25;hp=c8cd39df920de4dca0a2f2f2f9e2cb2cc5ee159d;hpb=a3e6aa1e34000d0a7faa1773bd6bc32c32cfa625;p=deb%2Fpackages.git diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm index c8cd39d..e0814a7 100644 --- a/lib/Packages/HTML.pm +++ b/lib/Packages/HTML.pm @@ -8,7 +8,7 @@ use URI::Escape; use HTML::Entities; use Locale::gettext; -use Packages::CGI (); +use Packages::CGI qw(make_url make_search_url); use Packages::Search qw( read_entry_simple ); use Packages::Config qw( :all ); @@ -21,7 +21,7 @@ use Packages::I18N::LanguageNames; our @ISA = qw( Exporter ); our @EXPORT = qw( header title trailer file_changed time_stamp read_md5_hash write_md5_hash simple_menu - ds_begin ds_item ds_end title marker pdesc + ds_begin ds_item ds_end title marker pdesc ptags pdeplegend pkg_list pmoreinfo print_deps print_src_deps ); our $CHANGELOG_URL = '/changelogs'; @@ -66,6 +66,20 @@ sub pdesc { return $str; } +sub ptags { + my ( $package, @tags ) = @_; + my $str = ""; + + $str .= "
\n

"; + $str .= "Tags:\n"; + foreach my $tag (@tags) { + $str .= "$tag\n"; + } + $str .= "

\n
\n"; + + return $str; +} + sub pdeplegend { my $str = "\n"; @@ -82,12 +96,14 @@ sub pkg_list { my $suite = $opts->{suite}[0]; my $str = ""; - foreach my $p ( @$pkgs ) { + foreach my $p ( sort @$pkgs ) { + # we don't deal with virtual packages here because for the + # current uses of this function this isn't needed my $short_desc = (read_entry_simple( $packages, $p, $opts->{h_archives}, $suite))->[-1]; if ( $short_desc ) { - $str .= "
$p
\n". + $str .= "
undef})."\">$p
\n". "\t
$short_desc
\n"; } else { $str .= "
$p
\n\t
"._g("Not available")."
\n"; @@ -125,11 +141,8 @@ sub pmoreinfo { my $src_dir = $page->get_src('directory'); if ($info{sourcedownload}) { my $files = $page->get_src( 'files' ); - my $path = (@{$opts->{archive}} >1) ? - $suite : - "$suite/$opts->{archive}[0]"; $str .= _g( "Source Package:" ); - $str .= " $source, ". + $str .= " 'source'})."\">$source, ". _g( "Download" ).":\n"; unless (defined($files) and @$files) { @@ -137,17 +150,10 @@ sub pmoreinfo { } else { foreach( @$files ) { my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_; - for ($page->get_newest('archive')) { - /security/o && do { - $str .= "{security}/$src_dir/$src_file_name\">["; last }; - /volatile/o && do { - $str .= "{volatile}/$src_dir/$src_file_name\">["; last }; - /backports/o && do { - $str .= "{backports}/$src_dir/$src_file_name\">["; last }; - /non-us/io && do { - $str .= "{nonus_site}/$src_dir/$src_file_name\">["; last }; - $str .= "{us}/$src_dir/$src_file_name\">["; - } + # non-US hack + (my $server = lc $page->get_newest('archive')) =~ s/-//go; + $str .= sprintf("[", + $env->{$server}||$env->{us}); if ($src_file_name =~ /dsc$/) { $str .= "dsc"; } else { @@ -216,13 +222,11 @@ sub pmoreinfo { } sub dep_item { - my ( $link, $name, $info, $desc ) = @_; - my $post_link = ''; - if ($link) { - $link = ""; + my ( $suite, $name, $info, $desc ) = @_; + my ($link, $post_link) = ('', ''); + if ($suite) { + $link = "$suite,source=>undef})."\">"; $post_link = ''; - } else { - $link = ''; } if ($info) { $info = " $info"; @@ -239,13 +243,15 @@ sub dep_item { } # end dep_item sub provides_string { - my ($path, $entry) = @_; - my @provided_by = split /\s/, $entry; - my $short_desc = "virtual package provided by "; + my ($suite, $entry, $also) = @_; + my %tmp = map { $_ => 1 } split /\s/, $entry; + my @provided_by = keys %tmp; # weed out duplicates + my $short_desc = $also ? _g("also a virtual package provided by ") + : _g("virtual package provided by "); if (@provided_by < 10) { - $short_desc .= join( ', ',map { "$_" } @provided_by); + $short_desc .= join( ', ',map { "$suite,source=>undef})."\">$_" } @provided_by); } else { - $short_desc .= scalar(@provided_by)." packages"; + $short_desc .= sprintf( _g("%s packages"), scalar(@provided_by)); } return $short_desc; } @@ -258,7 +264,6 @@ sub print_deps { my $res = "