[Koha-patches] [PATCH] [Bug 3600] Handle null-or-empty to Charset::StripNonXmlChars
J. David Bavousett
dbavousett at ptfs.com
Thu Sep 10 17:10:50 CEST 2009
When rebuild_zebra.pl is run from cron, there is an occasional error
of the form:
Use of uninitialized value $str in substitution (s///) at /home/ebpl/kohaclone/C4/Charset.pm line 304.
This error is occuring when the string that is fed to Charset::StripNonXmlChars
is null or undefined, for some reason.
This fix will handle the null-or-empty condition, and thus suppress the error.
---
C4/Charset.pm | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/C4/Charset.pm b/C4/Charset.pm
index bbeef24..65da33a 100644
--- a/C4/Charset.pm
+++ b/C4/Charset.pm
@@ -301,6 +301,9 @@ to work, at the possible risk of some data loss.
sub StripNonXmlChars {
my $str = shift;
+ if (!defined($str) || $str eq ""){
+ return "";
+ }
$str =~ s/[^\x09\x0A\x0D\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]//g;
return $str;
}
--
1.5.6.5
More information about the Koha-patches
mailing list