gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 11630: (QA Followup) Move code to subroutine, add unit tests 

Patch behaves as expected.

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Kyle M Hall 2014-04-14 08:03:34 -04:00 committed by Galen Charlton
parent 19badb2db4
commit 31995cbcd1
2 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
C4/Circulation.pm
View File

@ -972,63 +972,37 @@ sub CanBookBeIssued {
}
}
}
#
# CHECK AGE RESTRICTION
#
## CHECK AGE RESTRICTION
# get $marker from preferences. Could be something like "FSK|PEGI|Alter|Age:"
my $markers = C4::Context->preference('AgeRestrictionMarker' );
my $bibvalues = $biblioitem->{'agerestriction'};
if (($markers)&&($bibvalues))
{
# Split $bibvalues to something like FSK 16 or PEGI 6
my @values = split ' ', uc($bibvalues);
my $markers = C4::Context->preference('AgeRestrictionMarker');
my $bibvalues = $biblioitem->{'agerestriction'};
my $restriction_age = 0;
# Search first occurence of one of the markers
my @markers = split /\|/, uc($markers);
my $index = 0;
my $restrictionyear = 0;
for my $value (@values) {
$index ++;
for my $marker (@markers) {
$marker =~ s/^\s+//; #remove leading spaces
$marker =~ s/\s+$//; #remove trailing spaces
if ($marker eq $value) {
if ($index <= $#values) {
$restrictionyear += $values[$index];
}
last;
} elsif ($value =~ /^\Q$marker\E(\d+)$/) {
# Perhaps it is something like "K16" (as in Finland)
$restrictionyear += $1;
last;
}
$restriction_age = GetAgeRestriction( $biblioitem->{'agerestriction'} );
if ( $restriction_age > 0 ) {
if ( $borrower->{'dateofbirth'} ) {
my @alloweddate = split /-/, $borrower->{'dateofbirth'};
$alloweddate[0] += $restriction_age;
#Prevent runime eror on leap year (invalid date)
if ( ( $alloweddate[1] == 2 ) && ( $alloweddate[2] == 29 ) ) {
$alloweddate[2] = 28;
}
last if ($restrictionyear > 0);
}
if ($restrictionyear > 0) {
if ( $borrower->{'dateofbirth'} ) {
my @alloweddate = split /-/,$borrower->{'dateofbirth'} ;
$alloweddate[0] += $restrictionyear;
#Prevent runime eror on leap year (invalid date)
if (($alloweddate[1] == 2) && ($alloweddate[2] == 29)) {
$alloweddate[2] = 28;
if ( Date_to_Days(Today) < Date_to_Days(@alloweddate) - 1 ) {
if ( C4::Context->preference('AgeRestrictionOverride') ) {
$needsconfirmation{AGE_RESTRICTION} = "$bibvalues";
}
if ( Date_to_Days(Today) < Date_to_Days(@alloweddate) -1 ) {
if (C4::Context->preference('AgeRestrictionOverride' )) {
$needsconfirmation{AGE_RESTRICTION} = "$bibvalues";
}
else {
$issuingimpossible{AGE_RESTRICTION} = "$bibvalues";
}
else {
$issuingimpossible{AGE_RESTRICTION} = "$bibvalues";
}
}
}
}
## check for high holds decreasing loan period
## check for high holds decreasing loan period
my $decrease_loan = C4::Context->preference('decreaseLoanHighHolds');
if ( $decrease_loan && $decrease_loan == 1 ) {
my ( $reserved, $num, $duration, $returndate ) =
@ -3588,6 +3562,44 @@ sub IsItemIssued {
return $sth->fetchrow;
}
sub GetAgeRestriction {
my ($record_restrictions) = @_;
my $markers = C4::Context->preference('AgeRestrictionMarker');
# Split $record_restrictions to something like FSK 16 or PEGI 6
my @values = split ' ', uc($record_restrictions);
return unless @values;
# Search first occurence of one of the markers
my @markers = split /\|/, uc($markers);
return unless @markers;
my $index = 0;
my $restriction_year = 0;
for my $value (@values) {
$index++;
for my $marker (@markers) {
$marker =~ s/^\s+//; #remove leading spaces
$marker =~ s/\s+$//; #remove trailing spaces
if ( $marker eq $value ) {
if ( $index <= $#values ) {
$restriction_year += $values[$index];
}
last;
}
elsif ( $value =~ /^\Q$marker\E(\d+)$/ ) {
# Perhaps it is something like "K16" (as in Finland)
$restriction_year += $1;
last;
}
}
last if ( $restriction_year > 0 );
}
return $restriction_year;
}
1;
__END__

17
t/db_dependent/Circulation/AgeRestrictionMarkers.t Normal file
View File

@ -0,0 +1,17 @@
use Modern::Perl;
use Test::More tests => 4;
use C4::Context;
use C4::Circulation;
my $dbh = C4::Context->dbh;
$dbh->{AutoCommit} = 0;
$dbh->{RaiseError} = 1;
C4::Context->set_preference( 'AgeRestrictionMarker', 'FSK|PEGI|Age|K' );
is ( C4::Circulation::GetAgeRestriction('FSK 16'), '16', 'FSK 16 returns 16' );
is ( C4::Circulation::GetAgeRestriction('PEGI 16'), '16', 'PEGI 16 returns 16' );
is ( C4::Circulation::GetAgeRestriction('Age 16'), '16', 'Age 16 returns 16' );
is ( C4::Circulation::GetAgeRestriction('K16'), '16', 'K16 returns 16' );