X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=52f451e0a9bf52a20a9d3c0c5cfc800a66f25a0b;hb=968c41e87231365eb85c185481b0f3c175c5f65a;hp=021f0fd46196fad9847ce57616e3ebd47da5f802;hpb=9f0c86ad48e5ccdd89c2ae10fc35baee286f3adf;p=deb%2Fpackages.git

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 021f0fd..52f451e 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
@@ -74,16 +74,16 @@ sub read_entry_all {
     while (my ($suite, $provides) = each %virt) {
 	next if $suite eq '-';
 	if ($opts->{h_suites}{$suite}) {
-	    push @$results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+	    push @$results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v', 'v',
 			      $provides];
 	} else {
-	    push @$non_results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+	    push @$non_results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v', 'v',
 				  $provides];
 	}
     }
 
-    foreach (split /\000/o, $result) {
-	my @data = split ( /\s/o, $_, 8 );
+    foreach (split(/\000/o, $result||'')) {
+	my @data = split ( /\s/o, $_, 9 );
 	debug( "Considering entry ".join( ':', @data), 2) if DEBUG;
 	if ($opts->{h_suites}{$data[1]}
 	    && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all')
@@ -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) = @_;
@@ -123,7 +123,7 @@ sub read_entry_simple {
     # with correctly, but it's adequate enough for now
     return [ $virt{$suite} ] unless defined $result;
     foreach (split /\000/o, $result) {
-	my @data = split ( /\s/o, $_, 8 );
+	my @data = split ( /\s/o, $_, 9 );
 	debug( "use entry: @data", 2 ) if DEBUG && $data[1] eq $suite;
 	return [ $virt{$suite}, @data ] if $data[1] eq $suite;
     }
@@ -199,7 +199,7 @@ sub do_names_search {
 }
 
 sub do_xapian_search {
-    my ($keywords, $db, $did2pkg, $packages, $read_entry, $opts,
+    my ($keywords, $dbpath, $did2pkg, $packages, $read_entry, $opts,
 	$results, $non_results) = @_;
 
 # NOTE: this needs to correspond with parse-packages!
@@ -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( $db );
-    my $enq = $db->enquire( OP_OR, @$keywords, @$stemmed_keywords );
+    my $db = Search::Xapian::Database->new( $dbpath );
+    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);
 
@@ -242,9 +242,9 @@ sub do_xapian_search {
 }
 
 sub find_similar {
-    my ($pkg, $db, $did2pkg) = @_;
+    my ($pkg, $dbpath, $did2pkg) = @_;
 
-    my $db = Search::Xapian::Database->new( $db );
+    my $db = Search::Xapian::Database->new( $dbpath );
     my $enq = $db->enquire( "P$pkg" );
     debug( "Xapian Query was: ".$enq->get_query()->get_description(), 1) if DEBUG;
     my $first_match = ($enq->matches(0,1))[0]->get_document();
@@ -253,7 +253,7 @@ sub find_similar {
     my $term_it = $first_match->termlist_begin();
     my $term_end = $first_match->termlist_end();
 
-    for ($term_it; $term_it ne $term_end; $term_it++) {
+    for (; $term_it ne $term_end; $term_it++) {
 	debug( "TERM: ".$term_it->get_termname(), 3);
 	push @terms, $term_it->get_termname();
     }
@@ -262,8 +262,8 @@ sub find_similar {
     debug( "Xapian Query was: ".$rel_enq->get_query()->get_description(), 1) if DEBUG;
     my @rel_pkg = $rel_enq->matches(2,20);
 
-    use Data::Dumper;
-    debug(Dumper(\@rel_pkg),1);
+#    use Data::Dumper;
+#    debug(Dumper(\@rel_pkg),1);
 
     my (@order, %tmp_results);
     foreach my $match ( @rel_pkg ) {