--- trunk/lib/WebPAC/Normalize.pm	2006/06/29 23:19:26	547
+++ trunk/lib/WebPAC/Normalize.pm	2006/06/29 23:29:02	548
@@ -176,7 +176,6 @@
 			)
 		) {
 			push @$last, ( $row->[3] , $row->[4] );
-			warn "## ++ added $row->[0] ^$row->[3] to $last->[0]\n";
 			next;
 		} elsif ($last) {
 			push @m, $last;
@@ -262,12 +261,8 @@
 		my $v = $_;		# make var read-write for Encode
 		next unless (defined($v) && $v !~ /^\s*$/);
 		from_to($v, 'iso-8859-2', $marc_encoding) if ($marc_encoding);
-		push @{ $marc_record }, [
-			$f,
-			$marc_indicators->{$f}->{i1} || ' ',
-			$marc_indicators->{$f}->{i2} || ' ',
-			$sf => $v
-		];
+		my ($i1,$i2) = defined($marc_indicators->{$f}) ? @{ $marc_indicators->{$f} } : (' ',' ');
+		push @{ $marc_record }, [ $f, $i1, $i2, $sf => $v ];
 	}
 }
 
@@ -303,8 +298,7 @@
 
 	$i1 = ' ' if ($i1 !~ /^\d$/);
 	$i2 = ' ' if ($i2 !~ /^\d$/);
-	$marc_indicators->{$f}->{i1} = $i1;
-	$marc_indicators->{$f}->{i2} = $i2;
+	@{ $marc_indicators->{$f} } = ($i1,$i2);
 }