X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FMatcher.pm;h=6a7c4f22269a74d7675b38383e53a78c06365d73;hb=7f9c747a3c8c4711d3f2e909677a6a049dd3d95d;hp=c0634ec3a3ffacce6577e5e48967aaa84b9235d8;hpb=4f44847c11add59ab7d0c55aeffac1fa2835cc1f;p=koha.git

diff --git a/C4/Matcher.pm b/C4/Matcher.pm
index c0634ec3a3..6a7c4f2226 100644
--- a/C4/Matcher.pm
+++ b/C4/Matcher.pm
@@ -626,6 +626,8 @@ sub get_matches {
 
     my %matches = ();
 
+    my $QParser;
+    $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
     foreach my $matchpoint (@{ $self->{'matchpoints'} }) {
         my @source_keys = _get_match_keys($source_record, $matchpoint);
         next if scalar(@source_keys) == 0;
@@ -634,31 +636,36 @@ sub get_matches {
         my $error;
         my $searchresults;
         my $total_hits;
-        if ($self->{'record_type'} eq 'biblio') {
-            $query = join(" or ", map { "$matchpoint->{'index'}=$_" } @source_keys);
-# FIXME only searching biblio index at the moment
+        if ($QParser) {
+            $query = join(" || ", map { "$matchpoint->{'index'}:$_" } @source_keys);
             require C4::Search;
-            ($error, $searchresults, $total_hits) = C4::Search::SimpleSearch($query, 0, $max_matches);
-        } elsif ($self->{'record_type'} eq 'authority') {
-            my $authresults;
-            my @marclist;
-            my @and_or;
-            my @excluding = [];
-            my @operator;
-            my @value;
-            foreach my $key (@source_keys) {
-                push @marclist, $matchpoint->{'index'};
-                push @and_or, 'or';
-                push @operator, 'exact';
-                push @value, $key;
-            }
-            require C4::AuthoritiesMarc;
-            ($authresults, $total_hits) = C4::AuthoritiesMarc::SearchAuthorities(
-                    \@marclist, \@and_or, \@excluding, \@operator,
-                    \@value, 0, 20, undef, 'AuthidAsc', 1
-            );
-            foreach my $result (@$authresults) {
-                push @$searchresults, $result->{'authid'};
+            ($error, $searchresults, $total_hits) = C4::Search::SimpleSearch($query, 0, $max_matches, [ $self->{'record_type'} . 'server' ] );
+        } else {
+            if ($self->{'record_type'} eq 'biblio') {
+                $query = join(" or ", map { "$matchpoint->{'index'}=$_" } @source_keys);
+                require C4::Search;
+                ($error, $searchresults, $total_hits) = C4::Search::SimpleSearch($query, 0, $max_matches);
+            } elsif ($self->{'record_type'} eq 'authority') {
+                my $authresults;
+                my @marclist;
+                my @and_or;
+                my @excluding = [];
+                my @operator;
+                my @value;
+                foreach my $key (@source_keys) {
+                    push @marclist, $matchpoint->{'index'};
+                    push @and_or, 'or';
+                    push @operator, 'exact';
+                    push @value, $key;
+                }
+                require C4::AuthoritiesMarc;
+                ($authresults, $total_hits) = C4::AuthoritiesMarc::SearchAuthorities(
+                        \@marclist, \@and_or, \@excluding, \@operator,
+                        \@value, 0, 20, undef, 'AuthidAsc', 1
+                        );
+                foreach my $result (@$authresults) {
+                    push @$searchresults, $result->{'authid'};
+                }
             }
         }