X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=be7bebd05f1aee4e9f635fd38be82cf7a47dd677;hb=dca4de5b14feaa1befdc86ddba6e373a6cf429e2;hp=6c0d79997fd1fdbe0c0f43666f8417587c075314;hpb=7a5ca633d65f3e890f74aa8aba17accbc17ac432;p=deb%2Fpackages.git

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 6c0d799..be7bebd 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -1,8 +1,8 @@
 #
 # Packages::Search
 #
-# Copyright (C) 2004-2006 Frank Lichtenheld <frank@lichtenheld.de>
-# 
+# Copyright (C) 2004-2007 Frank Lichtenheld <frank@lichtenheld.de>
+#
 # The code is based on the old search_packages.pl script that
 # was:
 #
@@ -23,7 +23,7 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
 =head1 NAME
@@ -103,11 +103,11 @@ sub read_entry {
 
 #FIXME: make configurable
 my %fallback_suites = (
-		       'oldstable-backports' => 'oldstable',
-		       'oldstable-volatile' => 'oldstable',
-		       'stable-backports' => 'stable',
-		       'stable-volatile' => 'stable',
-		       experimental => 'unstable' );
+		       'sarge-backports' => 'sarge',
+		       'sarge-volatile' => 'sarge',
+		       'etch-backports' => 'etch',
+		       'etch-volatile' => 'etch',
+		       experimental => 'sid' );
 
 sub read_entry_simple {
     my ($hash, $key, $archives, $suite) = @_;
@@ -209,10 +209,10 @@ sub do_xapian_search {
 	push @tmp, $keyword;
     }
     my $stemmer = Lingua::Stem->new();
-    my $stemmed_keywords = $stemmer->stem( @tmp );
+    my @stemmed_keywords = grep { length($_) } @{$stemmer->stem( @tmp )};
 
     my $db = Search::Xapian::Database->new( $dbpath );
-    my $enq = $db->enquire( OP_OR, @$keywords, @$stemmed_keywords );
+    my $enq = $db->enquire( OP_OR, @$keywords, @stemmed_keywords );
     debug( "Xapian Query was: ".$enq->get_query()->get_description(), 1) if DEBUG;
     my @matches = $enq->matches(0, 999);