From c8e6c33dc1577b186be5731d6838a857b59ade18 Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Fri, 3 Jan 2014 10:47:23 +0000 Subject: [PATCH] [PASSED QA] 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 Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Passes all tests and QA script, especially t/DateUtils.t. --- 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.3.2