Kyle M Hall
5cd08373b1
The change to allow multiple guarantors was meant to maintain the ability to import patrons with a Koha patron guarantor, but is not working as intended. A) Adding the guarantor simply doesn't work B) We have two columns named 'relationship', one for the borrowers table, and one for the guarantor relationships table. This clearly doesn't work and will cause confusion. The one for the guarantor relationships table should be renamed. C) guarantor_firstname and guarantor_surname in the CSV file do nothing and should be removed. This patch also fixes a minor issue that causes warnings like: CGI::param called in list context from /kohadevbox/koha/tools/import_borrowers.pl line 124 Test Plan: 1) Create a CSV with contents like: cardnumber,surname,firstname,branchcode,categorycode,guarantor_relationship,guarantor_id bloop,gloop,froop,MPL,J,father,48 brim,flim,zim,MPL,J,father,48 2) Attempt to upload this file, ensure you have a borrowernumber 48 that can have guarantors 3) Note the accounts are not linked 4) Apply this patch 5) Restart all the things! 6) Upload the file again 7) The patrons should now be linked! 8) Download the starter CSV file 9) Note the second relationship column is now guarantor_relationship 10) Note the columns guarantor_firstname and guarantor_surname are no longer present Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com> Signed-off-by: Marti Fuerst <mfuerst@hmcpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
188 lines
6.7 KiB
Perl
Executable file
188 lines
6.7 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2007 Liblime
|
|
# Parts copyright 2010 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>.
|
|
|
|
# Script to take some borrowers data in a known format and load it into Koha
|
|
#
|
|
# File format
|
|
#
|
|
# cardnumber,surname,firstname,title,othernames,initials,streetnumber,streettype,
|
|
# address line , address line 2, city, zipcode, contry, email, phone, mobile, fax, work email, work phone,
|
|
# alternate streetnumber, alternate streettype, alternate address line 1, alternate city,
|
|
# alternate zipcode, alternate country, alternate email, alternate phone, date of birth, branchcode,
|
|
# categorycode, enrollment date, expiry date, noaddress, lost, debarred, contact surname,
|
|
# contact firstname, contact title, borrower notes, contact relationship
|
|
# gender, username, opac note, contact note, password, sort one, sort two
|
|
#
|
|
# any fields except cardnumber can be blank but the number of fields must match
|
|
# dates should be in the format you have set up Koha to expect
|
|
# branchcode and categorycode need to be valid
|
|
|
|
use Modern::Perl;
|
|
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Templates;
|
|
use Koha::Patrons;
|
|
use Koha::DateUtils;
|
|
use Koha::Token;
|
|
use Koha::Libraries;
|
|
use Koha::Patron::Categories;
|
|
use Koha::Patron::Attribute::Types;
|
|
use Koha::List::Patron;
|
|
|
|
use Koha::Patrons::Import;
|
|
my $Import = Koha::Patrons::Import->new();
|
|
|
|
use Text::CSV;
|
|
|
|
# Text::CSV::Unicode, even in binary mode, fails to parse lines with these diacriticals:
|
|
# ė
|
|
# č
|
|
|
|
use CGI qw ( -utf8 );
|
|
|
|
my $extended = C4::Context->preference('ExtendedPatronAttributes');
|
|
|
|
my @columnkeys = map { $_ ne 'borrowernumber' ? $_ : () } Koha::Patrons->columns();
|
|
push( @columnkeys, 'patron_attributes' ) if $extended;
|
|
push( @columnkeys, qw( guarantor_relationship guarantor_id ) );
|
|
|
|
my $input = CGI->new();
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "tools/import_borrowers.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
flagsrequired => { tools => 'import_patrons' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
# get the patron categories and pass them to the template
|
|
my @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
|
|
$template->param( categories => \@patron_categories );
|
|
my $columns = C4::Templates::GetColumnDefs( $input )->{borrowers};
|
|
$columns = [ grep { $_->{field} ne 'borrowernumber' ? $_ : () } @$columns ];
|
|
$template->param( borrower_fields => $columns );
|
|
|
|
if ( $input->param('sample') ) {
|
|
our $csv = Text::CSV->new( { binary => 1 } ); # binary needed for non-ASCII Unicode
|
|
print $input->header(
|
|
-type => 'application/vnd.sun.xml.calc', # 'application/vnd.ms-excel' ?
|
|
-attachment => 'patron_import.csv',
|
|
);
|
|
$csv->combine(@columnkeys);
|
|
print $csv->string, "\n";
|
|
exit 0;
|
|
}
|
|
|
|
my $uploadborrowers = $input->param('uploadborrowers');
|
|
my $matchpoint = $input->param('matchpoint');
|
|
if ($matchpoint) {
|
|
$matchpoint =~ s/^patron_attribute_//;
|
|
}
|
|
|
|
#create a patronlist
|
|
my $createpatronlist = $input->param('createpatronlist') || 0;
|
|
my $dt = dt_from_string();
|
|
my $timestamp = $dt->ymd('-').' '.$dt->hms(':');
|
|
my $patronlistname = $uploadborrowers . ' (' . $timestamp .')';
|
|
|
|
$template->param( SCRIPT_NAME => '/cgi-bin/koha/tools/import_borrowers.pl' );
|
|
|
|
if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
|
|
output_and_exit( $input, $cookie, $template, 'wrong_csrf_token' )
|
|
unless Koha::Token->new->check_csrf({
|
|
session_id => scalar $input->cookie('CGISESSID'),
|
|
token => scalar $input->param('csrf_token'),
|
|
});
|
|
|
|
my $handle = $input->upload('uploadborrowers');
|
|
my %defaults = $input->Vars;
|
|
my $overwrite_passwords = defined $input->param('overwrite_passwords') ? 1 : 0;
|
|
my $return = $Import->import_patrons(
|
|
{
|
|
file => $handle,
|
|
defaults => \%defaults,
|
|
matchpoint => $matchpoint,
|
|
overwrite_cardnumber => scalar $input->param('overwrite_cardnumber'),
|
|
overwrite_passwords => $overwrite_passwords,
|
|
preserve_extended_attributes => scalar $input->param('ext_preserve') || 0,
|
|
}
|
|
);
|
|
|
|
my $feedback = $return->{feedback};
|
|
my $errors = $return->{errors};
|
|
my $imported = $return->{imported};
|
|
my $overwritten = $return->{overwritten};
|
|
my $alreadyindb = $return->{already_in_db};
|
|
my $invalid = $return->{invalid};
|
|
my $imported_borrowers = $return->{imported_borrowers};
|
|
|
|
if ( $imported && $createpatronlist ) {
|
|
my $patronlist = AddPatronList({ name => $patronlistname });
|
|
AddPatronsToList({ list => $patronlist, borrowernumbers => $imported_borrowers });
|
|
$template->param('patronlistname' => $patronlistname);
|
|
}
|
|
|
|
my $uploadinfo = $input->uploadInfo($uploadborrowers);
|
|
foreach ( keys %$uploadinfo ) {
|
|
push @$feedback, { feedback => 1, name => $_, value => $uploadinfo->{$_}, $_ => $uploadinfo->{$_} };
|
|
}
|
|
|
|
push @$feedback, { feedback => 1, name => 'filename', value => $uploadborrowers, filename => $uploadborrowers };
|
|
|
|
$template->param(
|
|
uploadborrowers => 1,
|
|
errors => $errors,
|
|
feedback => $feedback,
|
|
imported => $imported,
|
|
overwritten => $overwritten,
|
|
alreadyindb => $alreadyindb,
|
|
invalid => $invalid,
|
|
total => $imported + $alreadyindb + $invalid + $overwritten,
|
|
);
|
|
|
|
}
|
|
else {
|
|
if ($extended) {
|
|
my @matchpoints = ();
|
|
my $attribute_types = Koha::Patron::Attribute::Types->search;
|
|
|
|
while ( my $attr_type = $attribute_types->next ) {
|
|
if ( $attr_type->unique_id() ) {
|
|
push @matchpoints,
|
|
{ code => "patron_attribute_" . $attr_type->code(), description => $attr_type->description() };
|
|
}
|
|
}
|
|
$template->param( matchpoints => \@matchpoints );
|
|
}
|
|
|
|
$template->param(
|
|
csrf_token => Koha::Token->new->generate_csrf(
|
|
{ session_id => scalar $input->cookie('CGISESSID'), }
|
|
),
|
|
);
|
|
|
|
}
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|