bug 2505: enable warnings in call number normalization modules

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>

diff --git a/C4/ClassSortRoutine.pm b/C4/ClassSortRoutine.pm
index b4fa7a4..6131081 100644 (file)
--- a/C4/ClassSortRoutine.pm
+++ b/C4/ClassSortRoutine.pm
@@ -18,6 +18,8 @@ package C4::ClassSortRoutine;
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
+
 require Exporter;
 use Class::Factory::Util;
 use C4::Context;

diff --git a/C4/ClassSortRoutine/Dewey.pm b/C4/ClassSortRoutine/Dewey.pm
index c077e83..dd768ba 100644 (file)
--- a/C4/ClassSortRoutine/Dewey.pm
+++ b/C4/ClassSortRoutine/Dewey.pm
@@ -18,7 +18,7 @@ package C4::ClassSortRoutine::Dewey;
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
+use warnings;
 
 use vars qw($VERSION);
 
@@ -58,6 +58,8 @@ Generates sorting key using the following rules:
 sub get_class_sort_key {
     my ($cn_class, $cn_item) = @_;
 
+    $cn_class = '' unless defined $cn_class;
+    $cn_item  = '' unless defined $cn_item;
     my $init = uc "$cn_class $cn_item";
     $init =~ s/^\s+//;
     $init =~ s/\s+$//;

diff --git a/C4/ClassSortRoutine/Generic.pm b/C4/ClassSortRoutine/Generic.pm
index ded0239..667ffb6 100644 (file)
--- a/C4/ClassSortRoutine/Generic.pm
+++ b/C4/ClassSortRoutine/Generic.pm
@@ -18,7 +18,7 @@ package C4::ClassSortRoutine::Generic;
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
+use warnings;
 
 use vars qw($VERSION);
 
@@ -53,6 +53,8 @@ Generates sorting key using the following rules:
 sub get_class_sort_key {
     my ($cn_class, $cn_item) = @_;
 
+    $cn_class = '' unless defined $cn_class;
+    $cn_item  = '' unless defined $cn_item;
     my $key = uc "$cn_class $cn_item";
     $key =~ s/^\s+//;
     $key =~ s/\s+$//;

diff --git a/C4/ClassSortRoutine/LCC.pm b/C4/ClassSortRoutine/LCC.pm
index 6ef7589..a4e34b2 100644 (file)
--- a/C4/ClassSortRoutine/LCC.pm
+++ b/C4/ClassSortRoutine/LCC.pm
@@ -18,7 +18,7 @@ package C4::ClassSortRoutine::LCC;
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
+use warnings;
 
 use vars qw($VERSION);
 
@@ -48,6 +48,8 @@ Generates sorting key for LC call numbers.
 sub get_class_sort_key {
     my ($cn_class, $cn_item) = @_;
 
+    $cn_class = '' unless defined $cn_class;
+    $cn_item  = '' unless defined $cn_item;
     my $key = uc "$cn_class $cn_item";
     $key =~ s/^\s+//;
     $key =~ s/\s+$//;

diff --git a/C4/ClassSource.pm b/C4/ClassSource.pm
index 4a161ae..ee468ac 100644 (file)
--- a/C4/ClassSource.pm
+++ b/C4/ClassSource.pm
@@ -18,6 +18,8 @@ package C4::ClassSource;
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
+
 require Exporter;
 use C4::Context;
 use C4::Koha;