Attachment 111920 Details for Bug 26351 – Bug 26351: (QA follow-up) Rename barcode_transform to item_barcode_transform

[patch] Bug 26351: (QA follow-up) Rename barcode_transform to item_barcode_transform

Bug-26351-QA-follow-up-Rename-barcodetransform-to-.patch (text/plain), 12.10 KB, created by Martin Renvoize (ashimema) on 2020-10-16 15:47:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-10-16 15:47:33 UTC

Size: 12.10 KB

patch

obsolete

>From f608b80f56266614f8b3f71bfae5ff444e476d51 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Fri, 16 Oct 2020 07:36:31 -0400
>Subject: [PATCH] Bug 26351: (QA follow-up) Rename barcode_transform to
> item_barcode_transform
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Circulation.pm                                           | 2 +-
> C4/ILSDI/Services.pm                                        | 2 +-
> Koha/Item.pm                                                | 2 +-
> cataloguing/additem.pl                                      | 2 +-
> circ/circulation.pl                                         | 2 +-
> circ/returns.pl                                             | 4 ++--
> offline_circ/process_koc.pl                                 | 4 ++--
> opac/sco/sco-main.pl                                        | 2 +-
> t/db_dependent/Koha/Plugins/Barcode_transform_hooks.t       | 2 +-
> t/db_dependent/Koha/Plugins/Biblio_and_Items_plugin_hooks.t | 2 +-
> t/db_dependent/Koha/Plugins/Circulation_hooks.t             | 2 +-
> t/db_dependent/Koha/Plugins/Plugins.t                       | 2 +-
> t/lib/Koha/Plugin/Test.pm                                   | 6 +++---
> tools/batchMod.pl                                           | 2 +-
> tools/inventory.pl                                          | 2 +-
> 15 files changed, 19 insertions(+), 19 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 0058fae5f6..db27e31fd1 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -174,7 +174,7 @@ sub barcodedecode {
>     my ($barcode, $filter) = @_;
>     my $branch = C4::Context::mybranch();
>     $filter = C4::Context->preference('itemBarcodeInputFilter') unless $filter;
>-    ($barcode) = Koha::Plugins->call('barcode_transform', 'item', $barcode ) || $barcode;
>+    ($barcode) = Koha::Plugins->call('item_barcode_transform',  $barcode ) || $barcode;
>     $filter or return $barcode;     # ensure filter is defined, else return untouched barcode
> 	if ($filter eq 'whitespace') {
> 		$barcode =~ s/\s//g;
>diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
>index 5c124ed841..e7e190bf39 100644
>--- a/C4/ILSDI/Services.pm
>+++ b/C4/ILSDI/Services.pm
>@@ -614,7 +614,7 @@ sub GetServices {
>     # Issuing management
>     my $barcode = $item->barcode || '';
>     $barcode = barcodedecode($barcode) if ( $barcode && C4::Context->preference('itemBarcodeInputFilter') );
>-    ($barcode) = Koha::Plugins->call('barcode_transform', 'item', $barcode ) || $barcode;
>+    ($barcode) = Koha::Plugins->call('item_barcode_transform', $barcode ) || $barcode;
>     if ($barcode) {
>         my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $barcode );
> 
>diff --git a/Koha/Item.pm b/Koha/Item.pm
>index 6921c6d9ce..442c127274 100644
>--- a/Koha/Item.pm
>+++ b/Koha/Item.pm
>@@ -89,7 +89,7 @@ sub store {
>         $self->itype($self->biblio->biblioitem->itemtype);
>     }
> 
>-    my ($transformed_barcode) = Koha::Plugins->call( 'barcode_transform', 'item', $self->barcode ) || $self->barcode;
>+    my ($transformed_barcode) = Koha::Plugins->call( 'item_barcode_transform', $self->barcode ) || $self->barcode;
>     $self->barcode($transformed_barcode);
> 
>     my $today         = dt_from_string;
>diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
>index 670927592f..7905b9f6bd 100755
>--- a/cataloguing/additem.pl
>+++ b/cataloguing/additem.pl
>@@ -517,7 +517,7 @@ if ($op eq "additem") {
> 
>     my $addedolditem = TransformMarcToKoha( $record );
> 
>-    my ( $new_barcode ) = Koha::Plugins->call( 'barcode_transform', 'item', $addedolditem->{'barcode'} ) || $addedolditem->{'barcode'};
>+    my ( $new_barcode ) = Koha::Plugins->call( 'item_barcode_transform', $addedolditem->{'barcode'} ) || $addedolditem->{'barcode'};
>     $addedolditem->{'barcode'} = $new_barcode;
> 
>     # If we have to add or add & duplicate, we add the item
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index 853625ca46..84b27a5d76 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -166,7 +166,7 @@ for my $barcode ( @$barcodes ) {
>     $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
>     $barcode = barcodedecode($barcode)
>         if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
>-    ( $barcode ) = Koha::Plugins->call( 'barcode_transform', 'item', $barcode ) || $barcode;
>+    ( $barcode ) = Koha::Plugins->call( 'item_barcode_transform', $barcode ) || $barcode;
> }
> 
> my $stickyduedate  = $query->param('stickyduedate') || $session->param('stickyduedate');
>diff --git a/circ/returns.pl b/circ/returns.pl
>index 35346c313a..b690b41a9a 100755
>--- a/circ/returns.pl
>+++ b/circ/returns.pl
>@@ -114,7 +114,7 @@ foreach ( $query->param ) {
> 
>     # decode barcode    ## Didn't we already decode them before passing them back last time??
>     $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
>-    ( $barcode ) = Koha::Plugins->call( 'barcode_transform', 'item', $barcode ) || $barcode;
>+    ( $barcode ) = Koha::Plugins->call( 'item_barcode_transform', $barcode ) || $barcode;
>     $barcode = barcodedecode($barcode) if(C4::Context->preference('itemBarcodeInputFilter'));
> 
>     ######################
>@@ -244,7 +244,7 @@ if ($canceltransfer){
> my $returnbranch;
> if ($barcode) {
>     $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
>-    ( $barcode ) = Koha::Plugins->call( 'barcode_transform', 'item', $barcode ) || $barcode;
>+    ( $barcode ) = Koha::Plugins->call( 'item_barcode_transform', $barcode ) || $barcode;
>     $barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');
>     my $item = Koha::Items->find({ barcode => $barcode });
> 
>diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl
>index cb1be901a1..ae2725adb3 100755
>--- a/offline_circ/process_koc.pl
>+++ b/offline_circ/process_koc.pl
>@@ -248,7 +248,7 @@ sub kocIssueItem {
> 
>     $circ->{ 'barcode' } = barcodedecode($circ->{'barcode'}) if( $circ->{'barcode'} && C4::Context->preference('itemBarcodeInputFilter'));
> 
>-    my ( $new_barcode ) = Koha::Plugins->call( 'barcode_transform', 'item', $circ->{barcode} ) || $circ->{barcode};
>+    my ( $new_barcode ) = Koha::Plugins->call( 'item_barcode_transform', $circ->{barcode} ) || $circ->{barcode};
>     $circ->{barcode} = $new_barcode;
> 
>     my $branchcode = C4::Context->userenv->{branch};
>@@ -332,7 +332,7 @@ sub kocReturnItem {
>     my ( $circ ) = @_;
>     $circ->{'barcode'} = barcodedecode($circ->{'barcode'}) if( $circ->{'barcode'} && C4::Context->preference('itemBarcodeInputFilter'));
> 
>-    my ( $new_barcode ) = Koha::Plugins->call( 'barcode_transform', 'item', $circ->{barcode} ) || $circ->{barcode};
>+    my ( $new_barcode ) = Koha::Plugins->call( 'item_barcode_transform', $circ->{barcode} ) || $circ->{barcode};
>     $circ->{barcode} = $new_barcode;
> 
>     my $item = Koha::Items->find({ barcode => $circ->{barcode} });
>diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
>index 62b9451a98..93a1a4a9af 100755
>--- a/opac/sco/sco-main.pl
>+++ b/opac/sco/sco-main.pl
>@@ -110,7 +110,7 @@ my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $newissues) =
>     $query->param("newissues")  || '',
> );
> 
>-( $barcode ) = Koha::Plugins->call( 'barcode_transform', 'item', $barcode ) || $barcode;
>+( $barcode ) = Koha::Plugins->call( 'item_barcode_transform', $barcode ) || $barcode;
> 
> my @newissueslist = split /,/, $newissues;
> my $issuenoconfirm = 1; #don't need to confirm on issue.
>diff --git a/t/db_dependent/Koha/Plugins/Barcode_transform_hooks.t b/t/db_dependent/Koha/Plugins/Barcode_transform_hooks.t
>index 9f5fa9eded..5a6b156f2a 100755
>--- a/t/db_dependent/Koha/Plugins/Barcode_transform_hooks.t
>+++ b/t/db_dependent/Koha/Plugins/Barcode_transform_hooks.t
>@@ -70,7 +70,7 @@ subtest '() hook tests' => sub {
>     $item_1->barcode('THISISATEST');
> 
>     warning_like { $item_1->store(); }
>-        qr/barcode_transform called with parameters: item, THISISATEST/,
>+        qr/item_barcode_transform called with parameter: THISISATEST/,
>         'AddReserve calls the after_hold_create hook';
> 
>     $schema->storage->txn_rollback;
>diff --git a/t/db_dependent/Koha/Plugins/Biblio_and_Items_plugin_hooks.t b/t/db_dependent/Koha/Plugins/Biblio_and_Items_plugin_hooks.t
>index af49ef9563..aaf43c2ee5 100755
>--- a/t/db_dependent/Koha/Plugins/Biblio_and_Items_plugin_hooks.t
>+++ b/t/db_dependent/Koha/Plugins/Biblio_and_Items_plugin_hooks.t
>@@ -53,7 +53,7 @@ subtest 'after_biblio_action() and after_item_action() hooks tests' => sub {
>     my $plugin = Koha::Plugin::Test->new->enable;
> 
>     my $test_plugin = Test::MockModule->new('Koha::Plugin::Test');
>-    $test_plugin->mock( 'barcode_transform', undef );
>+    $test_plugin->mock( 'item_barcode_transform', undef );
> 
>     my $biblio_id;
> 
>diff --git a/t/db_dependent/Koha/Plugins/Circulation_hooks.t b/t/db_dependent/Koha/Plugins/Circulation_hooks.t
>index c7ca3030bf..4d68119e80 100755
>--- a/t/db_dependent/Koha/Plugins/Circulation_hooks.t
>+++ b/t/db_dependent/Koha/Plugins/Circulation_hooks.t
>@@ -66,7 +66,7 @@ subtest 'after_circ_action() hook tests' => sub {
>     my $test_plugin = Test::MockModule->new('Koha::Plugin::Test');
>     $test_plugin->mock( 'after_item_action',   undef );
>     $test_plugin->mock( 'after_biblio_action', undef );
>-    $test_plugin->mock( 'barcode_transform', undef );
>+    $test_plugin->mock( 'item_barcode_transform', undef );
> 
>     my $biblio = $builder->build_sample_biblio();
>     my $item_1 = $builder->build_sample_item( { biblionumber => $biblio->biblionumber } );
>diff --git a/t/db_dependent/Koha/Plugins/Plugins.t b/t/db_dependent/Koha/Plugins/Plugins.t
>index c15153cef8..a064e98edf 100755
>--- a/t/db_dependent/Koha/Plugins/Plugins.t
>+++ b/t/db_dependent/Koha/Plugins/Plugins.t
>@@ -181,7 +181,7 @@ ok( $plugin->can('opac_head'), 'Test plugin can opac_head' );
> ok( $plugin->can('opac_js'), 'Test plugin can opac_js' );
> ok( $plugin->can('intranet_head'), 'Test plugin can intranet_head' );
> ok( $plugin->can('intranet_js'), 'Test plugin can intranet_js' );
>-ok( $plugin->can('barcode_transform'), 'Test plugin can barcode_transform' );
>+ok( $plugin->can('item_barcode_transform'), 'Test plugin can barcode_transform' );
> ok( $plugin->can('configure'), 'Test plugin can configure' );
> ok( $plugin->can('install'), 'Test plugin can install' );
> ok( $plugin->can('upgrade'), 'Test plugin can upgrade' );
>diff --git a/t/lib/Koha/Plugin/Test.pm b/t/lib/Koha/Plugin/Test.pm
>index 552e38788a..24217d098f 100644
>--- a/t/lib/Koha/Plugin/Test.pm
>+++ b/t/lib/Koha/Plugin/Test.pm
>@@ -93,9 +93,9 @@ sub intranet_js {
>     return "Koha::Plugin::Test::intranet_js";
> }
> 
>-sub barcode_transform {
>-    my ( $self, $type, $barcode ) = @_;
>-    Koha::Exceptions::Exception->throw("barcode_transform called with parameters: $type, $barcode");
>+sub item_barcode_transform {
>+    my ( $self, $barcode ) = @_;
>+    Koha::Exceptions::Exception->throw("item_barcode_transform called with parameter: $barcode");
> }
> 
> sub configure {
>diff --git a/tools/batchMod.pl b/tools/batchMod.pl
>index bb67943384..426c99b9f7 100755
>--- a/tools/batchMod.pl
>+++ b/tools/batchMod.pl
>@@ -404,7 +404,7 @@ if ($op eq "show"){
>             my @barcodelist = grep /\S/, ( split /[$split_chars]/, $list );
>             @barcodelist = uniq @barcodelist;
> 
>-            @barcodelist = map { ( Koha::Plugins->call( 'barcode_transform', 'item', $_ ) )[0] || $_ } @barcodelist;
>+            @barcodelist = map { ( Koha::Plugins->call( 'item_barcode_transform', $_ ) )[0] || $_ } @barcodelist;
> 
>             # Note: adding lc for case insensitivity
>             my %itemdata = map { lc($_->{barcode}) => $_->{itemnumber} } @{ Koha::Items->search({ barcode => \@barcodelist }, { columns => [ 'itemnumber', 'barcode' ] } )->unblessed };
>diff --git a/tools/inventory.pl b/tools/inventory.pl
>index aee3cce18f..fe671274a8 100755
>--- a/tools/inventory.pl
>+++ b/tools/inventory.pl
>@@ -179,7 +179,7 @@ if ( ($uploadbarcodes && length($uploadbarcodes) > 0) || ($barcodelist && length
>     for my $barcode (@uploadedbarcodes) {
>         next unless $barcode;
> 
>-        ($barcode) = Koha::Plugins->call('barcode_transform', 'item', $barcode ) || $barcode;
>+        ($barcode) = Koha::Plugins->call('item_barcode_transform', $barcode ) || $barcode;
> 
>         ++$lines_read;
>         if (length($barcode)>$barcode_size) {
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26351: 109532 | 109548 | 109671 | 110844 | 110846 | 111575 | 111577 | 111578 | 111579 | 111862 | 111863 | 111894 | 111916 | 111917 | 111918 | 111919 | 111920 | 111921 | 111922 | 113571 | 113572 | 113573 | 113574 | 113575 | 113576 | 113577 | 113578 | 115172 | 115173 | 115174 | 115175 | 115176 | 115177 | 115178 | 115179 | 115180 | 118649 | 118650 | 118651 | 118652 | 118653 | 118654 | 118655 | 118656 | 118657 | 118658 | 118681 | 118682 | 118683 | 118684 | 118685 | 118686 | 118687 | 118688 | 118689 | 118690 | 122433 | 122434 | 122435 | 122436 | 122437 | 122438 | 122439 | 122440 | 122441 | 122442 | 124258 | 124259 | 124260 | 124261 | 124262 | 124263 | 124264 | 124265 | 124266 | 124313 | 125447 | 125763 | 125764 | 125765