Attachment 39128 Details for Bug 12598 – Bug 12598 [QA Followup]

[patch] Bug 12598 [QA Followup]

Bug-12598-QA-Followup.patch (text/plain), 3.37 KB, created by Kyle M Hall (khall) on 2015-05-13 13:23:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-05-13 13:23:16 UTC

Size: 3.37 KB

patch

obsolete

>From fd26a8f61f2efa55202b065f361304f1217d3699 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Wed, 13 May 2015 08:59:21 -0400
>Subject: [PATCH] Bug 12598 [QA Followup]
>
>* Fix copyright on import_borrowers.pl
>* Changes -c --csv to -f --file
>* Adds -c --confirm option
>* Renames misc/import_borrowers.pl to misc/import_patrons.pl
>* Restore userid matchpoint option
>---
> .../prog/en/modules/tools/import_borrowers.tt      |    1 +
> misc/{import_borrowers.pl => import_patrons.pl}    |   13 +++++++------
> 2 files changed, 8 insertions(+), 6 deletions(-)
> rename misc/{import_borrowers.pl => import_patrons.pl} (86%)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
>index 7a4c8af..8cade14 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
>@@ -138,6 +138,7 @@
>                 <li class="radio">
>                     <select name="matchpoint" id="matchpoint">
>                         <option value="cardnumber">Cardnumber</option>
>+                        <option value="userid">Username</option>
>                         [% FOREACH matchpoint IN matchpoints %]
>                             <option value="[% matchpoint.code %]">[% matchpoint.description %]</option>
>                         [% END %]
>diff --git a/misc/import_borrowers.pl b/misc/import_patrons.pl
>similarity index 86%
>rename from misc/import_borrowers.pl
>rename to misc/import_patrons.pl
>index d6ca3d3..1c98160 100755
>--- a/misc/import_borrowers.pl
>+++ b/misc/import_patrons.pl
>@@ -1,7 +1,5 @@
> #!/usr/bin/perl
> 
>-# Copyright 2007 Liblime
>-# Parts copyright 2010 BibLibre
> # Parts copyright 2014 ByWater Solutions
> #
> # This file is part of Koha.
>@@ -30,11 +28,13 @@ my $matchpoint;
> my $overwrite_cardnumber;
> my %defaults;
> my $ext_preserve = 0;
>+my $confirm;
> my $verbose      = 0;
> my $help;
> 
> GetOptions(
>-    'c|csv=s'                       => \$csv_file,
>+    'c|confirm'                     => \$confirm,
>+    'f|file=s'                      => \$csv_file,
>     'm|matchpoint=s'                => \$matchpoint,
>     'd|default=s'                   => \%defaults,
>     'o|overwrite'                   => \$overwrite_cardnumber,
>@@ -43,7 +43,7 @@ GetOptions(
>     'h|help|?'                      => \$help,
> );
> 
>-print_help() if ( $help || !$csv_file || !$matchpoint );
>+print_help() if ( $help || !$csv_file || !$matchpoint || !$confirm );
> 
> my $handle;
> open( $handle, "<", $csv_file ) or die $!;
>@@ -89,8 +89,9 @@ if ($verbose > 2 ) {
> 
> sub print_help {
>     print <<_USAGE_;
>-import_borrowers.pl -c /path/to/borrowers.csv -m cardnumber
>-    -c --csv                            Path to the CSV file of patrons  to import
>+import_patrons.pl -c /path/to/patrons.csv -m cardnumber
>+    -c --confirm                        Confirms you really want to import these patrons, otherwise prints this help
>+    -f --file                           Path to the CSV file of patrons to import
>     -m --matchpoint                     Field on which to match incoming patrons to existing patrons
>     -d --default                        Set defaults to patron fields, repeatable e.g. --default branchcode=MPL --default categorycode=PT
>     -p --preserve-extended-atributes    Retain extended patron attributes for existing patrons being overwritten
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 12598: 29807 | 29808 | 29809 | 29939 | 30755 | 30780 | 35557 | 35558 | 35559 | 35560 | 35848 | 35849 | 35850 | 35851 | 35964 | 36684 | 36685 | 36687 | 36688 | 36690 | 36692 | 36693 | 36694 | 36695 | 36696 | 39124 | 39125 | 39126 | 39127 | 39128 | 41790 | 41791 | 41792 | 41793 | 41794 | 44065 | 44066 | 44067 | 44068 | 44069 | 48753 | 48754 | 48755 | 48756 | 48757 | 50693 | 50694 | 50695 | 50696 | 50697 | 50698 | 50699 | 50700 | 50704 | 51122 | 51357 | 51358 | 51359 | 51360 | 51361 | 51362 | 51363 | 51364 | 51365 | 51366 | 51367 | 51368 | 51369 | 51370 | 51371 | 51372 | 52323 | 52324 | 52325 | 52326 | 52327 | 52328 | 52329 | 52330 | 52331 | 52332 | 52333 | 52540 | 64437 | 64438 | 64855 | 65214 | 65215 | 65216 | 65217 | 65218 | 65819 | 65820 | 65821 | 65822 | 65823 | 65824 | 66353 | 66354 | 66355 | 66356 | 66357 | 66358 | 66359 | 66575 | 66576 | 66577 | 66578 | 66579 | 66580 | 66581 | 66582 | 67276 | 67277 | 70265 | 70266 | 71755 | 71756 | 71757 | 71758 | 71759 | 71760 | 71761 | 71762 | 71763 | 71764 | 71765 | 71766