Attachment 23899 Details for Bug 11474 – Proposed Patch

[patch] Proposed Patch

0001-Bug-11474-Remove-errors-caused-by-use-of-switch.patch (text/plain), 1.58 KB, created by Colin Campbell on 2014-01-03 10:56:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Campbell

Created: 2014-01-03 10:56:30 UTC

Size: 1.58 KB

patch

obsolete

>From 13ed2a5a2a48d5ed3e812db42e726abbac956c48 Mon Sep 17 00:00:00 2001
>From: Colin Campbell <colin.campbell@ptfs-europe.com>
>Date: Fri, 3 Jan 2014 10:47:23 +0000
>Subject: [PATCH] Bug 11474: Remove errors caused by use of switch
>
>Have replaced a switch statement by an if so we
>do not get warnings on compilation
>
>Note the perldoc for the subroutine was not correct
>code was not testing that paramater equalled the values
>but that it contained them. Have amended accordingly
>Have documented behaviour in case parameter contains
>neither value.
>subroutine does not appear to me used elsewhere in
>codebase
>---
> C4/Utils/DataTables.pm | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/C4/Utils/DataTables.pm b/C4/Utils/DataTables.pm
>index d658090..37dff72 100644
>--- a/C4/Utils/DataTables.pm
>+++ b/C4/Utils/DataTables.pm
>@@ -266,19 +266,19 @@ sub dt_build_query_dates {
> 
>     It calls dt_build_query_dates or dt_build_query_simple fonction of $type.
> 
>-    $type can be 'simple' or 'rage_dates'.
>+    $type can contain 'simple' or 'rage_dates'.
>+    if $type is not matched it returns undef
> 
> =cut
> sub dt_build_query {
>     my ( $type, @params ) = @_;
>-    given ( $type ) {
>-        when ( /simple/ ) {
>-            return dt_build_query_simple( @params );
>-        }
>-        when ( /range_dates/ ) {
>-            return dt_build_query_dates( @params );
>-        }
>+    if ( $type =~ m/simple/ ) {
>+        return dt_build_query_simple(@params);
>+    }
>+    elsif ( $type =~ m/range_dates/ ) {
>+        return dt_build_query_dates(@params);
>     }
>+    return;
> }
> 
> 1;
>-- 
>1.8.4.2
>

Actions: View | Diff | Splinter Review

Attachments on bug 11474: 23899 | 23906 | 23913