Bug 11650: multiplicated authorities after link_bibs_to_authorities.pl

[koha_fer] / C4 / Koha.pm

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 5988249..6f98ac6 100644 (file)
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1595,7 +1595,7 @@ sub NormalizeISBN {
 
     my $isbn = Business::ISBN->new($string);
 
-    if ( $isbn && $isbn->error != Business::ISBN::BAD_ISBN ) {
+    if ( $isbn && $isbn->is_valid() ) {
 
         if ( $format eq 'ISBN-10' ) {
             $isbn = $isbn->as_isbn10();
@@ -1640,6 +1640,9 @@ sub GetVariationsOfISBN {
     push( @isbns, NormalizeISBN({ isbn => $isbn, format => 'ISBN-10', strip_hyphens => 1 }) );
     push( @isbns, NormalizeISBN({ isbn => $isbn, format => 'ISBN-13', strip_hyphens => 1 }) );
 
+    # Strip out any "empty" strings from the array
+    @isbns = grep { defined($_) && $_ =~ /\S/ } @isbns;
+
     return wantarray ? @isbns : join( " | ", @isbns );
 }