From 9cc11aeaac91102162920b918141044d2a5b694c Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 8 Jun 2015 01:49:24 +0200 Subject: [PATCH] Bug 14351: Remove given-when from opac-search.pl Reformats given-when to if-elsif-else in opac-search.pl to remove the experimental feature and with it a lot of warnings from the logs. To test: - Do several different advanced searches with and without expanded search options - Verify the link back to the search appears above the results list and works correctly See also: test plan on bug 13307 NOTE: Even installed firefox plug in to edit cookies to trigger else case. :) Signed-off-by: Mark Tompsett --- opac/opac-search.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 0ff2507..2c4e34e 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -189,13 +189,14 @@ if ($cgi->param("returntosearch")) { } if ($cgi->cookie("search_path_code")) { my $pathcode = $cgi->cookie("search_path_code"); - given ($pathcode) - { - when ('"ads"') { $template->param('ReturnPath' => '/cgi-bin/koha/opac-search.pl?returntosearch=1'); } - when ('"exs"') { - $template->param('ReturnPath' => '/cgi-bin/koha/opac-search.pl?expanded_options=1&returntosearch=1'); - } - default {warn "ReturnPath swith error";} + if ($pathcode eq '"ads"') { + $template->param('ReturnPath' => '/cgi-bin/koha/opac-search.pl?returntosearch=1'); + } + elsif ($pathcode eq '"exs"') { + $template->param('ReturnPath' => '/cgi-bin/koha/opac-search.pl?expanded_options=1&returntosearch=1'); + } + else { + warn "ReturnPath switch error"; } } -- 1.9.1