X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=1f8a0178c7ea1e81a83b7020d717b3aa8662dff3;hb=09fb5c8a6858850e45adea21c2b8644babfec3de;hp=3af5e3e7c83056a118a40dcd6ac587677903752b;hpb=38bdd83cda111c78634c4e9824e872a26aa96fc2;p=deb%2Fpackages.git diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm index 3af5e3e..1f8a017 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" ) ); @@ -120,21 +120,19 @@ 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 @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; @@ -153,19 +151,44 @@ sub do_show { # process description # + 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); + } + 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; - - $contents{desc} = { short => $short_desc, - long => $long_desc, }; + 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;