@@ -, +, @@ --- Koha/Patrons/Import.pm | 370 ++++++++++++++++++ .../prog/en/modules/tools/import_borrowers.tt | 405 +++++++++++--------- tools/import_borrowers.pl | 345 ++--------------- 3 files changed, 643 insertions(+), 477 deletions(-) create mode 100644 Koha/Patrons/Import.pm --- a/Koha/Patrons/Import.pm +++ a/Koha/Patrons/Import.pm @@ -0,0 +1,370 @@ +package Koha::Patrons::Import; + +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use Carp; +use Text::CSV; + +use C4::Members; +use C4::Branch; + +sub import_patrons { + my ($params) = @_; + + my $handle = $params->{file}; + my $matchpoint = $params->{matchpoint}; + my $defaults = $params->{defaults}; + my $ext_preserve = $params->{preserve_extended_attributes}; + my $overwrite_cardnumber = $params->{overwrite_cardnumber}; + + carp("No file handle passed in!") && return unless $handle; + + my $extended = C4::Context->preference('ExtendedPatronAttributes'); + my $set_messaging_prefs = C4::Context->preference('EnhancedMessagingPreferences'); + + my @columnkeys = map { $_ ne 'borrowernumber' ? $_ : () } C4::Members::columns(); + push( @columnkeys, 'patron_attributes' ) if $extended; + + our $csv = Text::CSV->new( { binary => 1 } ); # binary needed for non-ASCII Unicode + + my @feedback; + my @errors; + + my $imported = 0; + my $alreadyindb = 0; + my $overwritten = 0; + my $invalid = 0; + my $matchpoint_attr_type; + + # use header line to construct key to column map + my $borrowerline = <$handle>; + my $status = $csv->parse($borrowerline); + ($status) or push @errors, { badheader => 1, line => $., lineraw => $borrowerline }; + my @csvcolumns = $csv->fields(); + my %csvkeycol; + my $col = 0; + foreach my $keycol (@csvcolumns) { + + # columnkeys don't contain whitespace, but some stupid tools add it + $keycol =~ s/ +//g; + $csvkeycol{$keycol} = $col++; + } + + #warn($borrowerline); + if ($extended) { + $matchpoint_attr_type = C4::Members::AttributeTypes->fetch($matchpoint); + } + + push @feedback, { feedback => 1, name => 'headerrow', value => join( ', ', @csvcolumns ) }; + my $today_iso = C4::Dates->new()->output('iso'); + my @criticals = qw(surname branchcode categorycode); # there probably should be others + my @bad_dates; # I've had a few. + my $date_re = C4::Dates->new->regexp('syspref'); + my $iso_re = C4::Dates->new->regexp('iso'); + LINE: while ( my $borrowerline = <$handle> ) { + my %borrower; + my @missing_criticals; + my $patron_attributes; + my $status = $csv->parse($borrowerline); + my @columns = $csv->fields(); + if ( !$status ) { + push @missing_criticals, { badparse => 1, line => $., lineraw => $borrowerline }; + } + elsif ( @columns == @columnkeys ) { + @borrower{@columnkeys} = @columns; + + # MJR: try to fill blanks gracefully by using default values + foreach my $key (@columnkeys) { + if ( $borrower{$key} !~ /\S/ ) { + $borrower{$key} = $defaults->{$key}; + } + } + } + else { + # MJR: try to recover gracefully by using default values + foreach my $key (@columnkeys) { + if ( defined( $csvkeycol{$key} ) and $columns[ $csvkeycol{$key} ] =~ /\S/ ) { + $borrower{$key} = $columns[ $csvkeycol{$key} ]; + } + elsif ( $defaults->{$key} ) { + $borrower{$key} = $defaults->{$key}; + } + elsif ( scalar grep { $key eq $_ } @criticals ) { + + # a critical field is undefined + push @missing_criticals, { key => $key, line => $., lineraw => $borrowerline }; + } + else { + $borrower{$key} = ''; + } + } + } + + #warn join(':',%borrower); + if ( $borrower{categorycode} ) { + push @missing_criticals, + { + key => 'categorycode', + line => $., + lineraw => $borrowerline, + value => $borrower{categorycode}, + category_map => 1 + } + unless GetBorrowercategory( $borrower{categorycode} ); + } + else { + push @missing_criticals, { key => 'categorycode', line => $., lineraw => $borrowerline }; + } + if ( $borrower{branchcode} ) { + push @missing_criticals, + { + key => 'branchcode', + line => $., + lineraw => $borrowerline, + value => $borrower{branchcode}, + branch_map => 1 + } + unless GetBranchName( $borrower{branchcode} ); + } + else { + push @missing_criticals, { key => 'branchcode', line => $., lineraw => $borrowerline }; + } + if (@missing_criticals) { + foreach (@missing_criticals) { + $_->{borrowernumber} = $borrower{borrowernumber} || 'UNDEF'; + $_->{surname} = $borrower{surname} || 'UNDEF'; + } + $invalid++; + ( 25 > scalar @errors ) and push @errors, { missing_criticals => \@missing_criticals }; + + # The first 25 errors are enough. Keeping track of 30,000+ would destroy performance. + next LINE; + } + if ($extended) { + my $attr_str = $borrower{patron_attributes}; + $attr_str =~ s/\xe2\x80\x9c/"/g; # fixup double quotes in case we are passed smart quotes + $attr_str =~ s/\xe2\x80\x9d/"/g; + push @feedback, { feedback => 1, name => 'attribute string', value => $attr_str }; + delete $borrower{patron_attributes} + ; # not really a field in borrowers, so we don't want to pass it to ModMember. + $patron_attributes = extended_attributes_code_value_arrayref($attr_str); + } + + # Popular spreadsheet applications make it difficult to force date outputs to be zero-padded, but we require it. + foreach (qw(dateofbirth dateenrolled dateexpiry)) { + my $tempdate = $borrower{$_} or next; + if ( $tempdate =~ /$date_re/ ) { + $borrower{$_} = format_date_in_iso($tempdate); + } + elsif ( $tempdate =~ /$iso_re/ ) { + $borrower{$_} = $tempdate; + } + else { + $borrower{$_} = ''; + push @missing_criticals, { key => $_, line => $., lineraw => $borrowerline, bad_date => 1 }; + } + } + $borrower{dateenrolled} = $today_iso unless $borrower{dateenrolled}; + $borrower{dateexpiry} = GetExpiryDate( $borrower{categorycode}, $borrower{dateenrolled} ) + unless $borrower{dateexpiry}; + my $borrowernumber; + my $member; + if ( ( $matchpoint eq 'cardnumber' ) && ( $borrower{'cardnumber'} ) ) { + $member = GetMember( 'cardnumber' => $borrower{'cardnumber'} ); + if ($member) { + $borrowernumber = $member->{'borrowernumber'}; + } + } + elsif ($extended) { + if ( defined($matchpoint_attr_type) ) { + foreach my $attr (@$patron_attributes) { + if ( $attr->{code} eq $matchpoint and $attr->{value} ne '' ) { + my @borrowernumbers = $matchpoint_attr_type->get_patrons( $attr->{value} ); + $borrowernumber = $borrowernumbers[0] if scalar(@borrowernumbers) == 1; + last; + } + } + } + } + + if ( C4::Members::checkcardnumber( $borrower{cardnumber}, $borrowernumber ) ) { + push @errors, + { + invalid_cardnumber => 1, + borrowernumber => $borrowernumber, + cardnumber => $borrower{cardnumber} + }; + $invalid++; + next; + } + + if ($borrowernumber) { + + # borrower exists + unless ($overwrite_cardnumber) { + $alreadyindb++; + push( + @feedback, + { + already_in_db => 1, + value => $borrower{'surname'} . ' / ' . $borrowernumber + } + ); + next LINE; + } + $borrower{'borrowernumber'} = $borrowernumber; + for my $col ( keys %borrower ) { + + # use values from extant patron unless our csv file includes this column or we provided a default. + # FIXME : You cannot update a field with a perl-evaluated false value using the defaults. + + # The password is always encrypted, skip it! + next if $col eq 'password'; + + unless ( exists( $csvkeycol{$col} ) || $defaults->{$col} ) { + $borrower{$col} = $member->{$col} if ( $member->{$col} ); + } + } + unless ( ModMember(%borrower) ) { + $invalid++; + + push( + @errors, + { + name => 'lastinvalid', + value => $borrower{'surname'} . ' / ' . $borrowernumber + } + ); + next LINE; + } + if ( $borrower{debarred} ) { + + # Check to see if this debarment already exists + my $debarrments = GetDebarments( + { + borrowernumber => $borrowernumber, + expiration => $borrower{debarred}, + comment => $borrower{debarredcomment} + } + ); + + # If it doesn't, then add it! + unless (@$debarrments) { + AddDebarment( + { + borrowernumber => $borrowernumber, + expiration => $borrower{debarred}, + comment => $borrower{debarredcomment} + } + ); + } + } + if ($extended) { + if ($ext_preserve) { + my $old_attributes = GetBorrowerAttributes($borrowernumber); + $patron_attributes = extended_attributes_merge( $old_attributes, $patron_attributes ); + } + push @errors, { unknown_error => 1 } + unless SetBorrowerAttributes( $borrower{'borrowernumber'}, $patron_attributes ); + } + $overwritten++; + push( + @feedback, + { + feedback => 1, + name => 'lastoverwritten', + value => $borrower{'surname'} . ' / ' . $borrowernumber + } + ); + } + else { + # FIXME: fixup_cardnumber says to lock table, but the web interface doesn't so this doesn't either. + # At least this is closer to AddMember than in members/memberentry.pl + if ( !$borrower{'cardnumber'} ) { + $borrower{'cardnumber'} = fixup_cardnumber(undef); + } + if ( $borrowernumber = AddMember(%borrower) ) { + + if ( $borrower{debarred} ) { + AddDebarment( + { + borrowernumber => $borrowernumber, + expiration => $borrower{debarred}, + comment => $borrower{debarredcomment} + } + ); + } + + if ($extended) { + SetBorrowerAttributes( $borrowernumber, $patron_attributes ); + } + + if ($set_messaging_prefs) { + C4::Members::Messaging::SetMessagingPreferencesFromDefaults( + { + borrowernumber => $borrowernumber, + categorycode => $borrower{categorycode} + } + ); + } + + $imported++; + push( + @feedback, + { + feedback => 1, + name => 'lastimported', + value => $borrower{'surname'} . ' / ' . $borrowernumber + } + ); + } + else { + $invalid++; + push @errors, { unknown_error => 1 }; + push( + @errors, + { + name => 'lastinvalid', + value => $borrower{'surname'} . ' / AddMember', + } + ); + } + } + } + + return { + feedback => \@feedback, + errors => \@errors, + imported => $imported, + overwritten => $overwritten, + already_in_db => $alreadyindb, + invalid => $invalid, + }; +} + +END { } # module clean-up code here (global destructor) + +1; + +__END__ + +=head1 AUTHOR + +Koha Team + +=cut --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -33,188 +33,249 @@

Import patrons

[% IF ( uploadborrowers ) %] -
Import results :
- - [% IF ( FEEDBACK ) %] -

-
-
Feedback:
- -
- [% END %] - [% IF ( ERRORS ) %] -

-
-
Error analysis:
+
Import results :
+ + [% IF ( feedback ) %] +

+ +
+
Feedback:
+ +
+ [% END %] + + [% IF ( errors ) %] +

+ +
+
Error analysis:
+
    + [% FOREACH e IN errors %] + [% IF ( e.badheader ) %]
  • Header row could not be parsed
  • [% END %] + + [% FOREACH missing_critical IN e.missing_criticals %] +
  • + Line [% missing_critical.line %] + + [% IF ( missing_critical.badparse ) %] + could not be parsed! + [% ELSIF ( missing_critical.bad_date ) %] + has "[% missing_critical.key %]" in unrecognized format: "[% missing_critical.value %]" + [% ELSE %] + Critical field "[% missing_critical.key %]" + + [% IF ( missing_critical.branch_map ) %] + has unrecognized value "[% missing_critical.value %]" + [% ELSIF ( missing_critical.category_map ) %] + has unrecognized value "[% missing_critical.value %]" + [% ELSE %] + missing + [% END %] + + (borrowernumber: [% missing_critical.borrowernumber %]; surname: [% missing_critical.surname %]). + [% END %] + +
    + [% missing_critical.lineraw %] +
  • + [% END %] + + [% IF e.invalid_cardnumber %] +
  • + Cardnumber [% e.cardnumber %] is not a valid cardnumber + [% IF e.borrowernumber %] (for patron with borrowernumber [% e.borrowernumber %])[% END %] +
  • + [% END %] [% END %] - (borrowernumber: [% missing_critical.borrowernumber %]; surname: [% missing_critical.surname %]). - [% END %] -
    [% missing_critical.lineraw %] - - [% END %] - [% IF ERROR.invalid_cardnumber %] -
  • - Cardnumber [% ERROR.cardnumber %] is not a valid cardnumber - [% IF ERROR.borrowernumber %] (for patron with borrowernumber [% ERROR.borrowernumber %])[% END %] -
  • - [% END %] +
+
[% END %] - -
- [% END %] [% ELSE %] - -
-
-Import into the borrowers table -
    -
  1. - - -
  2. -
-
- Field to use for record matching -
    -
  1. - +
  2. +
+
+ +
+ Field to use for record matching +
    +
  1. + +
  2. +
+
+ +
+ Default values + +
    + [% FOREACH borrower_field IN borrower_fields %] + + [% SWITCH borrower_field.field %] + [% CASE 'branchcode' %] +
  1. + + + [% borrower_field.field %] +
  2. + [% CASE 'categorycode' %] +
  3. + + + [% borrower_field.field %] +
  4. + [% CASE %] +
  5. + + + [% borrower_field.field %] +
  6. [% END %] - - -
-
-
-Default values -
    -[% FOREACH borrower_field IN borrower_fields %] - [% SWITCH borrower_field.field %] - [% CASE 'branchcode' %] -
  1. - - [% borrower_field.field %] -
  2. - [% CASE 'categorycode' %] -
  3. - - + patron_attributes +
  4. + [% END %] + +
+
+ +
+ If matching record is already in the borrowers table: + +
    +
  1. + +
  2. + +
  3. + +
  4. +
+
+ + [% IF ( Koha.Preference('ExtendedPatronAttributes') == 1 ) %] +
+ Patron attributes + +
    +
  1. + +
  2. + +
  3. + +
  4. +
+
[% END %] - [% borrower_field.field %] - - [% CASE %] -
  • - - [% borrower_field.field %] -
  • - [% END %] -[% END %] -[% IF ( Koha.Preference('ExtendedPatronAttributes') == 1 ) %] -
  • - - - patron_attributes -
  • + +
    +
    [% END %] - -
    - If matching record is already in the borrowers table: -
    1. - + +
    + +
    +

    Notes:

    + +
    -
    -

    Notes:

    - - -
    - - - -
    -[% INCLUDE 'tools-menu.inc' %] -
    - + + + + +
    + [% INCLUDE 'tools-menu.inc' %] +
    + + [% INCLUDE 'intranet-bottom.inc' %] --- a/tools/import_borrowers.pl +++ a/tools/import_borrowers.pl @@ -34,21 +34,16 @@ # dates should be in the format you have set up Koha to expect # branchcode and categorycode need to be valid -use strict; -use warnings; +use Modern::Perl; use C4::Auth; use C4::Output; -use C4::Context; -use C4::Branch qw/GetBranchesLoop GetBranchName/; -use C4::Members; -use C4::Members::Attributes qw(:all); -use C4::Members::AttributeTypes; -use C4::Members::Messaging; -use C4::Reports::Guided; use C4::Templates; -use Koha::Borrower::Debarments; -use Koha::DateUtils; + +use C4::Branch; +use C4::Members; + +use Koha::Patrons::Import qw(import_patrons); use Text::CSV; @@ -61,16 +56,12 @@ use CGI qw ( -utf8 ); # use encoding 'utf8'; # don't do this my ( @errors, @feedback ); -my $extended = C4::Context->preference('ExtendedPatronAttributes'); -my $set_messaging_prefs = C4::Context->preference('EnhancedMessagingPreferences'); -my @columnkeys = C4::Members::columns(); -@columnkeys = map { $_ ne 'borrowernumber' ? $_ : () } @columnkeys; -if ($extended) { - push @columnkeys, 'patron_attributes'; -} +my $extended = C4::Context->preference('ExtendedPatronAttributes'); + +my @columnkeys = map { $_ ne 'borrowernumber' ? $_ : () } C4::Members::columns(); +push( @columnkeys, 'patron_attributes' ) if $extended; my $input = CGI->new(); -our $csv = Text::CSV->new( { binary => 1 } ); # binary needed for non-ASCII Unicode #push @feedback, {feedback=>1, name=>'backend', value=>$csv->backend, backend=>$csv->backend}; #XXX @@ -97,6 +88,7 @@ $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', @@ -105,309 +97,52 @@ if ( $input->param('sample') ) { print $csv->string, "\n"; exit 1; } + my $uploadborrowers = $input->param('uploadborrowers'); my $matchpoint = $input->param('matchpoint'); if ($matchpoint) { $matchpoint =~ s/^patron_attribute_//; } -my $overwrite_cardnumber = $input->param('overwrite_cardnumber'); $template->param( SCRIPT_NAME => '/cgi-bin/koha/tools/import_borrowers.pl' ); if ( $uploadborrowers && length($uploadborrowers) > 0 ) { - push @feedback, { feedback => 1, name => 'filename', value => $uploadborrowers, filename => $uploadborrowers }; - my $handle = $input->upload('uploadborrowers'); - my $uploadinfo = $input->uploadInfo($uploadborrowers); - foreach ( keys %$uploadinfo ) { - push @feedback, { feedback => 1, name => $_, value => $uploadinfo->{$_}, $_ => $uploadinfo->{$_} }; - } - my $imported = 0; - my $alreadyindb = 0; - my $overwritten = 0; - my $invalid = 0; - my $matchpoint_attr_type; + my $handle = $input->upload('uploadborrowers'); my %defaults = $input->Vars; - # use header line to construct key to column map - my $borrowerline = <$handle>; - my $status = $csv->parse($borrowerline); - ($status) or push @errors, { badheader => 1, line => $., lineraw => $borrowerline }; - my @csvcolumns = $csv->fields(); - my %csvkeycol; - my $col = 0; - foreach my $keycol (@csvcolumns) { - - # columnkeys don't contain whitespace, but some stupid tools add it - $keycol =~ s/ +//g; - $csvkeycol{$keycol} = $col++; - } - - #warn($borrowerline); - my $ext_preserve = $input->param('ext_preserve') || 0; - if ($extended) { - $matchpoint_attr_type = C4::Members::AttributeTypes->fetch($matchpoint); - } - - push @feedback, { feedback => 1, name => 'headerrow', value => join( ', ', @csvcolumns ) }; - my $today_iso = output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } ); - my @criticals = qw(surname branchcode categorycode); # there probably should be others - my @bad_dates; # I've had a few. - LINE: while ( my $borrowerline = <$handle> ) { - my %borrower; - my @missing_criticals; - my $patron_attributes; - my $status = $csv->parse($borrowerline); - my @columns = $csv->fields(); - if ( !$status ) { - push @missing_criticals, { badparse => 1, line => $., lineraw => $borrowerline }; - } - elsif ( @columns == @columnkeys ) { - @borrower{@columnkeys} = @columns; - - # MJR: try to fill blanks gracefully by using default values - foreach my $key (@columnkeys) { - if ( $borrower{$key} !~ /\S/ ) { - $borrower{$key} = $defaults{$key}; - } - } - } - else { - # MJR: try to recover gracefully by using default values - foreach my $key (@columnkeys) { - if ( defined( $csvkeycol{$key} ) and $columns[ $csvkeycol{$key} ] =~ /\S/ ) { - $borrower{$key} = $columns[ $csvkeycol{$key} ]; - } - elsif ( $defaults{$key} ) { - $borrower{$key} = $defaults{$key}; - } - elsif ( scalar grep { $key eq $_ } @criticals ) { - - # a critical field is undefined - push @missing_criticals, { key => $key, line => $., lineraw => $borrowerline }; - } - else { - $borrower{$key} = ''; - } - } - } - - #warn join(':',%borrower); - if ( $borrower{categorycode} ) { - push @missing_criticals, - { - key => 'categorycode', - line => $., - lineraw => $borrowerline, - value => $borrower{categorycode}, - category_map => 1 - } - unless GetBorrowercategory( $borrower{categorycode} ); - } - else { - push @missing_criticals, { key => 'categorycode', line => $., lineraw => $borrowerline }; - } - if ( $borrower{branchcode} ) { - push @missing_criticals, - { - key => 'branchcode', - line => $., - lineraw => $borrowerline, - value => $borrower{branchcode}, - branch_map => 1 - } - unless GetBranchName( $borrower{branchcode} ); - } - else { - push @missing_criticals, { key => 'branchcode', line => $., lineraw => $borrowerline }; - } - if (@missing_criticals) { - foreach (@missing_criticals) { - $_->{borrowernumber} = $borrower{borrowernumber} || 'UNDEF'; - $_->{surname} = $borrower{surname} || 'UNDEF'; - } - $invalid++; - ( 25 > scalar @errors ) and push @errors, { missing_criticals => \@missing_criticals }; - - # The first 25 errors are enough. Keeping track of 30,000+ would destroy performance. - next LINE; - } - if ($extended) { - my $attr_str = $borrower{patron_attributes}; - $attr_str =~ s/\xe2\x80\x9c/"/g; # fixup double quotes in case we are passed smart quotes - $attr_str =~ s/\xe2\x80\x9d/"/g; - push @feedback, - { feedback => 1, name => 'attribute string', value => $attr_str, filename => $uploadborrowers }; - delete $borrower{patron_attributes} - ; # not really a field in borrowers, so we don't want to pass it to ModMember. - $patron_attributes = extended_attributes_code_value_arrayref($attr_str); - } - - # Popular spreadsheet applications make it difficult to force date outputs to be zero-padded, but we require it. - foreach (qw(dateofbirth dateenrolled dateexpiry)) { - my $tempdate = $borrower{$_} or next; - $tempdate = - eval { output_pref( { dt => dt_from_string($tempdate), dateonly => 1, dateformat => 'iso' } ); }; - if ($tempdate) { - $borrower{$_} = $tempdate; - } - else { - $borrower{$_} = ''; - push @missing_criticals, { key => $_, line => $., lineraw => $borrowerline, bad_date => 1 }; - } + my $return = Koha::Patrons::Import::import_patrons( + { + file => $handle, + defaults => \%defaults, + matchpoint => $matchpoint, + overwrite_cardnumber => $input->param('overwrite_cardnumber'), + preserve_extended_attributes => $input->param('ext_preserve') || 0, } - $borrower{dateenrolled} = $today_iso unless $borrower{dateenrolled}; - $borrower{dateexpiry} = GetExpiryDate( $borrower{categorycode}, $borrower{dateenrolled} ) - unless $borrower{dateexpiry}; - my $borrowernumber; - my $member; - if ( ( $matchpoint eq 'cardnumber' ) && ( $borrower{'cardnumber'} ) ) { - $member = GetMember( 'cardnumber' => $borrower{'cardnumber'} ); - if ($member) { - $borrowernumber = $member->{'borrowernumber'}; - } - } - elsif ( ( $matchpoint eq 'userid' ) && ( $borrower{'userid'} ) ) { - $member = GetMember( 'userid' => $borrower{'userid'} ); - if ($member) { - $borrowernumber = $member->{'borrowernumber'}; - } - } - elsif ($extended) { - if ( defined($matchpoint_attr_type) ) { - foreach my $attr (@$patron_attributes) { - if ( $attr->{code} eq $matchpoint and $attr->{value} ne '' ) { - my @borrowernumbers = $matchpoint_attr_type->get_patrons( $attr->{value} ); - $borrowernumber = $borrowernumbers[0] if scalar(@borrowernumbers) == 1; - last; - } - } - } - } - - if ( C4::Members::checkcardnumber( $borrower{cardnumber}, $borrowernumber ) ) { - push @errors, - { - invalid_cardnumber => 1, - borrowernumber => $borrowernumber, - cardnumber => $borrower{cardnumber} - }; - $invalid++; - next; - } - - if ($borrowernumber) { - - # borrower exists - unless ($overwrite_cardnumber) { - $alreadyindb++; - $template->param( 'lastalreadyindb' => $borrower{'surname'} . ' / ' . $borrowernumber ); - next LINE; - } - $borrower{'borrowernumber'} = $borrowernumber; - for my $col ( keys %borrower ) { - - # use values from extant patron unless our csv file includes this column or we provided a default. - # FIXME : You cannot update a field with a perl-evaluated false value using the defaults. - - # The password is always encrypted, skip it! - next if $col eq 'password'; - - unless ( exists( $csvkeycol{$col} ) || $defaults{$col} ) { - $borrower{$col} = $member->{$col} if ( $member->{$col} ); - } - } - unless ( ModMember(%borrower) ) { - $invalid++; - - # until we have better error trapping, we have no way of knowing why ModMember errored out... - push @errors, { unknown_error => 1 }; - $template->param( 'lastinvalid' => $borrower{'surname'} . ' / ' . $borrowernumber ); - next LINE; - } - if ( $borrower{debarred} ) { - - # Check to see if this debarment already exists - my $debarrments = GetDebarments( - { - borrowernumber => $borrowernumber, - expiration => $borrower{debarred}, - comment => $borrower{debarredcomment} - } - ); - - # If it doesn't, then add it! - unless (@$debarrments) { - AddDebarment( - { - borrowernumber => $borrowernumber, - expiration => $borrower{debarred}, - comment => $borrower{debarredcomment} - } - ); - } - } - if ($extended) { - if ($ext_preserve) { - my $old_attributes = GetBorrowerAttributes($borrowernumber); - $patron_attributes = extended_attributes_merge( $old_attributes, $patron_attributes ) - ; #TODO: expose repeatable options in template - } - push @errors, { unknown_error => 1 } - unless SetBorrowerAttributes( $borrower{'borrowernumber'}, $patron_attributes ); - } - $overwritten++; - $template->param( 'lastoverwritten' => $borrower{'surname'} . ' / ' . $borrowernumber ); - } - else { - # FIXME: fixup_cardnumber says to lock table, but the web interface doesn't so this doesn't either. - # At least this is closer to AddMember than in members/memberentry.pl - if ( !$borrower{'cardnumber'} ) { - $borrower{'cardnumber'} = fixup_cardnumber(undef); - } - if ( $borrowernumber = AddMember(%borrower) ) { + ); - if ( $borrower{debarred} ) { - AddDebarment( - { - borrowernumber => $borrowernumber, - expiration => $borrower{debarred}, - comment => $borrower{debarredcomment} - } - ); - } + 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}; - if ($extended) { - SetBorrowerAttributes( $borrowernumber, $patron_attributes ); - } + my $uploadinfo = $input->uploadInfo($uploadborrowers); + foreach ( keys %$uploadinfo ) { + push @$feedback, { feedback => 1, name => $_, value => $uploadinfo->{$_}, $_ => $uploadinfo->{$_} }; + } - if ($set_messaging_prefs) { - C4::Members::Messaging::SetMessagingPreferencesFromDefaults( - { - borrowernumber => $borrowernumber, - categorycode => $borrower{categorycode} - } - ); - } + push @$feedback, { feedback => 1, name => 'filename', value => $uploadborrowers, filename => $uploadborrowers }; - $imported++; - $template->param( 'lastimported' => $borrower{'surname'} . ' / ' . $borrowernumber ); - } - else { - $invalid++; - push @errors, { unknown_error => 1 }; - $template->param( 'lastinvalid' => $borrower{'surname'} . ' / AddMember' ); - } - } - } - (@errors) and $template->param( ERRORS => \@errors ); - (@feedback) and $template->param( FEEDBACK => \@feedback ); $template->param( - 'uploadborrowers' => 1, - 'imported' => $imported, - 'overwritten' => $overwritten, - 'alreadyindb' => $alreadyindb, - 'invalid' => $invalid, - 'total' => $imported + $alreadyindb + $invalid + $overwritten, + uploadborrowers => 1, + errors => $errors, + feedback => $feedback, + imported => $imported, + overwritten => $overwritten, + alreadyindb => $alreadyindb, + invalid => $invalid, + total => $imported + $alreadyindb + $invalid + $overwritten, ); } --