X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=a291a0028b6285d15e76880f35c9e1dfead4af1b;hb=f46c14dbc13274569f533b19e27c61960ea9bacd;hp=90c95691805b873655feeafca185a9cb08d1ad48;hpb=344794b96a00a8df993bbc0743d05715d2682681;p=deb%2Fpackages.git diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm index 90c9569..a291a00 100644 --- a/lib/Packages/HTML.pm +++ b/lib/Packages/HTML.pm @@ -24,7 +24,7 @@ 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 - pdeplegend pkg_list pmoreinfo print_deps ); + pdeplegend pkg_list pmoreinfo print_deps print_src_deps ); our $CHANGELOG_URL = '/changelogs'; @@ -79,38 +79,27 @@ sub pdeplegend { return $str; } -# sub pkg_list { -# my ( $pkgs, $lang, $env ) = @_; - -# my $str = ""; -# foreach my $p ( @$pkgs ) { -# my $p_pkg = $env->{db}->get_pkg( $p ); - -# if ( $p_pkg ) { -# if ($p_pkg->is_virtual) { -# $str .= "
$p
\n". -# "\t
".gettext("Virtual package")."
\n"; -# } else { -# my %subsections = $p_pkg->get_arch_fields( 'section', -# $env->{archs} ); -# my $subsection = $subsections{max_unique}; -# my %desc_md5s = $p_pkg->get_arch_fields( 'description-md5', -# $env->{archs} ); -# my $short_desc = conv_desc( $lang, -# encode_entities( $env->{db}->get_short_desc( $desc_md5s{max_unique}, $lang ), "<>&\"" ) ); -# $str .= "
$p
\n". -# "\t
$short_desc
\n"; -# } -# } else { -# $str .= "
$p
\n\t
".gettext("Not available")."
\n"; -# } -# } -# if ($str) { -# $str = "
$str
\n"; -# } - -# return $str; -# } +sub pkg_list { + my ( $packages, $opts, $pkgs, $lang ) = @_; + + my $str = ""; + foreach my $p ( @$pkgs ) { + + my $short_desc = (read_entry_simple( $packages, $p, $opts->{h_archives}, $opts->{suite}))->[-1]; + + if ( $short_desc ) { + $str .= "
{suite}/$p\">$p
\n". + "\t
$short_desc
\n"; + } else { + $str .= "
$p
\n\t
".gettext("Not available")."
\n"; + } + } + if ($str) { + $str = "
$str
\n"; + } + + return $str; +} sub pmoreinfo { my %info = @_; @@ -124,7 +113,6 @@ sub pmoreinfo { my $str = "
"; $str .= sprintf( "

".gettext( "More Information on %s" )."

", $name ); - if ($info{bugreports}) { my $bug_url = $is_source ? $SRC_BUG_URL : $BUG_URL; @@ -132,7 +120,7 @@ sub pmoreinfo { $bug_url.$name, $name ); } - my $source = $page->get_src( 'name' ); + my $source = $page->get_src( 'package' ); my $source_version = $page->get_src( 'version' ); my $src_dir = $page->get_src('directory'); if ($info{sourcedownload}) { @@ -154,6 +142,8 @@ sub pmoreinfo { $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\">["; @@ -270,7 +260,7 @@ sub print_deps { } else { $res .= "\n
  • "; } - $res .= "
    \"[$dep_type{$type}]\" "; + $res .= "
    \"[$dep_type{$type}]\" "; } foreach my $rel_alt ( @$rel ) { @@ -321,56 +311,48 @@ sub print_deps { return $res; } # end print_deps -# sub print_src_deps { -# my ( $env, $lang, $pkg, $version, $type) = @_; -# my %dep_type = ('build-depends' => 'adep', 'build-depends-indep' => 'idep' ); -# my $found = 0; -# my $res = "
      \n"; -# foreach my $dep ( @{$pkg->{versions}{$version}{$type}} ) { -# $found = 1; -# my @res_pkgs; -# $res .= "
    • \"[$dep_type{$type}]\" "; -# foreach my $or_dep ( @$dep ) { -# my $p_name = $or_dep->[0]; -# my $p = $env->{db}->get_pkg( $p_name ); -# my $p_version = $or_dep->[1] ? "(".encode_entities( $or_dep->[1] ). -# " $or_dep->[2]) " : ""; -# my $not = gettext( "not" ); -# if ($or_dep->[3]) { -# $or_dep->[3] =~ s/\s+/, /go; -# # as either all or no archs have to be prepended with -# # exlamation marks, convert the first and delete the others -# $or_dep->[3] =~ s/!\s*/$not /o; -# $or_dep->[3] =~ s/!\s*//go; -# } -# my $arch_str = $or_dep->[3] ? " [$or_dep->[3]]" : ""; -# if ( $p ) { -# if ( $p->is_virtual ) { -# my $short_desc = gettext( "Virtual package" ); -# push @res_pkgs, dep_item( "../virtual/$p_name", $p_name, "$p_version$arch_str", $short_desc ); -# } else { -# my %sections = $p->get_arch_fields( 'section', -# $env->{archs} ); -# my $section = $sections{max_unique}; -# my %desc_md5s = $p->get_arch_fields( 'description-md5', -# $env->{archs} ); -# my $short_desc = conv_desc( $lang, encode_entities( $env->{db}->get_short_desc( $desc_md5s{max_unique}, $lang ), "<>&\"" ) ); -# push @res_pkgs, dep_item( "../$section/$p_name", $p_name, "$p_version$arch_str", $short_desc ); -# } -# } else { -# my $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 ($found) { -# $res .= "\n
    "; -# } else { -# $res = ""; -# } -# return $res; -# } # end print_src_deps +sub print_src_deps { + my ( $packages, $opts, $pkg, $relations, $type) = @_; + my %dep_type = ('build-depends' => 'adep', 'build-depends-indep' => 'idep' ); + my $res = "
      \n"; + foreach my $dep (@$relations) { + my @res_pkgs; + $res .= "
    • \"[$dep_type{$type}]\" "; + 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}, $opts->{suite}))->[-1]; + if ( $short_desc ) { + $short_desc = encode_entities( $short_desc, "<>&\"" ); + push @res_pkgs, dep_item( "/$opts->{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 = '
    ';