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>
This commit is contained in:
parent
9e93266714
commit
f824121bb1
1 changed files with 7 additions and 4 deletions
|
@ -21,13 +21,14 @@
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
||||||
|
use CGI;
|
||||||
|
use Date::Calc qw/Today Add_Delta_YM/;
|
||||||
|
|
||||||
use C4::Context;
|
use C4::Context;
|
||||||
use C4::Output;
|
use C4::Output;
|
||||||
use CGI;
|
|
||||||
use C4::Auth;
|
use C4::Auth;
|
||||||
use C4::Dates qw/format_date format_date_in_iso/;
|
use C4::Dates qw/format_date format_date_in_iso/;
|
||||||
use C4::Debug;
|
use C4::Debug;
|
||||||
use Date::Calc qw/Today Add_Delta_YM/;
|
|
||||||
use C4::Biblio qw/GetMarcBiblio GetRecordValue GetFrameworkCode/;
|
use C4::Biblio qw/GetMarcBiblio GetRecordValue GetFrameworkCode/;
|
||||||
|
|
||||||
my $input = new CGI;
|
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
|
if (!defined($enddate) or $enddate !~ s/^\s*(\S+)\s*$/$1/) { # strip spaces, remove Taint
|
||||||
$enddate = format_date($todaysdate);
|
$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;
|
$ratio = 3;
|
||||||
}
|
}
|
||||||
if ($ratio == 0) {
|
# Force to be a number
|
||||||
|
$ratio += 0;
|
||||||
|
if ($ratio <= 0) {
|
||||||
$ratio = 1; # prevent division by zero
|
$ratio = 1; # prevent division by zero
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue