--- trunk/lib/WebPAC/Normalize.pm	2007/10/31 00:26:43	923
+++ trunk/lib/WebPAC/Normalize.pm	2007/11/04 13:27:12	990
@@ -1,7 +1,7 @@
 package WebPAC::Normalize;
 use Exporter 'import';
-@EXPORT = qw/
-	_set_rec _set_lookup
+our @EXPORT = qw/
+	_set_ds _set_lookup
 	_set_load_row
 	_get_ds _clean_ds
 	_debug
@@ -15,6 +15,7 @@
 	marc_original_order
 
 	rec1 rec2 rec
+	frec
 	regex prefix suffix surround
 	first lookup join_with
 	save_into_lookup
@@ -23,6 +24,7 @@
 
 	get set
 	count
+
 /;
 
 use warnings;
@@ -36,6 +38,8 @@
 # debugging warn(s)
 my $debug = 0;
 
+use WebPAC::Normalize::ISBN;
+push @EXPORT, ( 'isbn_10', 'isbn_13' );
 
 =head1 NAME
 
@@ -43,7 +47,7 @@
 
 =cut
 
-our $VERSION = '0.31';
+our $VERSION = '0.32';
 
 =head1 SYNOPSIS
 
@@ -75,7 +79,7 @@
 	marc_encoding => 'utf-8',
 	config => $config,
 	load_row_coderef => sub {
-		my ($database,$input,$mfn) = shift;
+		my ($database,$input,$mfn) = @_;
 		$store->load_row( database => $database, input => $input, id => $mfn );
 	},
   );
@@ -103,7 +107,7 @@
 
 	no strict 'subs';
 	_set_lookup( $arg->{lookup} ) if defined($arg->{lookup});
-	_set_rec( $arg->{row} );
+	_set_ds( $arg->{row} );
 	_set_config( $arg->{config} ) if defined($arg->{config});
 	_clean_ds( %{ $arg } );
 	$load_row_coderef = $arg->{load_row_coderef};
@@ -114,17 +118,17 @@
 	return _get_ds();
 }
 
-=head2 _set_rec
+=head2 _set_ds
 
 Set current record hash
 
-  _set_rec( $rec );
+  _set_ds( $rec );
 
 =cut
 
 my $rec;
 
-sub _set_rec {
+sub _set_ds {
 	$rec = shift or die "no record hash";
 }
 
@@ -168,6 +172,7 @@
 my ($marc_record_offset, $marc_fetch_offset) = (0, 0);
 
 sub _get_ds {
+#warn "## out = ",dump($out);
 	return $out;
 }
 
@@ -994,6 +999,12 @@
 
 =cut
 
+sub frec {
+	my @out = rec(@_);
+	warn "rec(",dump(@_),") has more than one return value, ignoring\n" if $#out > 0;
+	return shift @out;
+}
+
 sub rec {
 	my @out;
 	if ($#_ == 0) {