Fix two warnings

[deb/packages.git] / lib / Packages / HTML.pm

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index 28dbb76e64a0a7c4759ae80432dce98fd83b076b..0fc506a189344dfb38a5983fa584ae17a14a9df3 100644 (file)
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -238,6 +238,18 @@ sub dep_item {
     return "$link$name$post_link$info$desc";
 } # end dep_item
 
+sub provides_string {
+    my ($path, $entry) = @_;
+    my @provided_by = split /\s/, $entry;
+    my $short_desc = "virtual package provided by ";
+    if (@provided_by < 10) {
+       $short_desc .= join( ', ',map { "<a href=\"$path/$_\">$_</a>" } @provided_by);
+    } else {
+       $short_desc .= scalar(@provided_by)." packages";
+    }
+    return $short_desc;
+}
+
 sub print_deps {
     my ( $packages, $opts, $pkg, $relations, $type) = @_;
     my %dep_type = ('depends' => 'dep', 'recommends' => 'rec', 
@@ -246,7 +258,6 @@ sub print_deps {
     my $res = "<ul class=\"ul$dep_type{$type}\">\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 ) if DEBUG;
@@ -286,27 +297,24 @@ sub print_deps {
            my $entry = $entries{$p_name} ||
                read_entry_simple( $packages, $p_name, $opts->{h_archives}, $suite);
            my $short_desc = $entry->[-1];
-           my $arch = $entry->[2];
-           my $archive = $entry->[0];
+           my $arch = $entry->[3];
+           my $archive = $entry->[1];
            if ( $short_desc ) {
-               my $path = $one_archive eq $archive ? "$suite/$archive" :
-                   $suite;
+               my $path = $suite;
                if ( $is_old_pkgs ) {
                    push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
                                              $p_name, "$pkg_version$arch_str" );
-               } elsif ($arch eq 'virtual') {
-                   my @provided_by = split /\s/, $short_desc;
-                   $short_desc = "virtual package provided by ";
-                   if (@provided_by < 10) {
-                       $short_desc .= join( ', ',map { "<a href=\"$ROOT/$path/$_\">$_</a>" } @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 {
+               } elsif (defined $entry->[1]) {
                    $entries{$p_name} ||= $entry;
                    $short_desc = encode_entities( $short_desc, "<>&\"" );
+                   $short_desc .= "<br>".provides_string( "$ROOT/$path",
+                                                          $entry->[0] )
+                       if defined $entry->[0];
+                   push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
+                                             $p_name, "$pkg_version$arch_str", $short_desc );
+               } elsif (defined $entry->[0]) {
+                   $short_desc = provides_string( "$ROOT/$path",
+                                                  $entry->[0] );
                    push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
                                              $p_name, "$pkg_version$arch_str", $short_desc );
                }
@@ -382,12 +390,7 @@ sub header {
        $search_in_header = <<MENU;
 <form method="GET" action="$SEARCH_URL">
 <div id="hpacketsearch">
-<input type="hidden" name="debug" value="$values{debug}">
-<input type="hidden" name="suite" value="$values{suite}">
-<input type="hidden" name="exact" value="$values{exact}">
-<input type="hidden" name="arch" value="$values{arch}">
-<input type="hidden" name="section" value="$values{section}">
-<input type="text" size="30" name="keywords" value="$values{keywords}" id="kw">
+<input type="text" size="30" name="keywords" value="" id="kw">
 <input type="submit" value="%s">
 <span style="font-size: 60%%"><a href="$SEARCH_PAGE#search_packages">%s</a></span>
 <br>