Description Search: Move to Xapian

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

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index 2603ff9a10c848333643f27e98a6f450e4c36611..a94dd7bc33e46fd54415cbc50011d9e45b7128b4 100644 (file)
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -53,10 +53,22 @@ sub do_search {
            do_names_search( [ @keywords ], \%packages, $p_obj,
                             \&read_entry_all, $opts,
                             \@results, \@non_results );
-           do_fulltext_search( [ @keywords ], "$DBDIR/descriptions.txt",
+#          my $fts0 = new Benchmark;
+#          do_fulltext_search( [ @keywords ], "$DBDIR/descriptions.txt",
+#                              \%did2pkg, \%packages,
+#                              \&read_entry_all, $opts,
+#                              \@results, \@non_results );
+           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_grep = timediff($fts1,$fts0);
+           my $fts_xapian = timediff($fts2,$fts1);
+#          debug( "Fulltext search took ".timestr($fts_grep)." (grep)" ) if DEBUG;
+           debug( "Fulltext search took ".timestr($fts_xapian)." (Xapian)" )
+               if DEBUG;
        }
     }