our @EXPORT = qw( do_search );
use Deb::Versions;
+use Packages::I18N::Locale;
use Packages::Search qw( :all );
-use Packages::CGI;
+use Packages::CGI qw( :DEFAULT msg error );
use Packages::DB;
-use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_PAGE
- @SUITES @ARCHIVES $ROOT );
+use Packages::Config qw( $DBDIR @SUITES @ARCHIVES $ROOT );
sub do_search {
- my ($params, $opts, $html_header, $menu, $page_content) = @_;
+ my ($params, $opts, $html_header, $page_content) = @_;
$Params::Search::too_many_hits = 0;
if ($params->{errors}{keywords}) {
- fatal_error( "keyword not valid or missing" );
- } elsif (length($opts->{keywords}) < 2) {
- fatal_error( "keyword too short (keywords need to have at least two characters)" );
+ fatal_error( _g( "keyword not valid or missing" ) );
+ $opts->{keywords} = [];
+ } elsif (grep { length($_) < 2 } @{$opts->{keywords}}) {
+ fatal_error( _g( "keyword too short (keywords need to have at least two characters)" ) );
}
- $$menu = "";
-
- my $keyword = $opts->{keywords};
+ my @keywords = @{$opts->{keywords}};
my $searchon = $opts->{searchon};
# for URL construction
- my $keyword_esc = uri_escape( $keyword );
- my $suites_param = join ',', @{$params->{values}{suite}{no_replace}};
- my $sections_param = join ',', @{$params->{values}{section}{no_replace}};
- my $archs_param = join ',', @{$params->{values}{arch}{no_replace}};
- $opts->{common_params} = "suite=$suites_param§ion=$sections_param&keywords=$keyword_esc&searchon=$searchon&arch=$archs_param";
+ my $keyword_esc = uri_escape( "@keywords" );
+ $opts->{keywords_esc} = $keyword_esc;
# for output
- my $keyword_enc = encode_entities $keyword || '';
+ my $keyword_enc = encode_entities "@keywords" || '';
my $searchon_enc = encode_entities $searchon;
my $suites_enc = encode_entities( join( ', ', @{$params->{values}{suite}{no_replace}} ) );
my $sections_enc = encode_entities( join( ', ', @{$params->{values}{section}{no_replace}} ) );
if ($searchon eq 'names') {
if ($opts->{source}) {
- do_names_search( $keyword, \%sources, $sp_obj,
+ do_names_search( [ @keywords ], \%sources, $sp_obj,
\&read_src_entry_all, $opts,
\@results, \@non_results );
} else {
- do_names_search( $keyword, \%packages, $p_obj,
+ do_names_search( [ @keywords ], \%packages, $p_obj,
\&read_entry_all, $opts,
\@results, \@non_results );
}
-# } elsif ($searchon eq 'contents') {
-# require "./search_contents.pl";
-# &contents($input);
} else {
- do_names_search( $keyword, \%packages, $p_obj,
+ do_names_search( [ @keywords ], \%packages, $p_obj,
\&read_entry_all, $opts,
\@results, \@non_results );
- do_fulltext_search( $keyword, "$DBDIR/descriptions.txt",
+ do_fulltext_search( [ @keywords ], "$DBDIR/descriptions.txt",
\%did2pkg, \%packages,
\&read_entry_all, $opts,
\@results, \@non_results );
}
# use Data::Dumper;
-# debug( join( "", Dumper( \@results, \@non_results )) );
+# debug( join( "", Dumper( \@results, \@non_results )) ) if DEBUG;
my $st1 = new Benchmark;
my $std = timediff($st1, $st0);
- debug( "Search took ".timestr($std) );
+ debug( "Search took ".timestr($std) ) if DEBUG;
- my $suite_wording = $suites_enc eq "all" ? "all suites"
- : "suite(s) <em>$suites_enc</em>";
- my $section_wording = $sections_enc eq 'all' ? "all sections"
- : "section(s) <em>$sections_enc</em>";
- my $arch_wording = $archs_enc eq 'any' ? "all architectures"
- : "architecture(s) <em>$archs_enc</em>";
+ my $suite_wording = $suites_enc =~ /^(default|all)$/ ? _g("all suites")
+ : sprintf(_g("suite(s) <em>%s</em>", $suites_enc) );
+ my $section_wording = $sections_enc eq 'all' ? _g("all sections")
+ : sprintf(_g("section(s) <em>%s</em>", $sections_enc) );
+ my $arch_wording = $archs_enc eq 'any' ? _g("all architectures")
+ : sprintf(_g("architecture(s) <em>%s</em>", $archs_enc) );
if ($searchon eq "names") {
- my $source_wording = $opts->{source} ? "source " : "";
- my $exact_wording = $opts->{exact} ? "named" : "that names contain";
- msg( "You have searched for ${source_wording}packages $exact_wording <em>$keyword_enc</em> in $suite_wording, $section_wording, and $arch_wording." );
+ my $source_wording = $opts->{source} ? _g("source packages") : _g("packages");
+ # sorry to all translators for that one... (patches welcome)
+ msg( sprintf( _g( "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s." ),
+ $source_wording, $keyword_enc,
+ $suite_wording, $section_wording, $arch_wording ) );
} else {
- my $exact_wording = $opts->{exact} ? "" : " (including subword matching)";
- msg( "You have searched for <em>$keyword_enc</em> in packages names and descriptions in $suite_wording, $section_wording, and $arch_wording$exact_wording." );
+ my $exact_wording = $opts->{exact} ? "" : _g(" (including subword matching)");
+ msg( sprintf( _g( "You have searched for <em>%s</em> in packages names and descriptions in %s, %s, and %s%s." ),
+ $keyword_enc,
+ $suite_wording, $section_wording, $arch_wording,
+ $exact_wording ) );
}
if ($Packages::Search::too_many_hits) {
- error( "Your search was too wide so we will only display exact matches. At least <em>$Packages::Search::too_many_hits</em> results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords." );
+ error( sprintf( _g( "Your search was too wide so we will only display exact matches. At least <em>%s</em> results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords." ), $Packages::Search::too_many_hits ) );
}
if (!@Packages::CGI::fatal_errors && !@results) {
- my $printed = 0;
if ($searchon eq "names") {
unless (@non_results) {
- error( "Can't find that package." );
+ error( _g( "Can't find that package." ) );
} else {
- hint( "Can't find that package. ".
- "<a href=\"$SEARCH_URL/$keyword_esc\">".
- ($#non_results+1)."</a>".
- " results have not been displayed due to the".
- " search parameters." );
+# hint( _g( "Can't find that package." )." ".
+# sprintf( _g( '<a href="%s">%s</a>'.
+# " results have not been displayed due to the".
+# " search parameters." ), "$SEARCH_URL/$keyword_esc" ,
+# $#non_results+1 ) );
}
} else {
if (($suites_enc eq 'all')
&& ($archs_enc eq 'any')
&& ($sections_enc eq 'all')) {
- error( "Can't find that string." );
+ error( _g( "Can't find that string." ) );
} else {
- error( "Can't find that string, at least not in that suite ($suites_enc, section $sections_enc) and on that architecture ($archs_enc)." );
+ error( sprintf( _g( "Can't find that string, at least not in that suite (%s, section %s) and on that architecture (%s)." ),
+ $suites_enc, $sections_enc, $archs_enc ) );
}
if ($opts->{exact}) {
- $printed++;
- hint( "You have searched only for words exactly matching your
- keywords. You can try to search <a href=\"".
- encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}")."\">allowing
- subword matching</a>." );
+ hint( sprintf( _g( 'You have searched only for words exactly matching your keywords. You can try to search <a href="%s">allowing subword matching</a>.' ),
+ encode_entities(make_search_url('',"keywords=$keyword_esc",{exact => 0})) ) );
}
}
- hint( ( $printed ? "Or you" : "You" )." can try a different search on the <a href=\"$SEARCH_PAGE#search_packages\">Packages search page</a>." );
+# hint( sprintf( _g( 'You can try a different search on the <a href="%s">Packages search page</a>.' ), "$SEARCH_PAGE#search_packages" ) );
}
- %$html_header = ( title => 'Package Search Results' ,
- lang => 'en',
- title_tag => 'Debian Package Search Results',
- print_title => 1,
- print_search_field => 'packages',
- search_field_values => {
- keywords => $keyword_enc,
- searchon => $opts->{searchon_form},
- arch => $archs_enc,
- suite => $suites_enc,
- section => $sections_enc,
- exact => $opts->{exact},
- debug => $opts->{debug},
- },
- );
-
- $$page_content = '';
+ $page_content->{make_url} = sub { return &Packages::CGI::make_url(@_) };
+ $page_content->{make_search_url} = sub { return &Packages::CGI::make_search_url(@_) };
+
+ $page_content->{search_field_values} = {
+ keywords => $keyword_enc,
+ searchon => $opts->{searchon_form},
+ arch => $archs_enc,
+ suite => $suites_enc,
+ section => $sections_enc,
+ exact => $opts->{exact},
+ debug => $opts->{debug},
+ };
+
if (@results) {
my (%pkgs, %subsect, %sect, %archives, %desc, %binaries, %provided_by);
my ($pkg) = $pkg_t =~ m/^(.+)/; # untaint
if ($arch ne 'virtual') {
- my $real_archive;
- if ($archive =~ /^(security|non-US)$/) {
- $real_archive = $archive;
- $archive = 'us';
- }
-
- $pkgs{$pkg}{$suite}{$archive}{$version}{$arch} = 1;
- $subsect{$pkg}{$suite}{$archive}{$version} = $subsection;
- $sect{$pkg}{$suite}{$archive}{$version} = $section
- unless $section eq 'main';
- $archives{$pkg}{$suite}{$archive}{$version} = $real_archive
- if $real_archive;
+ $pkgs{$pkg}{$suite}{$version}{$arch} = 1;
+ $subsect{$pkg}{$suite}{$version} = $subsection;
+ $sect{$pkg}{$suite}{$version} = $section;
+ $archives{$pkg}{$suite}{$version} ||= $archive;
- $desc{$pkg}{$suite}{$archive}{$version} = $desc;
+ $desc{$pkg}{$suite}{$version} = $desc;
} else {
- $provided_by{$pkg}{$suite}{$archive} = [ split /\s+/, $desc ];
+ $provided_by{$pkg}{$suite} = [ split /\s+/, $desc ];
}
}
- my @pkgs = sort(keys %pkgs, keys %provided_by);
- $$page_content .= print_packages( \%pkgs, \@pkgs, $opts, $keyword,
- \&print_package, \%provided_by,
- \%archives, \%sect, \%subsect,
- \%desc );
+ my %uniq_pkgs = map { $_ => 1 } (keys %pkgs, keys %provided_by);
+ my @pkgs = sort keys %uniq_pkgs;
+ process_packages( $page_content, 'packages', \%pkgs, \@pkgs, $opts, \@keywords,
+ \&process_package, \%provided_by,
+ \%archives, \%sect, \%subsect,
+ \%desc );
} else { # unless $opts->{source}
foreach (@results) {
}
my @pkgs = sort keys %pkgs;
- $$page_content .= print_packages( \%pkgs, \@pkgs, $opts, $keyword,
- \&print_src_package, \%archives,
- \%sect, \%subsect, \%binaries );
+ process_packages( $page_content, 'src_packages', \%pkgs, \@pkgs, $opts, \@keywords,
+ \&process_src_package, \%archives,
+ \%sect, \%subsect, \%binaries );
} # else unless $opts->{source}
} # if @results
} # sub do_search
-sub print_packages {
- my ($pkgs, $pkgs_list, $opts, $keyword, $print_func, @func_args) = @_;
+sub process_packages {
+ my ($content, $target, $pkgs, $pkgs_list, $opts, $keywords, $print_func, @func_args) = @_;
- #my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts );
- my $str = '<div id="psearchres">';
- $str .= "<p>Found <em>".(scalar @$pkgs_list)."</em> matching packages.";
- #my $count = 0;
+ my @categories;
+ $content->{results} = scalar @$pkgs_list;
+
+ my $keyword;
+ $keyword = $keywords->[0] if @$keywords == 1;
my $have_exact;
- if (grep { $_ eq $keyword } @$pkgs_list) {
+ if ($keyword && grep { $_ eq $keyword } @$pkgs_list) {
$have_exact = 1;
- $str .= '<h2>Exact hits</h2>';
- $str .= &$print_func( $keyword, $pkgs->{$keyword}||{},
- map { $_->{$keyword}||{} } @func_args );
+ $categories[0]{name} = _g( "Exact hits" );
+
+ $categories[0]{$target} = [ &$print_func( $keyword, $pkgs->{$keyword}||{},
+ map { $_->{$keyword}||{} } @func_args ) ];
@$pkgs_list = grep { $_ ne $keyword } @$pkgs_list;
}
if (@$pkgs_list && (($opts->{searchon} ne 'names') || !$opts->{exact})) {
- $str .= '<h2>Other hits</h2>'
- if $have_exact;
+ my %cat;
+ $cat{name} = _g( 'Other hits' ) if $have_exact;
+ $cat{packages} = [];
foreach my $pkg (@$pkgs_list) {
- #$count++;
- #next if $count < $start or $count > $end;
- $str .= &$print_func( $pkg, $pkgs->{$pkg}||{},
- map { $_->{$pkg}||{} } @func_args );
+ push @{$cat{$target}}, &$print_func( $pkg, $pkgs->{$pkg}||{},
+ map { $_->{$pkg}||{} } @func_args );
}
+ push @categories, \%cat;
} elsif (@$pkgs_list) {
- $str .= "<p><a href=\"".encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}")."\">".
- ($#{$pkgs_list}+1)."</a> results have not been displayed because you requested only exact matches.</p>";
+ $content->{skipped} = scalar @$pkgs_list;
}
- $str .= '</div>';
- return $str;
+ $content->{categories} = \@categories;
}
-sub print_package {
+sub process_package {
my ($pkg, $pkgs, $provided_by, $archives, $sect, $subsect, $desc) = @_;
- my $str = sprintf "<h3>Package %s</h3>\n", $pkg;
- $str .= "<ul>\n";
+ my %pkg = ( pkg => $pkg,
+ suites => [] );
+
foreach my $suite (@SUITES) {
- foreach my $archive (@ARCHIVES) {
- next if $archive eq 'security';
- next if $archive eq 'non-US';
- my $path = $suite.(($archive ne 'us')?"/$archive":'');
- if (exists $pkgs->{$suite}{$archive}) {
- my %archs_printed;
- my @versions = version_sort keys %{$pkgs->{$suite}{$archive}};
- my $origin_str = "";
- if ($sect->{$suite}{$archive}{$versions[0]}) {
- $origin_str .= " ".marker($sect->{$suite}{$archive}{$versions[0]});
- }
- $str .= sprintf( "<li><a href=\"$ROOT/%s/%s\">%s</a> (%s): %s %s\n",
- $path, $pkg, $path, $subsect->{$suite}{$archive}{$versions[0]},
- $desc->{$suite}{$archive}{$versions[0]}, $origin_str );
+ my %suite = ( suite => $suite );
+ if (exists $pkgs->{$suite}) {
+ my %archs_printed;
+ my @versions = version_sort keys %{$pkgs->{$suite}};
+ $suite{section} = $sect->{$suite}{$versions[0]};
+ $suite{subsection} = $subsect->{$suite}{$versions[0]};
+ $suite{desc} = $desc->{$suite}{$versions[0]};
+ $suite{versions} = [];
- foreach my $v (@versions) {
- my $archive_str = "";
- if ($archives->{$suite}{$archive}{$v}) {
- $archive_str .= " ".marker($archives->{$suite}{$archive}{$v});
- }
+ foreach my $v (@versions) {
+ my %version;
+ $version{version} = $v;
+ $version{archive} = $archives->{$suite}{$v};
- my @archs_to_print = grep { !$archs_printed{$_} } sort keys %{$pkgs->{$suite}{$archive}{$v}};
- $str .= sprintf( "<br>%s$archive_str: %s\n",
- $v, join (" ", @archs_to_print ))
- if @archs_to_print;
- $archs_printed{$_}++ foreach @archs_to_print;
- }
- if (my $p = $provided_by->{$suite}{$archive}) {
- $str .= '<br>also provided by: '.
- join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>" } @$p);
- }
- $str .= "</li>\n";
- } elsif (my $p = $provided_by->{$suite}{$archive}) {
- $str .= sprintf( "<li><a href=\"$ROOT/%s/%s\">%s</a>: Virtual package<br>",
- $path, $pkg, $path );
- $str .= 'provided by: '.
- join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>" } @$p);
+ $version{architectures} = [ grep { !$archs_printed{$_} } sort keys %{$pkgs->{$suite}{$v}} ];
+ push @{$suite{versions}}, \%version if @{$version{architectures}};
+
+ $archs_printed{$_}++ foreach @{$version{architectures}};
+ }
+ if (my $p = $provided_by->{$suite}) {
+ $suite{providers} = $p;
}
+ } elsif (my $p = $provided_by->{$suite}) {
+ $suite{desc} = _g('Virtual package');
+ $suite{providers} = $p;
}
+ push @{$pkg{suites}}, \%suite if $suite{versions} || $suite{providers};
}
- $str .= "</ul>\n";
- return $str;
+
+ return \%pkg;
}
-sub print_src_package {
+sub process_src_package {
my ($pkg, $pkgs, $archives, $sect, $subsect, $binaries) = @_;
- my $str = sprintf "<h3>Source package %s</h3>\n", $pkg;
- $str .= "<ul>\n";
+ my %pkg = ( pkg => $pkg,
+ origins => [] );
+
foreach my $suite (@SUITES) {
foreach my $archive (@ARCHIVES) {
if (exists $pkgs->{$suite}{$archive}) {
- my $origin_str = "";
- if ($sect->{$suite}{$archive}{source}) {
- $origin_str .= " ".marker($sect->{$suite}{$archive}{source});
- }
- if ($archives->{$suite}{$archive}{source}) {
- $origin_str .= " ".marker($archives->{$suite}{$archive}{source});
- }
- $str .= sprintf( "<li><a href=\"$ROOT/%s/source/%s\">%s</a> (%s): %s %s",
- $suite.(($archive ne 'us')?"/$archive":''), $pkg, $suite.(($archive ne 'us')?"/$archive":''), $subsect->{$suite}{$archive}{source},
- $pkgs->{$suite}{$archive}, $origin_str );
-
- $str .= "<br>Binary packages: ";
- my @bp_links;
- foreach my $bp (@{$binaries->{$suite}{$archive}}) {
- my $bp_link = sprintf( "<a href=\"$ROOT/%s/%s\">%s</a>",
- $suite.(($archive ne 'us')?"/$archive":''), uri_escape( $bp ), $bp );
- push @bp_links, $bp_link;
- }
- $str .= join( ", ", @bp_links );
- $str .= "</li>\n";
+ my %origin;
+ $origin{version} = $pkgs->{$suite}{$archive};
+ $origin{suite} = $suite;
+ $origin{archive} = $archive;
+ $origin{section} = $sect->{$suite}{$archive}{source};
+ $origin{subsection} = $subsect->{$suite}{$archive}{source};
+ $origin{real_archive} = $archives->{$suite}{$archive}{source};
+
+ $origin{binaries} = $binaries->{$suite}{$archive};
+ push @{$pkg{origins}}, \%origin;
}
}
}
- $str .= "</ul>\n";
- return $str;
+
+ return \%pkg;
}
1;
projects / deb / packages.git / blobdiff