--- trunk/lib/WebPAC/Normalize.pm	2006/10/07 16:33:37	740
+++ trunk/lib/WebPAC/Normalize.pm	2006/10/08 18:21:26	752
@@ -39,11 +39,11 @@
 
 =head1 VERSION
 
-Version 0.22
+Version 0.23
 
 =cut
 
-our $VERSION = '0.22';
+our $VERSION = '0.23';
 
 =head1 SYNOPSIS
 
@@ -164,7 +164,7 @@
 
 =cut
 
-my ($out, $marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators);
+my ($out, $marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators, $leader);
 my ($marc_record_offset, $marc_fetch_offset) = (0, 0);
 
 sub _get_ds {
@@ -181,7 +181,7 @@
 
 sub _clean_ds {
 	my $a = {@_};
-	($out,$marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators) = ();
+	($out,$marc_record, $marc_encoding, $marc_repeatable_subfield, $marc_indicators, $leader) = ();
 	($marc_record_offset, $marc_fetch_offset) = (0,0);
 	$marc_encoding = $a->{marc_encoding};
 }
@@ -487,9 +487,9 @@
 	my ($offset,$value) = @_;
 
 	if ($offset) {
-		$out->{' leader'}->{ $offset } = $value;
+		$leader->{ $offset } = $value;
 	} else {
-		return $out->{' leader'};
+		return $leader;
 	}
 }
 
@@ -880,6 +880,9 @@
   @v = rec('200')
   @v = rec('200','a')
 
+If rec() returns just single value, it will
+return scalar, not array.
+
 =cut
 
 sub rec {
@@ -889,7 +892,9 @@
 	} elsif ($#_ == 1) {
 		@out = rec2(@_);
 	}
-	if (@out) {
+	if ($#out == 0 && ! wantarray) {
+		return $out[0];
+	} elsif (@out) {
 		return @out;
 	} else {
 		return '';
@@ -1031,7 +1036,7 @@
 
 	foreach my $h ( @having ) {
 		if (defined($lookup->{$database}->{$input}->{$key}->{$h})) {
-			warn "lookup for $database/$input/$key/$h return ",dump($lookup->{$database}->{$input}->{$key}->{$h}),"\n";
+			warn "lookup for $database/$input/$key/$h return ",dump($lookup->{$database}->{$input}->{$key}->{$h}),"\n" if ($debug);
 			$mfns->{$_}++ foreach keys %{ $lookup->{$database}->{$input}->{$key}->{$h} };
 		}
 	}
@@ -1040,7 +1045,7 @@
 
 	my @mfns = sort keys %$mfns;
 
-	warn "# lookup loading $database/$input/$key mfn ", join(",",@mfns)," having ",dump(@having),"\n";
+	warn "# lookup loading $database/$input/$key mfn ", join(",",@mfns)," having ",dump(@having),"\n" if ($debug);
 
 	my $old_rec = $rec;
 	my @out;
@@ -1048,13 +1053,13 @@
 	foreach my $mfn (@mfns) {
 		$rec = $load_row_coderef->( $database, $input, $mfn );
 
-		warn "got $database/$input/$mfn = ", dump($rec), $/;
+		warn "got $database/$input/$mfn = ", dump($rec), $/ if ($debug);
 
 		my @vals = $what->();
 
 		push @out, ( @vals );
 
-		warn "lookup for mfn $mfn returned ", dump(@vals), $/;
+		warn "lookup for mfn $mfn returned ", dump(@vals), $/ if ($debug);
 	}
 
 #	if (ref($lookup->{$k}) eq 'ARRAY') {
@@ -1065,7 +1070,7 @@
 
 	$rec = $old_rec;
 
-	warn "## lookup returns = ", dump(@out), $/;
+	warn "## lookup returns = ", dump(@out), $/ if ($debug);
 
 	if ($#out == 0) {
 		return $out[0];