X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=6a6baf6c9e4055241d577ae97b97801cf5cce21b;hb=4452916120a65632430780fd0eb16f63811517b9;hp=8d43b3be56d4cbf5e37851f5a88aa0da24e164e6;hpb=9f26e8bcb912da43661983f13714c3e56f406007;p=deb%2Fpackages.git diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm index 8d43b3b..6a6baf6 100644 --- a/lib/Packages/HTML.pm +++ b/lib/Packages/HTML.pm @@ -3,27 +3,25 @@ package Packages::HTML; use strict; use warnings; +use Exporter; 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 ); #use Packages::Util; -#use Packages::I18N::Locale; -#use Packages::I18N::Languages; -#use Packages::I18N::LanguageNames; +use Packages::I18N::Locale; +use Packages::I18N::Languages; +use Packages::I18N::LanguageNames; #use Generated::Strings qw( gettext dgettext ); -# dummy routines -sub get_charset { return "utf-8" }; -sub gettext { return $_[0]; }; - 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 note title marker pdesc + ds_begin ds_item ds_end title marker pdesc pdeplegend pkg_list pmoreinfo print_deps print_src_deps ); our $CHANGELOG_URL = '/changelogs'; @@ -52,7 +50,7 @@ sub title { } sub marker { - return "[$_[0]]"; + return "[$_[0]]"; } sub pdesc { @@ -69,7 +67,7 @@ sub pdesc { } sub pdeplegend { - my $str = "
[0].gif\" alt=\"[$entry->[0]]\" width=\"16\" height=\"16\">= $entry->[1] | "; @@ -81,17 +79,20 @@ sub pdeplegend { sub pkg_list { my ( $packages, $opts, $pkgs, $lang ) = @_; + my $suite = $opts->{suite}[0]; my $str = ""; - foreach my $p ( @$pkgs ) { + foreach my $p ( sort @$pkgs ) { - my $short_desc = (read_entry_simple( $packages, $p, $opts->{h_archives}, $opts->{suite}))->[-1]; + # 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 .= "