[Koha-patches] [PATCH] [SIGNED-OFF] bug 6724: enable decimals on values greater than 1

Owen Leonard oleonard at myacpl.org
Mon Aug 29 16:24:29 CEST 2011


From: Brett Wilkins <brett at catalyst.net.nz>

Separating perl standard uses from koha uses

http://bugs.koha-community.org/show_bug.cgi?id=6724
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
 circ/reserveratios.pl |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl
index 5a86675..1517adf 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
 }
 
-- 
1.7.3



More information about the Koha-patches mailing list