Revert "Added coverage to unit test for TTParser"

[koha.git] / opac / opac-search.pl

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 176bc12..e39e547 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -21,14 +21,26 @@
 
 # Script to perform searching
 # Mostly copied from search.pl, see POD there
-use strict;            # always use
-use warnings;
+use Modern::Perl;
 
 ## STEP 1. Load things that are used in both search page and
 # results page and decide which template to load, operations 
 # to perform, etc.
 ## load Koha modules
 use C4::Context;
+
+my $searchengine = C4::Context->preference("SearchEngine");
+for ( $searchengine ) {
+    when ( /^Solr$/ ) {
+        warn "We use Solr";
+        require 'opac/search.pl';
+        exit;
+    }
+    when ( /^Zebra$/ ) {
+
+    }
+}
+
 use C4::Output;
 use C4::Auth qw(:DEFAULT get_session);
 use C4::Languages qw(getAllLanguages);
@@ -475,7 +487,7 @@ elsif (C4::Context->preference('NoZebra')) {
     $pasarParams .= '&simple_query=' . $simple_query;
     $pasarParams .= '&query_type=' . $query_type if ($query_type);
     eval {
-        ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
+        ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$query_type,$scan);
     };
 }
 # This sorts the facets into alphabetical order
@@ -589,6 +601,12 @@ for (my $i=0;$i<@servers;$i++) {
             }
 
             # Adding the new search if needed
+            my $path_info = $cgi->url(-path_info=>1);
+            $query_cgi = $cgi->url(-query=>1);
+            $query_cgi =~ s/^$path_info\?//;
+            $query_cgi =~ s/;/&/g;
+            $query_desc .= ", $limit_desc";
+
             if (!$borrowernumber || $borrowernumber eq '') {
                 # To a cookie (the user is not logged in)
                 if (($params->{'offset'}||'') eq '') {
@@ -737,7 +755,13 @@ for (my $i=0;$i<@servers;$i++) {
         }
         # no hits
         else {
-            $template->param(searchdesc => 1,query_desc => $query_desc,limit_desc => $limit_desc);
+            $template->param(
+                searchdesc => 1,
+                query_desc => $query_desc,
+                limit_desc => $limit_desc,
+                query_cgi  => $query_cgi,
+                limit_cgi  => $limit_cgi
+            );
         }
     } # end of the if local
     # asynchronously search the authority server