use Deb::Versions;
use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @SECTIONS
- @ARCHITECTURES %FTP_SITES );
+ @ARCHITECTURES %FTP_SITES @DDTP_LANGUAGES);
use Packages::I18N::Locale;
-use Packages::CGI qw( :DEFAULT make_url make_search_url note );
+use Packages::CGI qw( :DEFAULT make_url make_search_url );
use Packages::DB;
use Packages::Search qw( :all );
use Packages::Page ();
our @EXPORT = qw( do_show );
sub do_show {
- my ($params, $opts, $html_header, $page_contents) = @_;
+ my ($params, $opts, $page_contents) = @_;
if ($params->{errors}{package}) {
fatal_error( _g( "package not valid or not specified" ) );
}
unless (@results || @non_results ) {
- fatal_error( _g( "No such package." )."<br>".
- sprintf( _g( '<a href="%s">Search for the package</a>' ), make_search_url('','keywords='.uri_escape($pkg)) ) );
+ fatal_error( _g( "No such package.") );
+ #sprintf( _g( '<a href="%s">Search for the package</a>' ), make_search_url('','keywords='.uri_escape($pkg)) ) );
} else {
my %all_suites;
foreach (@results, @non_results) {
my $std = timediff($st1, $st0);
debug( "Data search and merging took ".timestr($std) ) if DEBUG;
+ my @similar = find_similar( $pkg, "$DBDIR/xapian/",
+ \%did2pkg );
+ $contents{similar} = \@similar;
+
my $did = $page->get_newest( 'description' );
- my @complete_tags = split(/, /, $page->get_newest( 'tag' ));
+ my $desc_md5 = $page->get_newest( 'description-md5' );
+ my @complete_tags = split(/, /, $page->get_newest( 'tag' )||'' );
my @tags;
foreach (@complete_tags) {
my ($facet, $tag) = split( /::/, $_, 2);
- # handle tags like devel::{lang:c,lang:c++}
- if ($tag =~ s/^\{(.+)\}$/$1/) {
- foreach (split( /,/, $tag )) {
- next if $tag =~ /^special:/;
- push @tags, [ $facet, $_ ];
- }
- } else {
- next if $tag =~ /^special:/;
- push @tags, [ $facet, $tag ];
- }
+ next if $facet =~ /^special/;
+ next if $tag =~ /^special:/;
+ push @tags, [ $facet, $tag ];
}
$contents{tags} = \@tags;
# process description
#
- my $desc = $descriptions{$did};
- $short_desc = encode_entities( $1, "<>&\"" )
- if $desc =~ s/^(.*)$//m;
- my $long_desc = encode_entities( $desc, "<>&\"" );
+ sub process_description {
+ my ($desc) = @_;
- $long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go; # syntax highlighting -> '];
- $long_desc =~ s/\A //o;
- $long_desc =~ s/\n /\n/sgo;
- $long_desc =~ s/\n.\n/\n<p>\n/go;
- $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n<pre>$1\n<\/pre>/sgo;
+ my $short_desc = encode_entities( $1, "<>&\"" )
+ if $desc =~ s/^(.*)$//m;
+ my $long_desc = encode_entities( $desc, "<>&\"" );
- $contents{desc} = { short => $short_desc,
- long => $long_desc, };
+ $long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go; # syntax highlighting -> '];
+ $long_desc =~ s/\A //o;
+ $long_desc =~ s/\n /\n/sgo;
+ $long_desc =~ s/\n.\n/\n<p>\n/go;
+ $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n<pre>$1\n<\/pre>/sgo;
+
+ return ($short_desc, $long_desc);
+ }
+
+ my $desc = $descriptions{$did};
+ my $long_desc;
+ ($short_desc, $long_desc) = process_description($desc);
+
+ $contents{desc}{en} = { short => $short_desc,
+ long => $long_desc, };
+
+ debug( "desc_md5=$desc_md5", 2)
+ if DEBUG;
+ my $trans_desc = $desctrans{$desc_md5};
+ if ($trans_desc) {
+ my %trans_desc = split /\000|\001/, $trans_desc;
+ $contents{used_langs} = ['en', sort keys %trans_desc];
+ debug( "TRANSLATIONS: ".join(" ",keys %trans_desc), 2)
+ if DEBUG;
+ while (my ($l, $d) = each %trans_desc) {
+ my ($short_t, $long_t) = process_description($d);
+
+ $contents{desc}{$l} = { short => $short_t,
+ long => $long_t, };
+ }
+ }
my $v_str = $version;
my $multiple_versions = grep { $_ ne $version } values %$versions;
my @downloads;
foreach my $a ( @archs ) {
my %d = ( arch => $a,
- pkgsize => sprintf( '%.1f', floor(($sizes_deb->{$a}/102.4)+0.5)/10 ),
+ pkgsize => floor(($sizes_deb->{$a}/102.4)+0.5)/10,
instsize => $sizes_inst->{$a}, );
$d{version} = $versions->{$a} if $multiple_versions;
foreach( @$source_files ) {
my ($src_file_md5, $src_file_size, $src_file_name)
= split /\s+/, $_;
- (my $server = lc $archive) =~ s/-//go; # non-US hack
- $server = $FTP_SITES{$server}
+ my $server = $FTP_SITES{lc $archive}
|| $FTP_SITES{us};
my $path = "/$source_dir/$src_file_name";
push @{$contents{srcfiles}}, { server => $server, path => $path, filename => $src_file_name,
- size => sprintf("%.1f", (floor(($src_file_size/102.4)+0.5)/10)),
+ size => floor(($src_file_size/102.4)+0.5)/10,
md5sum => $src_file_md5 };
}
foreach( @$files ) {
my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
my ($server, $path);
- # non-US hack
- ($server = lc $page->get_newest('archive')) =~ s/-//go;
- $server = $env->{$server}||$env->{us};
+ $server = $env->{lc $page->get_newest('archive')}||$env->{us};
$path = "/$src_dir/$src_file_name";
push @downloads, { name => $src_file_name, server => $server, path => $path };
}
(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;
$contents->{files}{changelog}{path} = "$src_dir/$src_basename/changelog";
$contents->{files}{copyright}{path} = "$src_dir/$src_basename/".( $is_source ? 'copyright' : "$name.copyright" );
if ($arch_str ||= '') {
if ($arch_neg) {
- $arch_str = _g("not")." $arch_str";
+ $arch_str = sprintf( _g("not %s"), "$arch_str" );
} else {
$arch_str = $arch_str;
}