r1573@llin: dpavlin | 2007-11-08 18:29:03 +0100

 fix marc_template to produce correctly formatted MARC

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@1016 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/lib/WebPAC/Normalize.pm b/lib/WebPAC/Normalize.pm
index 305d3be..1c350f7 100644 (file)
--- a/lib/WebPAC/Normalize.pm
+++ b/lib/WebPAC/Normalize.pm
@@ -984,7 +984,7 @@ sub marc_template {
                        my ( $sf, $nr ) = @$sf;
                        my $v = $fill_in->{$sf}->[$nr] || die "can't find fill_in $sf/$nr";
                        warn "++ $sf/$nr |$v|\n";
-                       push @$m, [ $sf, $v ];
+                       push @$m, ( $sf, $v );
                }
 
                warn "#### >>>> created marc: ", dump( $m );
@@ -993,7 +993,11 @@ sub marc_template {
        }
 
        warn "### marc_template produced: ",dump( @marc_out );
-       return @marc_out;
+
+       foreach my $marc ( @marc_out ) {
+               warn "+++ ",dump( $marc );
+               push @{ $marc_record->[ $marc_record_offset ] }, $marc;
+       }
 }
 
 =head2 marc_count

diff --git a/t/3-normalize.t b/t/3-normalize.t
index fd5302e..0ca11f7 100755 (executable)
--- a/t/3-normalize.t
+++ b/t/3-normalize.t
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 351;
+use Test::More tests => 343;
 
 BEGIN {
        use_ok( 'WebPAC::Test' );
@@ -938,22 +938,10 @@ sub test_s {
                        );
                },
                [
-                       [440, " ", " ",
-                               ["a", "a-1-1"],
-                               ["x", "x-1-1"],
-                               ["v", "v-1-1"],
-                               ["n", "h-1-1"],
-                               ["p", "i-1-1"],
-                               ["v", "w-1-1"],
-                       ],
-                       [440, " ", " ", ["a", "a-2-1"], ["p", "i-2-1"], ["v", "v-2-1"]],
-                       [440, " ", " ", ["a", "a-3-1"], ["p", "i-3-1"], ["v", "v-3-1"]],
-                       [440, " ", " ",
-                               ["a", "a-4-1"],
-                               ["v", "v-4-1"],
-                               ["p", "i-4-1"],
-                               ["v", "w-4-1"],
-                       ],
+                       [440, " ", " ", "a", "a-1-1", "x", "x-1-1", "v", "v-1-1", "n", "h-1-1", "p", "i-1-1", "v", "w-1-1", ],
+                       [440, " ", " ", "a", "a-2-1", "p", "i-2-1", "v", "v-2-1"],
+                       [440, " ", " ", "a", "a-3-1", "p", "i-3-1", "v", "v-3-1"],
+                       [440, " ", " ", "a", "a-4-1", "v", "v-4-1", "p", "i-4-1", "v", "w-4-1"],
                ],
        );
 }