--- trunk/lib/WebPAC/Normalize.pm	2007/11/08 17:29:03	1016
+++ trunk/lib/WebPAC/Normalize.pm	2007/11/09 23:46:44	1018
@@ -815,7 +815,7 @@
 	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 @@
 		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 );
@@ -933,9 +933,11 @@
 
 		my ( $new_r, $from_count, $to_count );
 		foreach my $sf ( keys %{$r} ) {
+			# skip everything which isn't one char subfield (e.g. 'subfields')
+			next unless $sf =~ m/^\w$/;
 			my $nr = $from_count->{$sf}++;
-			my $rename_to = $subfields_rename->{ $sf };	# ||
-#				die "can't find subfield rename for $sf/$nr in ", dump( $subfields_rename );
+			my $rename_to = $subfields_rename->{ $sf } ||
+				die "can't find subfield rename for $sf/$nr in ", dump( $subfields_rename );
 			warn "### rename $sf/$nr to ", dump( $rename_to->[$nr] ), $/;
 			my ( $to_sf, $to_nr ) = @{ $rename_to->[$nr] };
 			$new_r->{ $to_sf }->[ $to_nr ] = [ $sf => $nr ];