Packages::DoDownload: Don't try to numerically compare a localized number

[deb/packages.git] / lib / Packages / DoShow.pm

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index f808f1f7e547b57ea5ac56e1837eafe55c77728f..1f8a0178c7ea1e81a83b7020d717b3aa8662dff3 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -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,22 +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 $desc_md5 = $page->get_newest( 'description-md5' );
-                       my @complete_tags = split(/, /, $page->get_newest( 'tag' ));
+                       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;
@@ -182,6 +179,7 @@ sub do_show {
                        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) {