Attachment 23757 Details for Bug 11287 – Bug 11287 - Import borrowers doesn't take into account the new debarment system

[patch] Bug 11287 - Import borrowers doesn't take into account the new debarment system

Bug-11287---Import-borrowers-doesnt-take-into-acco.patch (text/plain), 4.22 KB, created by Chris Cormack on 2013-12-22 21:09:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2013-12-22 21:09:39 UTC

Size: 4.22 KB

patch

obsolete

>From 0bcfd9930f36c8e5db068d03ed8ed5da8d410885 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Fri, 22 Nov 2013 09:15:31 -0500
>Subject: [PATCH] Bug 11287 - Import borrowers doesn't take into account the
> new debarment system
>
>The import patrons tool will add restrictions in the previous style (
>directly to the borrowers table ). This will actually work, but
>will result in the restriction being un-removable, and will be
>overwritten by any new restrictions.
>
>Test Plan:
>1) Apply this patch
>2) Import new patrons with debarrments, note the debarment is created
>   correctly
>3) Import existing patrons with overwrite enabled, note that any new
>   debarrment is added, and any existing debarrment is ignored
>
>Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
>
>Works as expected, and fixes the POD too
>---
> Koha/Borrower/Debarments.pm |  2 +-
> tools/import_borrowers.pl   | 34 ++++++++++++++++++++++++++++++++++
> 2 files changed, 35 insertions(+), 1 deletion(-)
>
>diff --git a/Koha/Borrower/Debarments.pm b/Koha/Borrower/Debarments.pm
>index 0febc20..19d72fb 100644
>--- a/Koha/Borrower/Debarments.pm
>+++ b/Koha/Borrower/Debarments.pm
>@@ -44,7 +44,7 @@ Koha::Borrower::Debarments - Module for managing borrower debarments
> 
> =head2 GetDebarments
> 
>-my $arrayref = GetDebarments( $borrowernumber, { key => $value } );
>+my $arrayref = GetDebarments({ borrowernumber => $borrowernumber [, key => $value ] );
> 
> =cut
> 
>diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
>index 5f65c97..19ed992 100755
>--- a/tools/import_borrowers.pl
>+++ b/tools/import_borrowers.pl
>@@ -46,6 +46,7 @@ use C4::Members;
> use C4::Members::Attributes qw(:all);
> use C4::Members::AttributeTypes;
> use C4::Members::Messaging;
>+use Koha::Borrower::Debarments;
> 
> use Text::CSV;
> # Text::CSV::Unicode, even in binary mode, fails to parse lines with these diacriticals:
>@@ -258,6 +259,26 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
>                 $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);
>@@ -274,13 +295,26 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
>                 $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++;
>                 $template->param('lastimported'=>$borrower{'surname'}.' / '.$borrowernumber);
>             } else {
>-- 
>1.8.3.2

Actions: View | Diff | Splinter Review

Attachments on bug 11287: 23082 | 23083 | 23757 | 23788