--- trunk/lib/WebPAC/Normalize.pm 2007/10/31 00:26:43 923 +++ trunk/lib/WebPAC/Normalize.pm 2007/11/03 13:35:03 982 @@ -1,6 +1,6 @@ package WebPAC::Normalize; use Exporter 'import'; -@EXPORT = qw/ +our @EXPORT = qw/ _set_rec _set_lookup _set_load_row _get_ds _clean_ds @@ -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 @@ -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 ); }, ); @@ -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) {