--- trunk/lib/WebPAC/Normalize.pm 2006/10/08 00:38:04 741 +++ trunk/lib/WebPAC/Normalize.pm 2006/10/08 13:24:46 750 @@ -39,11 +39,11 @@ =head1 VERSION -Version 0.22 +Version 0.23 =cut -our $VERSION = '0.22'; +our $VERSION = '0.23'; =head1 SYNOPSIS @@ -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 ''; @@ -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; @@ -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];