Packages::Dispatcher: Work around breakage in etch's CGI.pm

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

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 66b09441ba1ea72d84de6578e200a488971bf099..52f451e0a9bf52a20a9d3c0c5cfc800a66f25a0b 100644 (file)
--- 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
@@ -58,6 +58,7 @@ our @ISA = qw( Exporter );
 our @EXPORT_OK = qw( read_entry read_entry_all read_entry_simple
                     read_src_entry read_src_entry_all find_binaries
                     do_names_search do_fulltext_search do_xapian_search
+                    find_similar
                     );
 our %EXPORT_TAGS = ( all => [ @EXPORT_OK ] );
 
@@ -73,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')
@@ -102,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) = @_;
@@ -122,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;
     }
@@ -198,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!
@@ -208,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);
 
@@ -240,6 +241,50 @@ sub do_xapian_search {
     }
 }
 
+sub find_similar {
+    my ($pkg, $dbpath, $did2pkg) = @_;
+
+    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 @terms;
+    my $term_it = $first_match->termlist_begin();
+    my $term_end = $first_match->termlist_end();
+
+    for (; $term_it ne $term_end; $term_it++) {
+       debug( "TERM: ".$term_it->get_termname(), 3);
+       push @terms, $term_it->get_termname();
+    }
+
+    my $rel_enq = $db->enquire( OP_OR, @terms );
+    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);
+
+    my (@order, %tmp_results);
+    foreach my $match ( @rel_pkg ) {
+       my $id = $match->get_docid();
+       my $result = $did2pkg->{$id};
+
+       foreach (split /\000/o, $result) {
+           my @data = split /\s/, $_, 3;
+           debug ("Considering $data[0], arch = $data[2], relevance=".$match->get_percent(), 3) if DEBUG;
+           next if $data[0] eq $pkg;
+           unless ($tmp_results{$data[0]}++) {
+               push @order, $data[0];
+           }
+       }
+    }
+    undef $db;
+
+    debug ("ORDER: @order", 2) if DEBUG;
+    return @order[0..10];
+}
+
 sub find_binaries {
     my ($pkg, $archive, $suite, $src2bin) = @_;