Jonathan Druart
9d6d641d1f
On bug 17591 we discovered that there was something weird going on with the way we export and use subroutines/modules. This patch tries to standardize our EXPORT to use EXPORT_OK only. That way we will need to explicitely define the subroutine we want to use from a module. This patch is a squashed version of: Bug 17600: After export.pl Bug 17600: After perlimport Bug 17600: Manual changes Bug 17600: Other manual changes after second perlimports run Bug 17600: Fix tests And a lot of other manual changes. export.pl is a dirty script that can be found on bug 17600. "perlimport" is: git clone https://github.com/oalders/App-perlimports.git cd App-perlimports/ cpanm --installdeps . export PERL5LIB="$PERL5LIB:/kohadevbox/koha/App-perlimports/lib" find . \( -name "*.pl" -o -name "*.pm" \) -exec perl App-perlimports/script/perlimports --inplace-edit --no-preserve-unused --filename {} \; The ideas of this patch are to: * use EXPORT_OK instead of EXPORT * perltidy the EXPORT_OK list * remove '&' before the subroutine names * remove some uneeded use statements * explicitely import the subroutines we need within the controllers or modules Note that the private subroutines (starting with _) should not be exported (and not used from outside of the module except from tests). EXPORT vs EXPORT_OK (from https://www.thegeekstuff.com/2010/06/perl-exporter-examples/) """ Export allows to export the functions and variables of modules to user’s namespace using the standard import method. This way, we don’t need to create the objects for the modules to access it’s members. @EXPORT and @EXPORT_OK are the two main variables used during export operation. @EXPORT contains list of symbols (subroutines and variables) of the module to be exported into the caller namespace. @EXPORT_OK does export of symbols on demand basis. """ If this patch caused a conflict with a patch you wrote prior to its push: * Make sure you are not reintroducing a "use" statement that has been removed * "$subroutine" is not exported by the C4::$MODULE module means that you need to add the subroutine to the @EXPORT_OK list * Bareword "$subroutine" not allowed while "strict subs" means that you didn't imported the subroutine from the module: - use $MODULE qw( $subroutine list ); You can also use the fully qualified namespace: C4::$MODULE::$subroutine Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
257 lines
8.4 KiB
Perl
Executable file
257 lines
8.4 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2009 SARL Biblibre
|
|
#
|
|
# 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 3 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, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use C4::ILSDI::Services;
|
|
use C4::Auth qw( get_template_and_user );
|
|
use C4::Output qw( output_html_with_http_headers );
|
|
use C4::Context;
|
|
|
|
use List::MoreUtils qw( any );
|
|
use XML::Simple qw( XMLout );
|
|
use CGI qw ( -utf8 );
|
|
use Net::Netmask;
|
|
|
|
=head1 DLF ILS-DI for Koha
|
|
|
|
This script is a basic implementation of ILS-DI protocol for Koha.
|
|
It acts like a dispatcher, that get the CGI request, check required and
|
|
optionals arguments, call a function from C4::ILS-DI, and finally
|
|
outputs the returned hashref as XML.
|
|
|
|
=cut
|
|
|
|
# Instanciate the CGI request
|
|
my $cgi = CGI->new;
|
|
|
|
# List of available services, sorted by level
|
|
my @services = (
|
|
'Describe', # Not part of ILS-DI, online API doc
|
|
|
|
# Level 1: Basic Discovery Interfaces
|
|
# 'HarvestBibliographicRecords', # OAI-PMH
|
|
# 'HarvestExpandedRecords', # OAI-PMH
|
|
'GetAvailability', # FIXME Add bibliographic level
|
|
|
|
# 'GoToBibliographicRequestPage' # I don't understant this one
|
|
# Level 2: Elementary OPAC supplement
|
|
# 'HarvestAuthorityRecords', # OAI-PMH
|
|
# 'HarvestHoldingsRecords', # OAI-PMH
|
|
'GetRecords', # Note that we can use OAI-PMH for this too
|
|
|
|
# 'Search', # TODO
|
|
# 'Scan', # TODO
|
|
'GetAuthorityRecords',
|
|
|
|
# 'OutputRewritablePage', # I don't understant this one
|
|
# 'OutputIntermediateFormat', # I don't understant this one
|
|
# Level 3: Elementary OPAC alternative
|
|
'LookupPatron',
|
|
'AuthenticatePatron',
|
|
'GetPatronInfo',
|
|
'GetPatronStatus',
|
|
'GetServices', # FIXME Loans
|
|
'RenewLoan',
|
|
'HoldTitle', # FIXME Add dates support
|
|
'HoldItem', # FIXME Add dates support
|
|
'CancelHold',
|
|
|
|
# 'RecallItem', # Not supported by Koha
|
|
# 'CancelRecall', # Not supported by Koha
|
|
# Level 4: Robust/domain specific discovery platforms
|
|
# 'SearchCourseReserves', # TODO
|
|
# 'Explain' # TODO
|
|
);
|
|
|
|
# List of required arguments
|
|
my %required = (
|
|
'Describe' => ['verb'],
|
|
'GetAvailability' => [ 'id', 'id_type' ],
|
|
'GetRecords' => ['id'],
|
|
'GetAuthorityRecords' => ['id'],
|
|
'LookupPatron' => ['id'],
|
|
'AuthenticatePatron' => [ 'username', 'password' ],
|
|
'GetPatronInfo' => ['patron_id'],
|
|
'GetPatronStatus' => ['patron_id'],
|
|
'GetServices' => [ 'patron_id', 'item_id' ],
|
|
'RenewLoan' => [ 'patron_id', 'item_id' ],
|
|
'HoldTitle' => [ 'patron_id', 'bib_id', 'request_location' ],
|
|
'HoldItem' => [ 'patron_id', 'bib_id', 'item_id' ],
|
|
'CancelHold' => [ 'patron_id', 'item_id' ],
|
|
);
|
|
|
|
# List of optional arguments
|
|
my %optional = (
|
|
'Describe' => [],
|
|
'GetAvailability' => [ 'return_type', 'return_fmt' ],
|
|
'GetRecords' => ['schema'],
|
|
'GetAuthorityRecords' => ['schema'],
|
|
'LookupPatron' => ['id_type'],
|
|
'AuthenticatePatron' => [],
|
|
'GetPatronInfo' => [ 'show_contact', 'show_fines', 'show_holds', 'show_loans', 'loans_per_page', 'loans_page', 'show_attributes' ],
|
|
'GetPatronStatus' => [],
|
|
'GetServices' => [],
|
|
'RenewLoan' => ['desired_due_date'],
|
|
'HoldTitle' => [ 'pickup_location', 'start_date', 'expiry_date' ],
|
|
'HoldItem' => [ 'pickup_location', 'start_date', 'expiry_date' ],
|
|
'CancelHold' => [],
|
|
);
|
|
|
|
# If no service is requested, display the online documentation
|
|
unless ( $cgi->param('service') ) {
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{ template_name => "ilsdi.tt",
|
|
query => $cgi,
|
|
type => "opac",
|
|
authnotrequired => 1,
|
|
}
|
|
);
|
|
output_html_with_http_headers $cgi, $cookie, $template->output;
|
|
exit 0;
|
|
}
|
|
|
|
# Set the userenv
|
|
C4::Context->_new_userenv( 'ILSDI_'.time() );
|
|
C4::Context->set_userenv(
|
|
undef, undef, undef, 'ILSDI', 'ILSDI',
|
|
undef, undef, undef, undef, undef,
|
|
);
|
|
C4::Context->interface('opac');
|
|
|
|
# If user requested a service description, then display it
|
|
if ( scalar $cgi->param('service') eq "Describe" and any { scalar $cgi->param('verb') eq $_ } @services ) {
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{ template_name => "ilsdi.tt",
|
|
query => $cgi,
|
|
type => "opac",
|
|
authnotrequired => 1,
|
|
}
|
|
);
|
|
$template->param( scalar $cgi->param('verb') => 1 );
|
|
output_html_with_http_headers $cgi, $cookie, $template->output;
|
|
exit 0;
|
|
}
|
|
|
|
# any output after this point will be UTF-8 XML
|
|
binmode STDOUT, ':encoding(UTF-8)';
|
|
print CGI::header('-type'=>'text/xml', '-charset'=>'utf-8');
|
|
|
|
my $out;
|
|
|
|
# If ILS-DI module is disabled in System->Preferences, redirect to 404
|
|
unless ( C4::Context->preference('ILS-DI') ) {
|
|
$out->{'code'} = "NotAllowed";
|
|
$out->{'message'} = "ILS-DI is disabled.";
|
|
}
|
|
|
|
# If the remote address is not allowed, redirect to 403
|
|
my @AuthorizedIPs = split( /,/, C4::Context->preference('ILS-DI:AuthorizedIPs') );
|
|
if (@AuthorizedIPs) { # If no filter set, allow access to everybody
|
|
my $authorized = 0;
|
|
foreach my $ip (@AuthorizedIPs) {
|
|
my $netmask = Net::Netmask->new2($ip);
|
|
if ( $netmask && $netmask->match( $ENV{REMOTE_ADDR} ) ) {
|
|
$authorized = 1;
|
|
last;
|
|
}
|
|
}
|
|
unless ($authorized) {
|
|
$out->{'code'} = "NotAllowed";
|
|
$out->{'message'} = "Unauthorized IP address: $ENV{REMOTE_ADDR}.";
|
|
}
|
|
}
|
|
|
|
my $service = $cgi->param('service') || "ilsdi";
|
|
|
|
# Check if the requested service is in the list
|
|
if ( $service and any { $service eq $_ } @services ) {
|
|
|
|
my @parmsrequired = @{ $required{$service} };
|
|
my @parmsoptional = @{ $optional{$service} };
|
|
my @parmsall = ( @parmsrequired, @parmsoptional );
|
|
my @names = $cgi->multi_param;
|
|
my %paramhash;
|
|
$paramhash{$_} = 1 for @names;
|
|
|
|
# check for missing parameters
|
|
for ( @parmsrequired ) {
|
|
unless ( exists $paramhash{$_} ) {
|
|
$out->{'code'} = "MissingParameter";
|
|
$out->{'message'} = "The required parameter ".$_." is missing.";
|
|
}
|
|
}
|
|
|
|
# check for illegal parameters
|
|
for my $name ( @names ) {
|
|
my $found = 0;
|
|
for my $name2 (@parmsall) {
|
|
if ( $name eq $name2 ) {
|
|
$found = 1;
|
|
}
|
|
}
|
|
if ( $found == 0 && $name ne 'service' ) {
|
|
$out->{'code'} = "IllegalParameter";
|
|
$out->{'message'} = "The parameter ".$name." is illegal.";
|
|
}
|
|
}
|
|
|
|
# check for multiple parameters
|
|
for ( @names ) {
|
|
my @values = $cgi->multi_param($_);
|
|
if ( $#values != 0 ) {
|
|
$out->{'code'} = "MultipleValuesNotAllowed";
|
|
$out->{'message'} = "Multiple values not allowed for the parameter ".$_.".";
|
|
}
|
|
}
|
|
|
|
if ( !$out->{'message'} ) {
|
|
|
|
# GetAvailability is a special case, as it cannot use XML::Simple
|
|
if ( $service eq "GetAvailability" ) {
|
|
print C4::ILSDI::Services::GetAvailability($cgi);
|
|
exit 0;
|
|
} else {
|
|
|
|
# Variable functions
|
|
my $sub = do {
|
|
# no strict 'refs';
|
|
my $symbol = 'C4::ILSDI::Services::' . $service;
|
|
\&{"$symbol"};
|
|
};
|
|
|
|
# Call the requested service, and get its return value
|
|
$out = &$sub($cgi);
|
|
}
|
|
}
|
|
} else {
|
|
$out->{'message'} = "NotSupported";
|
|
}
|
|
|
|
# Output XML by passing the hashref to XMLOut
|
|
print XMLout(
|
|
$out,
|
|
noattr => 1,
|
|
nosort => 1,
|
|
xmldecl => '<?xml version="1.0" encoding="UTF-8" ?>',
|
|
RootName => $service,
|
|
SuppressEmpty => 1
|
|
);
|
|
exit 0;
|
|
|