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

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 021f0fd..3a20498 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
@@ -82,7 +82,7 @@ sub read_entry_all {
 	}
     }
 
-    foreach (split /\000/o, $result) {
+    foreach (split(/\000/o, $result||'')) {
 	my @data = split ( /\s/o, $_, 8 );
 	debug( "Considering entry ".join( ':', @data), 2) if DEBUG;
 	if ($opts->{h_suites}{$data[1]}
@@ -101,13 +101,14 @@ sub read_entry {
     read_entry_all( $hash, $key, $results, \@non_results, $opts );
 }
 
-#FIXME: make configurable
-my %fallback_suites = (
-		       'oldstable-backports' => 'oldstable',
-		       'oldstable-volatile' => 'oldstable',
-		       'stable-backports' => 'stable',
-		       'stable-volatile' => 'stable',
-		       experimental => 'unstable' );
+sub fallback_suite {
+    my $suite = shift;
+    if ($suite =~ /^(\S+)-(?:updates|backports)/) {
+	return $1;
+    } else {
+	return undef;
+    }
+}
 
 sub read_entry_simple {
     my ($hash, $key, $archives, $suite) = @_;
@@ -127,7 +128,7 @@ sub read_entry_simple {
 	debug( "use entry: @data", 2 ) if DEBUG && $data[1] eq $suite;
 	return [ $virt{$suite}, @data ] if $data[1] eq $suite;
     }
-    if (my $fb_suite = $fallback_suites{$suite}) {
+    if (my $fb_suite = fallback_suite($suite)) {
 	my $fb_result = read_entry_simple( $hash, $key, $archives, $fb_suite );
 	my $fb_virt = shift(@$fb_result);
 	$virt{$suite} .= $virt{$suite} ? " $fb_virt" : $fb_virt if $fb_virt;
@@ -199,7 +200,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!
@@ -211,7 +212,7 @@ sub do_xapian_search {
     my $stemmer = Lingua::Stem->new();
     my $stemmed_keywords = $stemmer->stem( @tmp );
 
-    my $db = Search::Xapian::Database->new( $db );
+    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 +243,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 +254,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 +263,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 ) {