X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoSearch.pm;h=53a6f082aa0a727af610acd96d6feacf27f6530f;hb=02ce5077a342d33136fe8e3a8568f8291d25e11a;hp=630411f5de9e76db68997d25bd6bce62947c24b1;hpb=d9c10aaf0bb03bfb75404f9041967b9f91012bdb;p=deb%2Fpackages.git diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm index 630411f..53a6f08 100644 --- a/lib/Packages/DoSearch.pm +++ b/lib/Packages/DoSearch.pm @@ -15,12 +15,14 @@ use Deb::Versions; use Packages::Search qw( :all ); use Packages::CGI; use Packages::DB; -use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_CGI $SEARCH_PAGE +use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_PAGE @SUITES @ARCHIVES $ROOT ); sub do_search { my ($params, $opts, $html_header, $menu, $page_content) = @_; + $Params::Search::too_many_hits = 0; + if ($params->{errors}{keywords}) { fatal_error( "keyword not valid or missing" ); } elsif (length($opts->{keywords}) < 2) { @@ -37,6 +39,7 @@ sub do_search { 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"; # for output my $keyword_enc = encode_entities $keyword || ''; @@ -123,7 +126,10 @@ sub do_search { if ($opts->{exact}) { $printed++; - hint( "You have searched only for words exactly matching your keywords. You can try to search allowing subword matching." ); + hint( "You have searched only for words exactly matching your + keywords. You can try to search {common_params}")."\">allowing + subword matching." ); } } hint( ( $printed ? "Or you" : "You" )." can try a different search on the Packages search page." ); @@ -219,20 +225,21 @@ sub print_packages { my ($pkgs, $pkgs_list, $opts, $keyword, $print_func, @func_args) = @_; #my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts ); - my $str .= "
Found ".(scalar @$pkgs_list)." matching packages."; + my $str = '
Found ".(scalar @$pkgs_list)." matching packages."; #my $count = 0; my $have_exact; if (grep { $_ eq $keyword } @$pkgs_list) { $have_exact = 1; - $str .= '
".
+ $str .= " {common_params}")."\">".
($#{$pkgs_list}+1)." results have not been displayed because you requested only exact matches.