Bug 8015: (follow-up) trap exceptions thrown by SetUTF8Flag()

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Leila <koha.aixmarseille@gmail.com>
Bug 8015: Catch error in the SetUTF8Flag routine

The eval avoids the interface to run endlessly if an error occurred.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Leila <koha.aixmarseille@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/C4/Charset.pm b/C4/Charset.pm
index f8ddd63..2968b5e 100644 (file)
--- a/C4/Charset.pm
+++ b/C4/Charset.pm
@@ -131,23 +131,26 @@ But since it handles charset, and MARC::Record, it finds its way in that package
 =cut
 
 sub SetUTF8Flag{
 =cut
 
 sub SetUTF8Flag{

-       my ($record, $nfd)=@_;
-       return unless ($record && $record->fields());
-       foreach my $field ($record->fields()){
-               if ($field->tag()>=10){
-                       my @subfields;
-                       foreach my $subfield ($field->subfields()){
-                               push @subfields,($$subfield[0],NormalizeString($$subfield[1],$nfd));
-                       }
-                       my $newfield=MARC::Field->new(
-                                                       $field->tag(),
-                                                       $field->indicator(1),
-                                                       $field->indicator(2),
-                                                       @subfields
-                                               );
-                       $field->replace_with($newfield);
-               }
-       }
+    my ($record, $nfd)=@_;
+    return unless ($record && $record->fields());
+    foreach my $field ($record->fields()){
+        if ($field->tag()>=10){
+            my @subfields;
+            foreach my $subfield ($field->subfields()){
+                push @subfields,($$subfield[0],NormalizeString($$subfield[1],$nfd));
+            }
+            eval {
+                my $newfield=MARC::Field->new(
+                            $field->tag(),
+                            $field->indicator(1),
+                            $field->indicator(2),
+                            @subfields
+                        );
+                $field->replace_with($newfield);
+            };
+            warn "ERROR occurred in SetUTF8Flag $@" if $@;
+        }
+    }

 }
 
 =head2 NormalizeString
 }
 
 =head2 NormalizeString

diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm
index 02f2424..c045878 100644 (file)
--- a/C4/ImportBatch.pm
+++ b/C4/ImportBatch.pm
@@ -26,7 +26,7 @@ use C4::Biblio;
 use C4::Items;
 use C4::Charset;
 use C4::AuthoritiesMarc;
 use C4::Items;
 use C4::Charset;
 use C4::AuthoritiesMarc;

-use Koha::MarcModificationTemplates;
+use C4::MarcModificationTemplates;

 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 


@@ -324,7 +324,7 @@ sub ModAuthInBatch {
 
 =cut
 
 
 =cut
 

-sub  BatchStageMarcRecords {
+sub BatchStageMarcRecords {

     my $record_type = shift;
     my $encoding = shift;
     my $marc_records = shift;
     my $record_type = shift;
     my $encoding = shift;
     my $marc_records = shift;