View | Details | Raw Unified | Return to bug 5771
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt (-1 / +1 lines)
Lines 53-59 Link Here
53
    <h5>Error analysis:</h5>
53
    <h5>Error analysis:</h5>
54
    [% IF download_errors %]
54
    [% IF download_errors %]
55
    <form method="post">
55
    <form method="post">
56
	<input type="hidden" name="errors_filename" value="<!-- TMPL_VAR NAME="errors_filename" -->" />
56
	<input type="hidden" name="errors_filename" value="[% errors_filename %]" />
57
	<input type="hidden" name="report" value="report" />
57
	<input type="hidden" name="report" value="report" />
58
	<input type="submit" value="Download report" />
58
	<input type="submit" value="Download report" />
59
    </form>
59
    </form>
(-)a/tools/import_borrowers.pl (-3 / +7 lines)
Lines 57-62 use Text::CSV; Link Here
57
use CGI;
57
use CGI;
58
# use encoding 'utf8';    # don't do this
58
# use encoding 'utf8';    # don't do this
59
59
60
my $commandline = @ARGV ? 1 : 0;
60
my (@errors, @feedback);
61
my (@errors, @feedback);
61
my $extended = C4::Context->preference('ExtendedPatronAttributes');
62
my $extended = C4::Context->preference('ExtendedPatronAttributes');
62
my $set_messaging_prefs = C4::Context->preference('EnhancedMessagingPreferences');
63
my $set_messaging_prefs = C4::Context->preference('EnhancedMessagingPreferences');
Lines 156-161 if ( $uploadborrowers && length($uploadborrowers) > 0 ) { Link Here
156
    my @bad_dates;  # I've had a few.
157
    my @bad_dates;  # I've had a few.
157
    my $date_re = C4::Dates->new->regexp('syspref');
158
    my $date_re = C4::Dates->new->regexp('syspref');
158
    my  $iso_re = C4::Dates->new->regexp('iso');
159
    my  $iso_re = C4::Dates->new->regexp('iso');
160
    my $lastalreadyindb;
161
    my $lastinvalid;
159
    LINE: while ( my $borrowerline = <$handle> ) {
162
    LINE: while ( my $borrowerline = <$handle> ) {
160
        my %borrower;
163
        my %borrower;
161
        my @missing_criticals;
164
        my @missing_criticals;
Lines 254-260 if ( $uploadborrowers && length($uploadborrowers) > 0 ) { Link Here
254
            # borrower exists
257
            # borrower exists
255
            unless ($overwrite_cardnumber) {
258
            unless ($overwrite_cardnumber) {
256
                $alreadyindb++;
259
                $alreadyindb++;
257
                $template->param('lastalreadyindb'=>$borrower{'surname'}.' / '.$borrowernumber);
260
		$lastalreadyindb = $borrower{'surname'}.' / '.$borrowernumber;
261
                $template->param('lastalreadyindb'=>$lastalreadyindb);
258
                next LINE;
262
                next LINE;
259
            }
263
            }
260
            $borrower{'borrowernumber'} = $borrowernumber;
264
            $borrower{'borrowernumber'} = $borrowernumber;
Lines 273-279 if ( $uploadborrowers && length($uploadborrowers) > 0 ) { Link Here
273
                $invalid++;
277
                $invalid++;
274
                # untill we have better error trapping, we have no way of knowing why ModMember errored out...
278
                # untill we have better error trapping, we have no way of knowing why ModMember errored out...
275
                push @errors, {unknown_error => 1};
279
                push @errors, {unknown_error => 1};
276
                $template->param('lastinvalid'=>$borrower{'surname'}.' / '.$borrowernumber);
280
		$lastinvalid = $borrower{'surname'}.' / '.$borrowernumber;
281
                $template->param('lastinvalid'=>$lastinvalid);
277
                next LINE;
282
                next LINE;
278
            }
283
            }
279
            if ($extended) {
284
            if ($extended) {
280
- 

Return to bug 5771