--- trunk/lib/WebPAC/Normalize.pm 2006/09/06 20:54:47 641 +++ trunk/lib/WebPAC/Normalize.pm 2006/09/08 17:47:58 661 @@ -24,7 +24,6 @@ #use base qw/WebPAC::Common/; use Data::Dump qw/dump/; -use Encode qw/from_to/; use Storable qw/dclone/; # debugging warn(s) @@ -37,11 +36,11 @@ =head1 VERSION -Version 0.17 +Version 0.18 =cut -our $VERSION = '0.17'; +our $VERSION = '0.18'; =head1 SYNOPSIS @@ -470,7 +469,6 @@ foreach (@_) { 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); my ($i1,$i2) = defined($marc_indicators->{$f}) ? @{ $marc_indicators->{$f} } : (' ',' '); if (defined $sf) { push @{ $marc_record->[ $marc_record_offset ] }, [ $f, $i1, $i2, $sf => $v ]; @@ -550,7 +548,6 @@ my $v = shift; next unless (defined($v) && $v !~ /^\s*$/); - from_to($v, 'iso-8859-2', $marc_encoding) if ($marc_encoding); warn "## ++ marc_compose($f,$sf,$v) ", dump( $m ),$/ if ($debug > 1); if ($sf ne '+') { push @$m, ( $sf, $v ); @@ -731,7 +728,7 @@ sub _pack_subfields_hash { - warn "## _pack_subfields_hash( ",dump(@_), " )\n"; + warn "## _pack_subfields_hash( ",dump(@_), " )\n" if ($debug > 1); my ($h,$include_subfields) = @_; @@ -777,7 +774,6 @@ my @out; foreach my $h ( @{ $rec->{$f} } ) { if (ref($h) eq 'HASH') { -warn "rec1 hash: ",dump($h),"\n"; push @out, ( _pack_subfields_hash( $h ) ); } else { push @out, $h;