Attachment 116739 Details for Bug 27673 – Bug 27673: Rename C4::Circulation decode to _decode

[patch] Bug 27673: Rename C4::Circulation decode to _decode

Bug-27673-Rename-C4Circulation-decode-to-decode.patch (text/plain), 1.46 KB, created by Kyle M Hall (khall) on 2021-02-11 14:30:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2021-02-11 14:30:57 UTC

Size: 1.46 KB

patch

obsolete

>From f167767d4ef18842cc5869822424a9623b186c21 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 11 Feb 2021 10:44:04 +0100
>Subject: [PATCH] Bug 27673: Rename C4::Circulation decode to _decode
>
>To prevent conflict with Encode::encode
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> C4/Circulation.pm | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index e2298ad684..d59d37cbf6 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -182,7 +182,7 @@ sub barcodedecode {
> 	} elsif ($filter eq 'cuecat') {
> 		chomp($barcode);
> 	    my @fields = split( /\./, $barcode );
>-	    my @results = map( decode($_), @fields[ 1 .. $#fields ] );
>+	    my @results = map( C4::Circulation::_decode($_), @fields[ 1 .. $#fields ] );
> 	    ($#results == 2) and return $results[2];
> 	} elsif ($filter eq 'T-prefix') {
> 		if ($barcode =~ /^[Tt](\d)/) {
>@@ -213,9 +213,9 @@ sub barcodedecode {
>     return $barcode;    # return barcode, modified or not
> }
> 
>-=head2 decode
>+=head2 _decode
> 
>-  $str = &decode($chunk);
>+  $str = &_decode($chunk);
> 
> Decodes a segment of a string emitted by a CueCat barcode scanner and
> returns it.
>@@ -225,7 +225,7 @@ or Javascript based decoding on the client side.
> 
> =cut
> 
>-sub decode {
>+sub _decode {
>     my ($encoded) = @_;
>     my $seq =
>       'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-';
>-- 
>2.24.1 (Apple Git-126)

Actions: View | Diff | Splinter Review

Attachments on bug 27673: 116670 | 116675 | 116694 | 116695 | 116696 | 116737 | 116738 | 116739 | 116740 | 116762 | 116763 | 116764 | 116765 | 116766 | 116778 | 116835 | 116929 | 116990