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

Bug 17359: Correct encoding when displaying patron import summary 

There is an encoding issue when the patron import summry, the string
must be UTF8 decoded before being sent to the template.

Test plan:
- Create a patron import CSV file with import issues. Use UTF8 characters.
See file attached to the bug report 'patron_import.csv'
=> The screen should display the line correctly
- Correct the import issue (add a surname for Chloé)
=> The imported patrons should contain the correct values.

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Jonathan Druart 2019-10-16 10:47:28 +02:00 committed by Martin Renvoize
parent c58fc50128
commit 5b03d4be39
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Koha/Patrons/Import.pm
View File

@ -21,6 +21,7 @@ use namespace::clean;
use Carp;
use Text::CSV;
use Encode qw( decode_utf8 );
use C4::Members;
use C4::Members::Attributes qw(:all);
@ -101,7 +102,7 @@ sub import_patrons {
my $status = $self->text_csv->parse($borrowerline);
my @columns = $self->text_csv->fields();
if ( !$status ) {
push @missing_criticals, { badparse => 1, line => $line_number, lineraw => $borrowerline };
push @missing_criticals, { badparse => 1, line => $line_number, lineraw => decode_utf8($borrowerline) };
}
elsif ( @columns == @columnkeys ) {
@borrower{@columnkeys} = @columns;
@ -125,7 +126,7 @@ sub import_patrons {
elsif ( scalar grep { $key eq $_ } @criticals ) {
# a critical field is undefined
push @missing_criticals, { key => $key, line => $., lineraw => $borrowerline };
push @missing_criticals, { key => $key, line => $., lineraw => decode_utf8($borrowerline) };
}
else {
$borrower{$key} = '';
@ -483,14 +484,14 @@ sub check_branch_code {
# No branch code
unless( $branchcode ) {
push (@$missing_criticals, { key => 'branchcode', line => $line_number, lineraw => $borrowerline, });
push (@$missing_criticals, { key => 'branchcode', line => $line_number, lineraw => decode_utf8($borrowerline), });
return;
}
# look for branch code
my $library = Koha::Libraries->find( $branchcode );
unless( $library ) {
push (@$missing_criticals, { key => 'branchcode', line => $line_number, lineraw => $borrowerline,
push (@$missing_criticals, { key => 'branchcode', line => $line_number, lineraw => decode_utf8($borrowerline),
value => $branchcode, branch_map => 1, });
}
}
@ -508,14 +509,14 @@ sub check_borrower_category {
# No branch code
unless( $categorycode ) {
push (@$missing_criticals, { key => 'categorycode', line => $line_number, lineraw => $borrowerline, });
push (@$missing_criticals, { key => 'categorycode', line => $line_number, lineraw => decode_utf8($borrowerline), });
return;
}
# Looking for borrower category
my $category = Koha::Patron::Categories->find($categorycode);
unless( $category ) {
push (@$missing_criticals, { key => 'categorycode', line => $line_number, lineraw => $borrowerline,
push (@$missing_criticals, { key => 'categorycode', line => $line_number, lineraw => decode_utf8($borrowerline),
value => $categorycode, category_map => 1, });
}
}
@ -540,7 +541,7 @@ sub format_dates {
$params->{borrower}->{$date_type} = $formatted_date;
} else {
$params->{borrower}->{$date_type} = '';
push (@{$params->{missing_criticals}}, { key => $date_type, line => $params->{line}, lineraw => $params->{lineraw}, bad_date => 1 });
push (@{$params->{missing_criticals}}, { key => $date_type, line => $params->{line}, lineraw => decode_utf8($params->{lineraw}), bad_date => 1 });
}
}
}