better error output, skip non-existent fields in marc_template

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

diff --git a/lib/WebPAC/Normalize.pm b/lib/WebPAC/Normalize.pm
index 1c350f7..2b30ee2 100644 (file)
--- a/lib/WebPAC/Normalize.pm
+++ b/lib/WebPAC/Normalize.pm
@@ -815,7 +815,7 @@ sub marc_original_order {
        return unless defined($rec->{$from});
 
        my $r = $rec->{$from};
-       die "record field $from isn't array\n" unless (ref($r) eq 'ARRAY');
+       die "record field $from isn't array ",dump( $rec ) unless (ref($r) eq 'ARRAY');
 
        my ($i1,$i2) = defined($marc_indicators->{$to}) ? @{ $marc_indicators->{$to} } : (' ',' ');
        warn "## marc_original_order($to,$from) source = ", dump( $r ),$/ if ($debug > 1);
@@ -873,8 +873,8 @@ sub marc_template {
                die "$_ not ARRAY" if ref($args->{$_}) ne 'ARRAY';
        }
 
-       my $r = $rec->{ $args->{from} }; # || return;
-       die "record field ", $args->{from}, " isn't array\n" unless (ref($r) eq 'ARRAY');
+       my $r = $rec->{ $args->{from} } || return;
+       die "record field ", $args->{from}, " isn't array ",dump( $rec ) unless (ref($r) eq 'ARRAY');
 
        my @subfields_rename = @{ $args->{subfields_rename} };
 #      warn "### subfields_rename [$#subfields_rename] = ",dump( @subfields_rename );