From 4f761bb6904b127990b8d1e993ea67098f8cdb7c Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Thu, 29 Dec 2016 13:50:55 +1300
Subject: [PATCH] Revert "Bug 17278: Use available limit when requesting zebra
 when ccl query is used"

This reverts commit 81e19a289471654f5f89408a2fe5020dbd48e7e9.
---
 C4/Search.pm            |  9 ++-------
 t/db_dependent/Search.t | 10 ++--------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index dd5982816d..d9a193c641 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1471,15 +1471,10 @@ sub buildQuery {
         # This is needed otherwise ccl= and &limit won't work together, and
         # this happens when selecting a subject on the opac-detail page
         @limits = grep {!/^$/} @limits;
-        my $original_q = $q; # without available part
         if ( @limits ) {
-            if ( grep { /^available$/ } @limits ) {
-                $q .= q| and ( ( allrecords,AlwaysMatches:'' not onloan,AlwaysMatches:'') and (lost,st-numeric=0) )|;
-                delete $limits['available'];
-            }
-            $q .= ' and '.join(' and ', @limits) if @limits;
+            $q .= ' and '.join(' and ', @limits);
         }
-        return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $original_q, '', '', '', 'ccl' );
+        return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', 'ccl' );
     }
     if ( $query =~ /^cql=/ ) {
         return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', 'cql' );
diff --git a/t/db_dependent/Search.t b/t/db_dependent/Search.t
index 86b4612719..f2803affa1 100644
--- a/t/db_dependent/Search.t
+++ b/t/db_dependent/Search.t
@@ -609,12 +609,6 @@ if ( $indexing_mode eq 'dom' ) {
     ($error, $results_hashref, $facets_loop) = getRecords($query,$simple_query,[ ], [ 'biblioserver' ],20,0,undef,\%branches,\%itemtypes,$query_type,0);
     is($results_hashref->{biblioserver}->{hits}, undef, "Search for 'pressed' returns no matches when stemming is off");
 
-    ( $error, $query, $simple_query, $query_cgi,
-    $query_desc, $limit, $limit_cgi, $limit_desc,
-    $query_type ) = buildQuery([], [ 'ccl=an:42' ], [], ['available'], [], 0, 'en');
-    is( $query, 'an:42 and ( ( allrecords,AlwaysMatches:'' not onloan,AlwaysMatches:'') and (lost,st-numeric=0) )', 'buildQuery should add the available part to the query if requested with ccl' );
-    is( $query_desc, 'an:42', 'buildQuery should remove the available part from the query' );
-
     # Let's see what happens when we pass bad data into these routines.
     # We have to catch warnings since we're not very good about returning errors.
 
@@ -962,12 +956,12 @@ sub run_unimarc_search_tests {
 }
 
 subtest 'MARC21 + GRS-1' => sub {
-    plan tests => 109;
+    plan tests => 107;
     run_marc21_search_tests('grs1');
 };
 
 subtest 'MARC21 + DOM' => sub {
-    plan tests => 109;
+    plan tests => 107;
     run_marc21_search_tests('dom');
 };
 
-- 
2.39.5