-# Packages/Search.pm:do_fulltext_search
- $plain_description =~ tr [A-Z] [a-z];
- # ensure one space on both ends
- $plain_description = " $plain_description ";
- $plain_description =~ s/[(),.-]+//og;
- $plain_description =~ s#[^a-z0-9_/+]+# #og;
- print DESCR "$plain_description\n";
- $descriptions_db{$i} = $descriptions[$i];
+# Packages/Search.pm:do_xapian_search
+ $only_desc =~ s#[^\w/+]+# #og;
+
+ #XAPIAN
+ eval {
+ my @words = split /\s+/, $only_desc;
+ unshift @words, $pkg;
+
+ my $doc = Search::Xapian::Document->new()
+ or die "can't create doc object for $i: $!\n";
+ if ($doc->set_data($i)){
+ warn "can't set_data in doc object for $i: $!\n";
+ }
+
+ # package with prefix
+ if ($doc->add_term("P$pkg")) {
+ warn "can't add term P$pkg: $!\n";
+ }
+ # description, unstemmed with positional info
+ for my $j (0 .. (@words-1)) {
+ next if $words[$j] =~ /^\s*$/o;
+ if ($doc->add_posting($words[$j], $j)) {
+ warn "can't add posting $words[$j] at $j: $!\n";
+ }
+ }
+ # description, stemmed
+ my $stem_words = $stemmer->stem( \@words );
+ foreach my $w (@$stem_words) {
+ next if $w =~ /^\s*$/o;
+ if ($doc->add_term($w)) {
+ warn "can't add term $w: $!\n";
+ }
+ }
+ if ($tags) {
+ foreach my $t (split /, /, $tags) {
+ if ($doc->add_term($t)) {
+ warn "can't add term $t: $!\n";
+ }
+ }
+ }
+
+ $xapian_db->add_document($doc)
+ or warn "failed to add document: $i\n";
+ };
+ die $@ if $@;
+
+ $descriptions_db{$i} = $orig_desc;