Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

bug_10781: Remove C4::ILSDI::Utility

Browse source 
This patch removes C4::ILSDI::Utility on the basis
that one of its routines (BorrowerExists) was not used
and that the other routine can be (and is) moved to
C4/ILSDI/Services.pm.

Test:
This should be a noop. Regression testing required:
/cgi-bin/koha/ilsdi.pl functioanality, in particuler:
GetAvailability - ?service=Describe&verb=GetAvailability
AuthenticatePatron - ?service=Describe&verb=AuthenticatePatron

ILS-DI syspref must be turned on

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Srdjan 2013-08-23 19:59:17 +12:00 committed by Galen Charlton
parent 3e1b781adc
commit 7675ede590
3 changed files with 35 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
C4/ILSDI/Services.pm
View file

@ -29,7 +29,6 @@ use C4::Biblio;
use C4::Reserves qw(AddReserve CancelReserve GetReservesFromBiblionumber GetReservesFromBorrowernumber CanBookBeReserved CanItemBeReserved);
use C4::Context;
use C4::AuthoritiesMarc;
use C4::ILSDI::Utility;
use XML::Simple;
use HTML::Entities;
use CGI;
@ -115,7 +114,7 @@ sub GetAvailability {
foreach my $id ( split( / /, $cgi->param('id') ) ) {
if ( $cgi->param('id_type') eq "item" ) {
my ( $biblionumber, $status, $msg, $location ) = Availability($id);
my ( $biblionumber, $status, $msg, $location ) = _availability($id);
$out .= " <dlf:record>\n";
$out .= " <dlf:bibliographic id=\"" . ( $biblionumber || $id ) . "\" />\n";
@ -764,4 +763,38 @@ sub CancelHold {
return { code => 'Canceled' };
}
=head2 _availability
Returns, for an itemnumber, an array containing availability information.
my ($biblionumber, $status, $msg, $location) = _availability($id);
=cut
sub _availability {
my ($itemnumber) = @_;
my $item = GetItem( $itemnumber, undef, undef );
if ( not $item->{'itemnumber'} ) {
return ( undef, 'unknown', 'Error: could not retrieve availability for this ID', undef );
}
my $biblionumber = $item->{'biblioitemnumber'};
my $location = GetBranchName( $item->{'holdingbranch'} );
if ( $item->{'notforloan'} ) {
return ( $biblionumber, 'not available', 'Not for loan', $location );
} elsif ( $item->{'onloan'} ) {
return ( $biblionumber, 'not available', 'Checked out', $location );
} elsif ( $item->{'itemlost'} ) {
return ( $biblionumber, 'not available', 'Item lost', $location );
} elsif ( $item->{'wthdrawn'} ) {
return ( $biblionumber, 'not available', 'Item withdrawn', $location );
} elsif ( $item->{'damaged'} ) {
return ( $biblionumber, 'not available', 'Item damaged', $location );
} else {
return ( $biblionumber, 'available', undef, $location );
}
}
1;

107
C4/ILSDI/Utility.pm
View file

@ -1,107 +0,0 @@
package C4::ILSDI::Utility;
# Copyright 2009 SARL Biblibre
# Copyright 2011 software.coop and MJ Ray
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
use C4::Members;
use C4::Items;
use C4::Circulation;
use C4::Biblio;
use C4::Reserves qw(GetReservesFromBorrowernumber CanBookBeReserved);
use C4::Context;
use C4::Branch qw/GetBranchName/;
use Digest::MD5 qw(md5_base64);
use vars qw($VERSION @ISA @EXPORT);
BEGIN {
# set the version for version checking
$VERSION = 3.07.00.049;
require Exporter;
@ISA = qw(Exporter);
@EXPORT = qw(
&BorrowerExists &Availability
);
}
=head1 NAME
C4::ILS-DI::Utility - ILS-DI Utilities
=cut
=head2 BorrowerExists
Checks, for a given userid and password, if the borrower exists.
if ( BorrowerExists($userid, $password) ) {
# Do stuff
}
=cut
sub BorrowerExists {
my ( $userid, $password ) = @_;
$password = md5_base64($password);
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("SELECT COUNT(*) FROM borrowers WHERE userid =? and password=? ");
$sth->execute( $userid, $password );
return $sth->fetchrow;
}
=head2 Availability
Returns, for an itemnumber, an array containing availability information.
my ($biblionumber, $status, $msg, $location) = Availability($id);
=cut
sub Availability {
my ($itemnumber) = @_;
my $item = GetItem( $itemnumber, undef, undef );
if ( not $item->{'itemnumber'} ) {
return ( undef, 'unknown', 'Error: could not retrieve availability for this ID', undef );
}
my $biblionumber = $item->{'biblioitemnumber'};
my $location = GetBranchName( $item->{'holdingbranch'} );
if ( $item->{'notforloan'} ) {
return ( $biblionumber, 'not available', 'Not for loan', $location );
} elsif ( $item->{'onloan'} ) {
return ( $biblionumber, 'not available', 'Checked out', $location );
} elsif ( $item->{'itemlost'} ) {
return ( $biblionumber, 'not available', 'Item lost', $location );
} elsif ( $item->{'withdrawn'} ) {
return ( $biblionumber, 'not available', 'Item withdrawn', $location );
} elsif ( $item->{'damaged'} ) {
return ( $biblionumber, 'not available', 'Item damaged', $location );
} else {
return ( $biblionumber, 'available', undef, $location );
}
die Data::Dumper::Dumper($item);
}
1;

14
t/ILSDI_Utility.t
View file

@ -1,14 +0,0 @@
#!/usr/bin/perl
#
# This Koha test module is a stub!
# Add more tests here!!!
use strict;
use warnings;
use Test::More tests => 1;
BEGIN {
use_ok('C4::ILSDI::Utility');
}