From a69acb3c798ae2d84ca96d5104c165e19de2d872 Mon Sep 17 00:00:00 2001 From: Brett Wilkins Date: Mon, 29 Aug 2011 16:47:48 +1200 Subject: [PATCH] bug 6724: enable decimals on values greater than 1 Separating perl standard uses from koha uses Signed-off-by: Owen Leonard Signed-off-by: Ian Walls Signed-off-by: Chris Cormack (cherry picked from commit f824121bb136b08ae3308168a0deeb524518fdde) Signed-off-by: Chris Nighswonger --- circ/reserveratios.pl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl index 5a86675d3b..1517adfb97 100755 --- a/circ/reserveratios.pl +++ b/circ/reserveratios.pl @@ -21,13 +21,14 @@ use strict; use warnings; +use CGI; +use Date::Calc qw/Today Add_Delta_YM/; + use C4::Context; use C4::Output; -use CGI; use C4::Auth; use C4::Dates qw/format_date format_date_in_iso/; use C4::Debug; -use Date::Calc qw/Today Add_Delta_YM/; use C4::Biblio qw/GetMarcBiblio GetRecordValue GetFrameworkCode/; my $input = new CGI; @@ -61,10 +62,12 @@ if (!defined($startdate) or $startdate !~ s/^\s*(\S+)\s*$/$1/) { # strip space if (!defined($enddate) or $enddate !~ s/^\s*(\S+)\s*$/$1/) { # strip spaces, remove Taint $enddate = format_date($todaysdate); } -if (!defined($ratio) or $ratio !~ s/^\s*(0?\.?\d+)(\.0*)?\s*$/$1/) { # strip spaces, remove Taint +if (!defined($ratio)) { $ratio = 3; } -if ($ratio == 0) { +# Force to be a number +$ratio += 0; +if ($ratio <= 0) { $ratio = 1; # prevent division by zero } -- 2.39.5