From c95b5153e0ed5585c8331273a42fc29d75f9f10f Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Thu, 11 Nov 2010 09:02:13 -0500 Subject: [PATCH] Bug 4305 Improve code flow Use the ISBN Object's method to format the string rather than add extra code to do it Clean up the code flow for clarity Benchmarking shows its a bit faster too Don't add to the number of Test::Perl::Critic warnings for no benefit Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack --- C4/Koha.pm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/C4/Koha.pm b/C4/Koha.pm index e746f832a5..a63a3a551a 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -1350,14 +1350,15 @@ sub _normalize_match_point { return $normalized_match_point; } -sub _isbn_cleanup ($) { - my $isbn = Business::ISBN->new( shift ); - return undef unless $isbn; - $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13'; - return undef unless $isbn; - $isbn = $isbn->as_string; - $isbn =~ s/-//g; - return $isbn; +sub _isbn_cleanup { + my $isbn = Business::ISBN->new( $_[0] ); + if ( $isbn ) { + $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13'; + if (defined $isbn) { + return $isbn->as_string([]); + } + } + return; } 1; -- 2.39.5