#
# 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:
#
#
# 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
}
}
- 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]}
#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) = @_;
}
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!
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);
}
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();
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();
}
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 ) {