From 22ddf1501571aaeb5d3e928a682a6198ad41a6aa Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Fri, 16 Sep 2011 18:28:00 +0200 Subject: [PATCH] Bug 6875 de-nesting C4::Koha.pm * removed use C4::Output, that was not used * moved use URI::split to getitemtypeimagelocation and switched to "require". Checked it still works through admin/itemtype.pl * moved use Business::ISBN to _isbn_cleanup.pl and switched to "require". Checked it still works with the following small script : use C4::Koha; print GetNormalizedISBN("1-56592-257-3"); (GetNormalizedISBN uses _isbn_cleanup) Signed-off-by: Jared Camins-Esakov (cherry picked from commit 8165aeef777863d03f096f5547032d47d79cfa0f) Signed-off-by: Chris Nighswonger (cherry picked from commit c29850630d22c75bd85352b8bd169158f23eaa89) Signed-off-by: Chris Nighswonger --- C4/Koha.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/C4/Koha.pm b/C4/Koha.pm index 789f674efb..976b46a07f 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -23,10 +23,7 @@ package C4::Koha; use strict; #use warnings; FIXME - Bug 2505 use C4::Context; -use C4::Output; -use URI::Split qw(uri_split); use Memoize; -use Business::ISBN; use vars qw($VERSION @ISA @EXPORT $DEBUG); @@ -472,8 +469,9 @@ sub getitemtypeimagelocation($$) { my ( $src, $image ) = @_; return '' if ( !$image ); + require URI::Split; - my $scheme = ( uri_split( $image ) )[0]; + my $scheme = ( URI::Split::uri_split( $image ) )[0]; return $image if ( $scheme ); @@ -1315,6 +1313,7 @@ sub _normalize_match_point { } sub _isbn_cleanup { + require Business::ISBN; my $isbn = Business::ISBN->new( $_[0] ); if ( $isbn ) { $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13'; -- 2.39.5