use Packages::Config qw( $DBDIR @SUITES @ARCHIVES $ROOT );
sub do_search {
- my ($params, $opts, $html_header, $page_content) = @_;
+ my ($params, $opts, $page_content) = @_;
$Params::Search::too_many_hits = 0;
do_names_search( [ @keywords ], \%packages, $p_obj,
\&read_entry_all, $opts,
\@results, \@non_results );
- do_fulltext_search( [ @keywords ], "$DBDIR/descriptions.txt",
+ my $fts1 = new Benchmark;
+ do_xapian_search( [ @keywords ], "$DBDIR/xapian/",
\%did2pkg, \%packages,
\&read_entry_all, $opts,
\@results, \@non_results );
+ my $fts2 = new Benchmark;
+ my $fts_xapian = timediff($fts2,$fts1);
+ debug( "Fulltext search took ".timestr($fts_xapian) )
+ if DEBUG;
}
}
if (@results) {
my (%pkgs, %subsect, %sect, %archives, %desc, %binaries, %provided_by);
+ my %sort_by_relevance;
+ for (1 ... scalar @results) {
+# debug("$results[$_][0] => $_", 4) if DEBUG;
+ $sort_by_relevance{$results[$_-1][0]} = $_;
+ }
+# use Data::Dumper;
+# debug( "sort_by_relevance=".Dumper(\%sort_by_relevance), 4);
+
unless ($opts->{source}) {
foreach (@results) {
my ($pkg_t, $archive, $suite, $arch, $section, $subsection,
}
my %uniq_pkgs = map { $_ => 1 } (keys %pkgs, keys %provided_by);
- my @pkgs = sort keys %uniq_pkgs;
+ my @pkgs;
+ if ($searchon eq 'names') {
+ @pkgs = sort keys %uniq_pkgs;
+ } else {
+ @pkgs = sort { $sort_by_relevance{$a} <=> $sort_by_relevance{$b} } keys %uniq_pkgs;
+ }
process_packages( $page_content, 'packages', \%pkgs, \@pkgs, $opts, \@keywords,
\&process_package, \%provided_by,
\%archives, \%sect, \%subsect,