X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=a3b159b556a0e1a5977a186e44f8d6c736adc237;hb=24ffc8c7b59a3323dcfae1ec99685c6b672ae28a;hp=873a7ea0ab3f00240cd97d0a81d5428c5a512c6c;hpb=f49363dc272472174dd57c663c2688c33af927cd;p=deb%2Fpackages.git
diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index 873a7ea..a3b159b 100644
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -6,6 +6,10 @@ use warnings;
use URI::Escape;
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;
#use Packages::I18N::Languages;
@@ -20,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 );
+ 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 {
@@ -55,19 +55,6 @@ sub marker {
return "[$_[0] ]";
}
-sub note {
- my ( $title, $note ) = @_;
- my $str = "";
-
- if ($note) {
- $str .= "
$title ";
- } else {
- $note = $title;
- }
- $str .= "$note
";
- return $str;
-}
-
sub pdesc {
my ( $short_desc, $long_desc ) = @_;
my $str = "";
@@ -85,7 +72,7 @@ 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";
@@ -93,27 +80,17 @@ sub pdeplegend {
}
sub pkg_list {
- my ( $pkgs, $lang, $env ) = @_;
+ my ( $packages, $opts, $pkgs, $lang ) = @_;
+ my $suite = $opts->{suite}[0];
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".
+ 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";
}
@@ -130,13 +107,14 @@ sub pmoreinfo {
my $name = $info{name} or return;
my $env = $info{env} or return;
- my $d = $info{data} 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;
@@ -144,25 +122,34 @@ sub pmoreinfo {
$bug_url.$name, $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 .= "
{src_name}\">$d->{src_name} , ".
+ $str .= "
$source , ".
gettext( "Download" ).":\n";
- unless ($d->{src_files}) {
+ unless (defined($files) and @$files) {
$str .= gettext( "Not found" );
} else {
- foreach( @{$d->{src_files}} ) {
- my ($src_file_md5, $src_file_size, $src_file_name) = @$_;
- if ($d->{is_security}) {
- $str .= "
{opts}{security_site}/$d->{src_directory}/$src_file_name\">[";
- } elsif ($d->{is_volatile}) {
- $str .= " {opts}{volatile_site}/$d->{src_directory}/$src_file_name\">[";
- } elsif ($d->{is_nonus}) {
- $str .= " {opts}{nonus_site}/$d->{src_directory}/$src_file_name\">[";
- } else {
- $str .= " {opts}{debian_site}/$d->{src_directory}/$src_file_name\">[";
- }
+ foreach( @$files ) {
+ 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\">[";
+ }
if ($src_file_name =~ /dsc$/) {
$str .= "dsc";
} else {
@@ -176,10 +163,9 @@ sub pmoreinfo {
}
if ($info{changesandcopy}) {
- if ( $d->{src_directory} ) {
- my $src_dir = $d->{src_directory};
- (my $src_basename = $d->{src_version}) =~ s,^\d+:,,; # strip epoche
- $src_basename = "$d->{src_name}_$src_basename";
+ if ( $src_dir ) {
+ (my $src_basename = $source_version) =~ s,^\d+:,,; # strip epoche
+ $src_basename = "${source}_$src_basename";
$src_dir =~ s,pool/updates,pool,o;
$src_dir =~ s,pool/non-US,pool,o;
$str .= " ".sprintf( gettext( "View the Debian changelog " ),
@@ -190,44 +176,162 @@ sub pmoreinfo {
$str .= sprintf( gettext( "View the
copyright file " ),
$copyright_url )."";
}
- }
+ }
if ($info{maintainers}) {
- my @uploaders = @{$d->{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.$d->{src_name}, $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";
return $str;
}
+sub dep_item {
+ my ( $link, $name, $info, $desc ) = @_;
+ my $post_link = '';
+ if ($link) {
+ $link = "";
+ $post_link = ' ';
+ } else {
+ $link = '';
+ }
+ if ($info) {
+ $info = " $info";
+ } else {
+ $info = '';
+ }
+ if ($desc) {
+ $desc = "$desc ";
+ } else {
+ $desc = '';
+ }
+
+ return "$link$name$post_link$info$desc";
+} # end dep_item
+
+sub print_deps {
+ my ( $packages, $opts, $pkg, $relations, $type) = @_;
+ my %dep_type = ('depends' => 'dep', 'recommends' => 'rec',
+ '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 );
+
+ foreach my $rel (@$relations) {
+ my $is_old_pkgs = $rel->[0];
+ my @res_pkgs = ();
+
+ if ($is_old_pkgs) {
+ $res .= "";
+ } else {
+ if ($first) {
+ $res .= "";
+ $first = 0;
+ } else {
+ $res .= " \n";
+ }
+ $res .= " ";
+ }
+
+ foreach my $rel_alt ( @$rel ) {
+ next unless ref($rel_alt);
+ my ( $p_name, $pkg_version, $arch_neg,
+ $arch_str, $subsection, $available ) = @$rel_alt;
+
+ if ($arch_str ||= '') {
+ if ($arch_neg) {
+ $arch_str = " [".gettext("not")." $arch_str]";
+ } else {
+ $arch_str = " [$arch_str]";
+ }
+ }
+ $pkg_version = "($pkg_version)" if $pkg_version ||= '';
+
+ my @results;
+ 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];
+ 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/$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 { "$_ " } @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/$path/$p_name",
+ $p_name, "$pkg_version$arch_str", $short_desc );
+ }
+ } elsif ( $is_old_pkgs ) {
+ push @res_pkgs, dep_item( undef, $p_name, "$pkg_version$arch_str" );
+ } else {
+ my $short_desc = gettext( "Package not available" );
+ push @res_pkgs, dep_item( undef, $p_name, "$pkg_version$arch_str", $short_desc );
+ }
+
+ }
+
+ $res .= "\n".join( "".gettext( "or" )." ", @res_pkgs )."\n";
+ }
+ if (@$relations) {
+ $res .= " \n";
+ $res .= " \n";
+ } else {
+ $res = "";
+ }
+ return $res;
+} # end print_deps
+
my $ds_begin = '';
my $ds_item_desc = '';
my $ds_item = ': ';
@@ -266,42 +370,39 @@ 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') {
my %values = %{$params{search_field_values}};
my %checked_searchon = ( names => "",
all => "",
- sourcenames => "", );
+ sourcenames => "",
+ contents => "");
$checked_searchon{$values{searchon}} = "checked=\"checked\"";
+ $checked_searchon{names} = "checked=\"checked\""
+ if $values{searchon} eq 'default';
$search_in_header = <
@@ -358,7 +459,7 @@ MENU
$KEYWORDS_LINE
$DESC_LINE
$meta
-
+