X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=1663b8f71ef90a1c119a6ac5ddf4274c1875901e;hb=3210a2b7d904e95b48ebbd84afa2bf1875544e8e;hp=38bfb588eea2c7f1d678771873aa3f08e29bce70;hpb=08852aab550de858d4e4956ea357dbc3ae713a26;p=deb%2Fpackages.git
diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index 38bfb58..1663b8f 100644
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -7,7 +7,8 @@ use URI::Escape;
use HTML::Entities;
use Packages::CGI;
-use Packages::Search qw( read_entry );
+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,7 +72,7 @@ sub pdeplegend {
my $str = "
";
$str .= sprintf( "
".gettext( "More Information on %s" )."
",
$name );
-
if ($info{bugreports}) {
my $bug_url = $is_source ? $SRC_BUG_URL : $BUG_URL;
@@ -134,27 +120,34 @@ 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) ?
+ $opts->{suite} :
+ "$opts->{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) = @$_;
-# 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\">[";
-# }
+ 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 {
@@ -167,53 +160,55 @@ sub pmoreinfo {
# if ($src_version ne $version) && !$src_version_given_in_control;
}
-# 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";
-# $src_dir =~ s,pool/updates,pool,o;
-# $src_dir =~ s,pool/non-US,pool,o;
-# $str .= "
".sprintf( gettext( "View the Debian changelog" ),
-# "$CHANGELOG_URL/$src_dir/$src_basename/changelog" )."
\n";
-# my $copyright_url = "$CHANGELOG_URL/$src_dir/$src_basename/";
-# $copyright_url .= ( $is_source ? 'copyright' : "$name.copyright" );
-
-# $str .= sprintf( gettext( "View the
copyright file" ),
-# $copyright_url )."";
-# }
-# }
+ if ($info{changesandcopy}) {
+ 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" ),
+ "$CHANGELOG_URL/$src_dir/$src_basename/changelog" )."
\n";
+ my $copyright_url = "$CHANGELOG_URL/$src_dir/$src_basename/";
+ $copyright_url .= ( $is_source ? 'copyright' : "$name.copyright" );
+
+ $str .= sprintf( gettext( "View the
copyright file" ),
+ $copyright_url )."";
+ }
+ }
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";
@@ -266,7 +261,7 @@ sub print_deps {
} else {
$res .= "\n