X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=9f019fb79449758b1fc73701ae07a7b9c665b809;hb=81a4fde2110a6dcc82e8c6c938dc56fdb53fe6e2;hp=526b1e860d2f83c2f698dea16080d3d09481b740;hpb=20e10a3bde4a51bfabc7f4ac47422163a01f29e1;p=deb%2Fpackages.git
diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index 526b1e8..9f019fb 100644
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -52,7 +52,7 @@ sub title {
}
sub marker {
- return "[$_[0]]";
+ return "[$_[0]]";
}
sub pdesc {
@@ -69,7 +69,7 @@ sub pdesc {
}
sub pdeplegend {
- my $str = "
\n";
+ my $str = "\n";
foreach my $entry (@_) {
$str .= "[0].gif\" alt=\"[$entry->[0]]\" width=\"16\" height=\"16\">= $entry->[1] | ";
@@ -243,10 +243,12 @@ sub dep_item {
sub print_deps {
my ( $packages, $opts, $pkg, $relations, $type) = @_;
my %dep_type = ('depends' => 'dep', 'recommends' => 'rec',
- 'suggests' => 'sug');
+ 'suggests' => 'sug', 'build-depends' => 'adep',
+ 'build-depends-indep' => 'idep' );
my $res = "\n";
my $first = 1;
my $suite = $opts->{suite}[0];
+ my $one_archive = @{$opts->{archive}} > 1 ? '': $opts->{archive}[0];
# use Data::Dumper;
# debug( "print_deps called:\n".Dumper( $pkg, $relations, \$type ), 3 );
@@ -272,14 +274,14 @@ sub print_deps {
my ( $p_name, $pkg_version, $arch_neg,
$arch_str, $subsection, $available ) = @$rel_alt;
- if ($arch_str) {
+ if ($arch_str ||= '') {
if ($arch_neg) {
$arch_str = " [".gettext("not")." $arch_str]";
} else {
$arch_str = " [$arch_str]";
}
}
- $pkg_version = "($pkg_version)" if $pkg_version;
+ $pkg_version = "($pkg_version)" if $pkg_version ||= '';
my @results;
my %entries;
@@ -287,18 +289,27 @@ sub print_deps {
read_entry_simple( $packages, $p_name, $opts->{h_archives}, $suite);
my $short_desc = $entry->[-1];
my $arch = $entry->[2];
+ my $archive = $entry->[0];
if ( $short_desc ) {
+ my $path = $one_archive eq $archive ? "$suite/$archive" :
+ $suite;
if ( $is_old_pkgs ) {
- push @res_pkgs, dep_item( "$ROOT/$suite/$p_name",
+ push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
$p_name, "$pkg_version$arch_str" );
} elsif ($arch eq 'virtual') {
- $short_desc = "virtual package";
- push @res_pkgs, dep_item( "$ROOT/$suite/$p_name",
+ my @provided_by = split /\s/, $short_desc;
+ $short_desc = "virtual package provided by ";
+ if (@provided_by < 10) {
+ $short_desc .= join( ', ',map { "$_" } @provided_by);
+ } else {
+ $short_desc .= scalar(@provided_by)." packages";
+ }
+ push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
$p_name, "$pkg_version$arch_str", $short_desc );
} else {
$entries{$p_name} ||= $entry;
$short_desc = encode_entities( $short_desc, "<>&\"" );
- push @res_pkgs, dep_item( "$ROOT/$suite/$p_name",
+ push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
$p_name, "$pkg_version$arch_str", $short_desc );
}
} elsif ( $is_old_pkgs ) {
@@ -321,51 +332,6 @@ sub print_deps {
return $res;
} # end print_deps
-sub print_src_deps {
- my ( $packages, $opts, $pkg, $relations, $type) = @_;
- my %dep_type = ('build-depends' => 'adep', 'build-depends-indep' => 'idep' );
- my $suite = $opts->{suite}[0];
- my $res = "\n";
- foreach my $dep (@$relations) {
- my @res_pkgs;
- $res .= "- ";
- foreach my $or_dep ( @$dep ) {
- my $p_name = $or_dep->[0];
- my $p_version = $or_dep->[1] ? "(".encode_entities( $or_dep->[1] ).
- " $or_dep->[2]) " : "";
- my $not = gettext( "not" );
- my $arch_str = '';
- if ($or_dep->[3] && @{$or_dep->[3]}) {
- # as either all or no archs have to be prepended with
- # exlamation marks, convert the first and delete the others
- if ($or_dep->[3][0] =~ /^!/) {
- $arch_str = "$not ";
- foreach (@{$or_dep->[3]}) {
- $_ =~ s/^!//go;
- }
- }
- $arch_str = " [${arch_str}@{$or_dep->[3]}]";
- }
- my $short_desc = (read_entry_simple( $packages, $p_name, $opts->{h_archives}, $suite))->[-1];
- if ( $short_desc ) {
- $short_desc = encode_entities( $short_desc, "<>&\"" );
- push @res_pkgs, dep_item( "/$suite/$p_name", $p_name, "$p_version$arch_str", $short_desc );
- } else {
- $short_desc = gettext( "Package not available" );
- push @res_pkgs, dep_item( undef, $p_name, "$p_version$arch_str", $short_desc );
- }
- }
- $res .= "\n".join( "
- \n".gettext( "or" )." ", @res_pkgs )."
\n";
- }
- if (@$relations) {
- $res .= "\n
";
- } else {
- $res = "";
- }
- return $res;
-} # end print_src_deps
-
-
my $ds_begin = '';
my $ds_item_desc = '- ';
my $ds_item = ':
- ';
@@ -412,11 +378,11 @@ sub header {
all => "",
sourcenames => "",
contents => "");
- $checked_searchon{$params{searchon}} = "checked=\"checked\"";
+ $checked_searchon{$values{searchon}} = "checked=\"checked\"";
$checked_searchon{names} = "checked=\"checked\""
- if $params{searchon} eq 'default';
+ if $values{searchon} eq 'default';
$search_in_header = <
@@ -494,6 +460,7 @@ $KEYWORDS_LINE
$DESC_LINE
$meta
+