marc_indicators work with marc_original_order records

diff --git a/lib/WebPAC/Normalize/MARC.pm b/lib/WebPAC/Normalize/MARC.pm
index 84eb485..9024d8e 100644 (file)
--- a/lib/WebPAC/Normalize/MARC.pm
+++ b/lib/WebPAC/Normalize/MARC.pm
@@ -391,6 +391,17 @@ sub marc_indicators {
        $i1 = ' ' if ($i1 !~ /^\d$/);
        $i2 = ' ' if ($i2 !~ /^\d$/);
        @{ $marc_indicators->{$f} } = ($i1,$i2);
+
+       if ( $created_with_marc_template->{$f} ) {
+               my $m = $marc_record->[ $marc_record_offset ];
+               foreach my $field_arr ( @$m ) {
+                       if ( $field_arr->[0] == $f ) {
+                               $field_arr->[1] = $i1;
+                               $field_arr->[2] = $i2;
+                       }
+               }
+               $marc_record->[ $marc_record_offset ] = $m;
+       }
 }
 
 sub _get_marc_indicators {

diff --git a/t/3-normalize.t b/t/3-normalize.t
index 53e4a7b..76acb04 100755 (executable)
--- a/t/3-normalize.t
+++ b/t/3-normalize.t
@@ -3,7 +3,7 @@
 use strict;
 use lib 'lib';
 
-use Test::More tests => 361;
+use Test::More tests => 364;
 
 use utf8;
 
@@ -800,6 +800,27 @@ sub test_s {
                ],
        );
 
+       test_rec_rules(
+               'marc_original_order and marc_indicators',
+               {
+                       '200' => [ {
+                               a => [ 'a1', 'a2' ], b => [ 'b1', 'b2' ], c => [ 'c1', 'c2' ],
+                               subfields => [ qw/a 0 b 0 a 1 b 1 c 0 c 1/ ],
+                       }, {
+                               a => [ 'a3', 'a4', 'a5' ], b => 'b3', c => 'c3',
+                               subfields => [ qw/a 0 a 1 b 0 c 0 a 2/ ],
+                       } ],
+               },
+               qq{
+                       marc_original_order(900,200);
+                       marc_indicators(900,1,2);
+               },
+               [
+                       [ '900', '1', '2', 'a', 'a1', 'b', 'b1', 'a', 'a2', 'b', 'b2', 'c', 'c1', 'c', 'c2', ],
+                       [ '900', '1', '2', 'a', 'a3', 'a', 'a4', 'b', 'b3', 'c', 'c3', 'a', 'a5', ],
+               ],
+       );
+
        test_rule(
                'rec1 skips subfields',
                {