From fc2c1f88b2ae9eacaef89d9ebc49610bb49a2e66 Mon Sep 17 00:00:00 2001
From: Chris Cormack <crc@liblime.com>
Date: Sun, 28 Oct 2007 21:50:59 -0500
Subject: [PATCH] Uploading borrowers works now

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../en/modules/tools/import_borrowers.tmpl    |  2 +-
 tools/import_borrowers.pl                     | 41 ++++++++++++-------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl
index 4d601ba4c5..60de8abde0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl
@@ -24,7 +24,7 @@
 	<li><!-- TMPL_VAR name="alreadyindb" --> not imported because already in borrowers table and overwrite disabled</li>
 	<li><!-- TMPL_VAR name="invalid" --> not imported because they are not in the expected format !</li>
 	<li><!-- TMPL_VAR name="total" -->  records parsed</li>
-	<li><a href="/cgi-bin/koha/admin-home.pl">Back</a></li>
+	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Back</a></li>
 </ul>
 <!-- TMPL_ELSE -->
 <ul>
diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
index 54ba751b3b..14993d6b18 100755
--- a/tools/import_borrowers.pl
+++ b/tools/import_borrowers.pl
@@ -31,29 +31,31 @@
 #
 # 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 strict;
 use C4::Auth;
 use C4::Output;
 use C4::Date;
 use C4::Context;
+use C4::Members;
 
 use Text::CSV;
 use CGI;
 
 my @columnkeys = (
-    'cardnumber',   'surname',          'firstname',    'title',
-    'othernames',   'initials',         'streetnumber', 'streettype',
-    'address',      'address2',         'city',         'email',
-    'phone',        'mobile',           'fax',          'emailpro',
-    'phonepro',     'B_streetnumber',   'B_streettype', 'B_address',
-    'B_city',       'B_zipcode',        'B_email',      'B_phone',
-    'dateofbirth',  'branchcode',       'categorycode', 'dateenrolled',
-    'dateexpiry',   'gonenoaddress',    'lost',         'debarred',
-    'contactname',  'contactfirstname', 'contacttitle', 'borrowernotes',
-    'relationship', 'ethnicity',        'ethnotes',     'sex',
-    'userid',       'opacnote',         'contactnote',  'password',
-    'sort1',        'sort2'
+    'cardnumber',    'surname',      'firstname',        'title',
+    'othernames',    'initials',     'streetnumber',     'streettype',
+    'address',       'address2',     'city',             'zipcode',
+    'email',         'phone',        'mobile',           'fax',
+    'emailpro',      'phonepro',     'B_streetnumber',   'B_streettype',
+    'B_address',     'B_city',       'B_zipcode',        'B_email',
+    'B_phone',       'dateofbirth',  'branchcode',       'categorycode',
+    'dateenrolled',  'dateexpiry',   'gonenoaddress',    'lost',
+    'debarred',      'contactname',  'contactfirstname', 'contacttitle',
+    'borrowernotes', 'relationship', 'ethnicity',        'ethnotes',
+    'sex',           'userid',       'opacnote',         'contactnote',
+    'password',      'sort1',        'sort2'
 );
 
 my $input = new CGI;
@@ -86,11 +88,15 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
         my @columns = $csv->fields();
         my %borrower;
         if ( @columns == @columnkeys ) {
+
             @borrower{@columnkeys} = @columns;
-            if ( GetMember( $borrower{'cardnumber'}, 'cardnumber' ) ) {
+            if ( my $member =
+                GetMember( $borrower{'cardnumber'}, 'cardnumber' ) )
+            {
 
                 # borrower exists
                 if ($overwrite_cardnumber) {
+                    $borrower{'borrowernumber'} = $member->{'borrowernumber'};
                     ModMember(%borrower);
                     $overwritten++;
                 }
@@ -99,8 +105,13 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
                 }
             }
             else {
-                AddMember(%borrower);
-                $imported++;
+                my $borrowernumber = AddMember(%borrower);
+                if ($borrowernumber) {
+                    $imported++;
+                }
+                else {
+                    $invalid;
+                }
             }
         }
         else {
-- 
2.39.5