X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPackages%2FHTML.pm;h=16ba8c789126ce6a878854c691904d19908279ed;hb=ef769eaccb9ebf7f49b8c3240c9c4d6980072ee5;hp=da024339886679c74eca96bbf8df1a1a1bf9f470;hpb=87124f967c3da82618899b3d2c114981b12ffb7f;p=deb%2Fpackages.git
diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index da02433..16ba8c7 100644
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -8,6 +8,7 @@ use HTML::Entities;
use Packages::CGI;
use Packages::Search qw( read_entry_simple );
+use Packages::Config qw( :all );
#use Packages::Util;
#use Packages::I18N::Locale;
@@ -23,12 +24,8 @@ 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 ( $HOME, $ROOT, $CONTACT_MAIL, $WEBMASTER_MAIL,
- $SEARCH_PAGE, $SEARCH_CGI, $SEARCH_URL,
- $SRC_SEARCH_URL, $CONTENTS_SEARCH_CGI,
- $CN_HELP_URL, $BUG_URL, $SRC_BUG_URL, $QA_URL );
our $CHANGELOG_URL = '/changelogs';
sub img {
@@ -75,58 +72,49 @@ sub pdeplegend {
my $str = "
\n";
foreach my $entry (@_) {
- $str .= "[0].gif\" alt=\"[$entry->[0]]\" width=\"16\" height=\"16\">= $entry->[1] | ";
+ $str .= "[0].gif\" alt=\"[$entry->[0]]\" width=\"16\" height=\"16\">= $entry->[1] | ";
}
$str .= "\n
\n";
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 $suite = $opts->{suite}[0];
+
+ my $str = "";
+ foreach my $p ( @$pkgs ) {
+
+ my $short_desc = (read_entry_simple( $packages, $p, $opts->{h_archives}, $suite))->[-1];
+
+ if ( $short_desc ) {
+ $str .= "$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 = @_;
my $name = $info{name} or return;
my $env = $info{env} or return;
+ my $opts = $info{opts} or return;
my $page = $info{data} or return;
my $is_source = $info{is_source};
+ my $suite = $opts->{suite}[0];
my $str = "";
$str .= sprintf( "
".gettext( "More Information on %s" )."
",
$name );
-
if ($info{bugreports}) {
my $bug_url = $is_source ? $SRC_BUG_URL : $BUG_URL;
@@ -134,25 +122,30 @@ 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}) {
my $files = $page->get_src( 'files' );
+ my $path = (@{$opts->{archive}} >1) ?
+ $suite :
+ "$suite/$opts->{archive}[0]";
$str .= gettext( "Source Package:" );
- $str .= "
$source, ".
+ $str .= "
$source, ".
gettext( "Download" ).":\n";
- unless (@$files) {
+ unless (defined($files) and @$files) {
$str .= gettext( "Not found" );
} else {
foreach( @$files ) {
- my ($src_file_md5, $src_file_size, $src_file_name) = @$_;
+ 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\">[";
@@ -186,35 +179,38 @@ sub pmoreinfo {
}
if ($info{maintainers}) {
- my @uploaders = @{$page->get_src( 'uploaders' )};
- foreach (@uploaders) {
- $_->[0] = encode_entities( $_->[0], '&<>' );
- }
- my ($maint_name, $maint_mail ) = @{shift @uploaders};
- unless (@uploaders) {
- $str .= "\n".sprintf( gettext( "%s is responsible for this Debian package." ).
- "\n",
- "$maint_name"
- );
- } else {
- my $up_str = "$maint_name";
- my @uploaders_str;
- foreach (@uploaders) {
- push @uploaders_str, "[1]\">$_->[0]";
+ my $uploaders = $page->get_src( 'uploaders' );
+ if ($uploaders && @$uploaders) {
+ foreach (@$uploaders) {
+ $_->[0] = encode_entities( $_->[0], '&<>' );
+ }
+ my ($maint_name, $maint_mail) = @{shift @$uploaders};
+ unless (@$uploaders) {
+ $str .= "
\n".sprintf( gettext( "%s is responsible for this Debian package." ).
+ "\n",
+ "$maint_name"
+ );
+ } else {
+ my $up_str = "$maint_name";
+ my @uploaders_str;
+ foreach (@$uploaders) {
+ push @uploaders_str, "[1]\">$_->[0]";
+ }
+ my $last_up = pop @uploaders_str;
+ $up_str .= ", ".join ", ", @uploaders_str if @uploaders_str;
+ $up_str .= sprintf( gettext( " and %s are responsible for this Debian package." ), $last_up );
+ $str .= "
\n$up_str ";
}
- my $last_up = pop @uploaders_str;
- $up_str .= ", ".join ", ", @uploaders_str if @uploaders_str;
- $up_str .= sprintf( gettext( " and %s are responsible for this Debian package." ), $last_up );
- $str .= "
\n$up_str ";
}
- $str .= sprintf( gettext( "See the developer information for %s." )."
", $QA_URL.$source, $name );
+ $str .= sprintf( gettext( "See the developer information for %s." )."", $QA_URL.$source, $name ) if $source;
}
if ($info{search}) {
my $encodedname = uri_escape( $name );
- my $search_url = $is_source ? $SRC_SEARCH_URL : $SEARCH_URL;
- $str .= "
".sprintf( gettext( "Search for other versions of %s" ), $search_url.$encodedname, $name )."
\n";
+ my $search_url = $is_source ? "$ROOT/source" : $ROOT;
+ $str .= "
".sprintf( gettext( "Search for other versions of %s" ),
+ "$search_url/$encodedname", $name )."
\n";
}
$str .= "
\n";
@@ -250,6 +246,7 @@ sub print_deps {
'suggests' => 'sug');
my $res = "\n";
my $first = 1;
+ my $suite = $opts->{suite}[0];
# use Data::Dumper;
# debug( "print_deps called:\n".Dumper( $pkg, $relations, \$type ), 3 );
@@ -267,7 +264,7 @@ sub print_deps {
} else {
$res .= "\n- ";
}
- $res .= "
- ";
+ $res .= "
- ";
}
foreach my $rel_alt ( @$rel ) {
@@ -285,17 +282,23 @@ sub print_deps {
$pkg_version = "($pkg_version)" if $pkg_version;
my @results;
- my %short_descs;
- my $short_desc = $short_descs{$p_name} ||
- (read_entry_simple( $packages, $p_name, $opts->{suite}))->[-1];
+ my %entries;
+ my $entry = $entries{$p_name} ||
+ read_entry_simple( $packages, $p_name, $opts->{h_archives}, $suite);
+ my $short_desc = $entry->[-1];
+ my $arch = $entry->[2];
if ( $short_desc ) {
if ( $is_old_pkgs ) {
- push @res_pkgs, dep_item( "/$opts->{suite}/$p_name",
+ push @res_pkgs, dep_item( "$ROOT/$suite/$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",
+ $p_name, "$pkg_version$arch_str", $short_desc );
} else {
- $short_descs{$p_name} ||= $short_desc;
+ $entries{$p_name} ||= $entry;
$short_desc = encode_entities( $short_desc, "<>&\"" );
- push @res_pkgs, dep_item( "/$opts->{suite}/$p_name",
+ push @res_pkgs, dep_item( "$ROOT/$suite/$p_name",
$p_name, "$pkg_version$arch_str", $short_desc );
}
} elsif ( $is_old_pkgs ) {
@@ -318,56 +321,49 @@ 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 .= "- ";
-# 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 $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 = ' ';
@@ -408,12 +404,6 @@ sub header {
my $page_title = $params{page_title} || $params{title} || '';
my $meta = $params{meta} || '';
- if ($params{print_title_above}) {
- $title_in_header = "$title_in_header
";
- } else {
- $title_in_header = '';
- }
-
my $search_in_header = '';
$params{print_search_field} ||= "";
if ($params{print_search_field} eq 'packages') {
@@ -427,11 +417,9 @@ sub header {