Attachment 40162 Details for Bug 14351 – Bug 14351: Remove given-when from opac-search.pl

[patch] Bug 14351: Remove given-when from opac-search.pl

Bug-14351-Remove-given-when-from-opac-searchpl.patch (text/plain), 1.83 KB, created by Jonathan Druart on 2015-06-16 08:35:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-06-16 08:35:41 UTC

Size: 1.83 KB

patch

obsolete

>From 2ecfcb2677be13219b020446c79fe7ab72cfdc45 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>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 <mtompset@hotmail.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
>---
> 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";
>     }
> }
> 
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 14351: 39964 | 40115 | 40162