From: Brett Wilkins <brett@catalyst.net.nz>
Date: Mon, 29 Aug 2011 04:47:48 +0000 (+1200)
Subject: bug 6724: enable decimals on values greater than 1
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=f824121bb136b08ae3308168a0deeb524518fdde;p=koha.git

bug 6724: enable decimals on values greater than 1

Separating perl standard uses from koha uses

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---

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
 }