X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=30158c54b42d35ce6f5dcc91e8b008aac502efb3;hb=2cd81017ac27717adcda738074294c4f5cd9e4cd;hp=0f760858f76b291e78594ab7d5130af524a4bb9b;hpb=9a4026fe965e926943d8c4ba74204dddc2190ea9;p=deb%2Fpackages.git diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm index 0f76085..30158c5 100644 --- a/lib/Packages/DoShow.pm +++ b/lib/Packages/DoShow.pm @@ -12,7 +12,7 @@ use Exporter; 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::DB; @@ -24,7 +24,7 @@ our @ISA = qw( Exporter ); 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" ) ); @@ -111,6 +111,8 @@ sub do_show { debug( "find source package: source=$source", 1) if DEBUG; my $src_data = $sources_all{"$archive $suite $source"}; + #FIXME: should be $main_archive or similar, not hardcoded "us" + $src_data = $sources_all{"us $suite $source"} unless $src_data; $page->add_src_data( $source, $src_data ) if $src_data; @@ -118,8 +120,21 @@ sub do_show { 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 @tags = map { [ split( /::/, $_) ] } 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); + next if $facet =~ /^special/; + next if $tag =~ /^special:/; + push @tags, [ $facet, $tag ]; + } + $contents{tags} = \@tags; $contents{debtags_voc} = \%debtags; @@ -136,19 +151,44 @@ sub do_show { # process description # - my $desc = $descriptions{$did}; - $short_desc = encode_entities( $1, "<>&\"" ) - if $desc =~ s/^(.*)$//m; - my $long_desc = encode_entities( $desc, "<>&\"" ); - - $long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),$1$3,go; # syntax highlighting -> ']; - $long_desc =~ s/\A //o; - $long_desc =~ s/\n /\n/sgo; - $long_desc =~ s/\n.\n/\n
\n/go; - $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n
$1\n<\/pre>/sgo; + sub process_description { + my ($desc) = @_; + + my $short_desc = encode_entities( $1, "<>&\"" ) + if $desc =~ s/^(.*)$//m; + my $long_desc = encode_entities( $desc, "<>&\"" ); + + $long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),$1$3,go; # syntax highlighting -> ']; + $long_desc =~ s/\A //o; + $long_desc =~ s/\n /\n/sgo; + $long_desc =~ s/\n.\n/\n\n/go; + $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n
$1\n<\/pre>/sgo; + + return ($short_desc, $long_desc); + } - $contents{desc} = { short => $short_desc, - long => $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; @@ -163,6 +203,9 @@ sub do_show { # # display dependencies # + build_deps( \%packages, $opts, $pkg, + $page->get_dep_field('pre-depends'), + 'depends', \%contents ); build_deps( \%packages, $opts, $pkg, $page->get_dep_field('depends'), 'depends', \%contents ); @@ -183,6 +226,7 @@ sub do_show { instsize => $sizes_inst->{$a}, ); $d{version} = $versions->{$a} if $multiple_versions; + $d{archive} = $archives->{$a}; if ( ($suite ne "experimental") && ($subsection ne 'debian-installer')) { $d{contents_avail} = 1; @@ -262,8 +306,7 @@ sub do_show { 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"; @@ -316,17 +359,10 @@ sub moreinfo { if (defined($files) and @$files) { foreach( @$files ) { my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_; - my ($name, $server, $path); - # non-US hack - ($server = lc $page->get_newest('archive')) =~ s/-//go; - $server = $env->{$server}||$env->{us}; - $path = "$src_dir/$src_file_name"; - if ($src_file_name =~ /dsc$/) { - $name = 'dsc' - } else { - $name = $src_file_name; - } - push @downloads, { name => $name, server => $server, path => $path }; + my ($server, $path); + $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 }; } } $contents->{src}{downloads} = \@downloads; @@ -337,7 +373,6 @@ sub moreinfo { (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" );